diff --git a/.gitignore b/.gitignore
index 8fa3f2952d..0318a188f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+**/cache/**
exported_docs.zip
.nosqlbench/**
workspaces/**
diff --git a/nb5/assembly.xml b/assembly.xml
similarity index 100%
rename from nb5/assembly.xml
rename to assembly.xml
diff --git a/engine-cli/src/test/resources/local/example_scenarios.yaml b/engine-cli/src/test/resources/local/example_scenarios.yaml
deleted file mode 100644
index 7efac850fe..0000000000
--- a/engine-cli/src/test/resources/local/example_scenarios.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-# example-scenarios.yaml
-scenarios:
- default:
- one: run cycles=3 alias=A driver=stdout
- two: run cycles=5 alias=B driver=stdout
- namedsteps:
- one: run cycles=3 alias=A driver=stdout testparam1=testvalue1
- two: run cycles=5 alias=B driver=stdout
-
-bindings:
- cycle: Identity()
- name: NumberNameToCycle()
-
-ops:
- cycle: "cycle {cycle}\n"
diff --git a/engine-cli/src/test/resources/local/example_scenarios_templatevars.yaml b/engine-cli/src/test/resources/local/example_scenarios_templatevars.yaml
deleted file mode 100644
index 1f677c19d8..0000000000
--- a/engine-cli/src/test/resources/local/example_scenarios_templatevars.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-# example-scenarios.yaml
-scenarios:
- default:
- first: run cycles=3 alias=A driver=stdout tvar1=replaced
- second: run cycles=5 alias=B driver=stdout
-bindings:
- cycle: Identity()
- name: NumberNameToCycle()
-ops:
- cycle: "cycle {cycle} TEMPLATE(tvar1,def1) TEMPLATE(tvar1)\n"
diff --git a/mvn-defaults/pom.xml b/mvn-defaults/pom.xml
index 8c13ca342a..199da878ed 100644
--- a/mvn-defaults/pom.xml
+++ b/mvn-defaults/pom.xml
@@ -44,7 +44,7 @@
${project.artifactId}
- http://nosqlbench.io/
+ https://nosqlbench.io/
nosqlbench is the core of a programmable workload simulation runtime.
This module acts as the parent pom for nosqlbench Maven modules.
@@ -549,6 +549,7 @@
org.jacoco
jacoco-maven-plugin
+ 0.8.10
prepare-agent
@@ -807,13 +808,13 @@
Jonathan Shook
jshook@gmail.com
nosqlbench.io
- http://nosqlbench.io/
+ https://nosqlbench.io/
Sebastián Estévez
estevezsebastian@gmail.com
nosqlbench.io
- http://nosqlbench.io/
+ https://nosqlbench.io/
@@ -861,7 +862,7 @@
- javadoc
+ build-javadoc
true
diff --git a/adapter-amqp/pom.xml b/nb-adapters/adapter-amqp/pom.xml
similarity index 97%
rename from adapter-amqp/pom.xml
rename to nb-adapters/adapter-amqp/pom.xml
index 3eccabc6ee..8446e9f9e5 100644
--- a/adapter-amqp/pom.xml
+++ b/nb-adapters/adapter-amqp/pom.xml
@@ -24,7 +24,7 @@
mvn-defaults
io.nosqlbench
${revision}
- ../mvn-defaults
+ ../../mvn-defaults
${project.artifactId}
diff --git a/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/AmqpDriverAdapter.java b/nb-adapters/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/AmqpDriverAdapter.java
similarity index 100%
rename from adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/AmqpDriverAdapter.java
rename to nb-adapters/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/AmqpDriverAdapter.java
diff --git a/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/AmqpDriverAdapterLoader.java b/nb-adapters/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/AmqpDriverAdapterLoader.java
similarity index 100%
rename from adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/AmqpDriverAdapterLoader.java
rename to nb-adapters/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/AmqpDriverAdapterLoader.java
diff --git a/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/AmqpOpMapper.java b/nb-adapters/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/AmqpOpMapper.java
similarity index 100%
rename from adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/AmqpOpMapper.java
rename to nb-adapters/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/AmqpOpMapper.java
diff --git a/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/AmqpOpType.java b/nb-adapters/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/AmqpOpType.java
similarity index 100%
rename from adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/AmqpOpType.java
rename to nb-adapters/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/AmqpOpType.java
diff --git a/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/AmqpSpace.java b/nb-adapters/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/AmqpSpace.java
similarity index 100%
rename from adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/AmqpSpace.java
rename to nb-adapters/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/AmqpSpace.java
diff --git a/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/dispensers/AmqpBaseOpDispenser.java b/nb-adapters/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/dispensers/AmqpBaseOpDispenser.java
similarity index 100%
rename from adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/dispensers/AmqpBaseOpDispenser.java
rename to nb-adapters/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/dispensers/AmqpBaseOpDispenser.java
diff --git a/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/dispensers/AmqpMsgRecvOpDispenser.java b/nb-adapters/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/dispensers/AmqpMsgRecvOpDispenser.java
similarity index 100%
rename from adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/dispensers/AmqpMsgRecvOpDispenser.java
rename to nb-adapters/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/dispensers/AmqpMsgRecvOpDispenser.java
diff --git a/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/dispensers/AmqpMsgSendOpDispenser.java b/nb-adapters/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/dispensers/AmqpMsgSendOpDispenser.java
similarity index 100%
rename from adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/dispensers/AmqpMsgSendOpDispenser.java
rename to nb-adapters/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/dispensers/AmqpMsgSendOpDispenser.java
diff --git a/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/exception/AmqpAdapterInvalidParamException.java b/nb-adapters/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/exception/AmqpAdapterInvalidParamException.java
similarity index 100%
rename from adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/exception/AmqpAdapterInvalidParamException.java
rename to nb-adapters/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/exception/AmqpAdapterInvalidParamException.java
diff --git a/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/exception/AmqpAdapterUnexpectedException.java b/nb-adapters/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/exception/AmqpAdapterUnexpectedException.java
similarity index 100%
rename from adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/exception/AmqpAdapterUnexpectedException.java
rename to nb-adapters/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/exception/AmqpAdapterUnexpectedException.java
diff --git a/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/exception/AmqpAdapterUnsupportedOpException.java b/nb-adapters/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/exception/AmqpAdapterUnsupportedOpException.java
similarity index 100%
rename from adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/exception/AmqpAdapterUnsupportedOpException.java
rename to nb-adapters/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/exception/AmqpAdapterUnsupportedOpException.java
diff --git a/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/ops/AmqpTimeTrackOp.java b/nb-adapters/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/ops/AmqpTimeTrackOp.java
similarity index 100%
rename from adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/ops/AmqpTimeTrackOp.java
rename to nb-adapters/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/ops/AmqpTimeTrackOp.java
diff --git a/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/ops/OpTimeTrackAmqpMsgRecvOp.java b/nb-adapters/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/ops/OpTimeTrackAmqpMsgRecvOp.java
similarity index 100%
rename from adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/ops/OpTimeTrackAmqpMsgRecvOp.java
rename to nb-adapters/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/ops/OpTimeTrackAmqpMsgRecvOp.java
diff --git a/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/ops/OpTimeTrackAmqpMsgSendOp.java b/nb-adapters/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/ops/OpTimeTrackAmqpMsgSendOp.java
similarity index 100%
rename from adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/ops/OpTimeTrackAmqpMsgSendOp.java
rename to nb-adapters/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/ops/OpTimeTrackAmqpMsgSendOp.java
diff --git a/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/util/AmqpAdapterMetrics.java b/nb-adapters/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/util/AmqpAdapterMetrics.java
similarity index 100%
rename from adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/util/AmqpAdapterMetrics.java
rename to nb-adapters/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/util/AmqpAdapterMetrics.java
diff --git a/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/util/AmqpAdapterUtil.java b/nb-adapters/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/util/AmqpAdapterUtil.java
similarity index 100%
rename from adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/util/AmqpAdapterUtil.java
rename to nb-adapters/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/util/AmqpAdapterUtil.java
diff --git a/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/util/AmqpClientConf.java b/nb-adapters/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/util/AmqpClientConf.java
similarity index 100%
rename from adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/util/AmqpClientConf.java
rename to nb-adapters/adapter-amqp/src/main/java/io/nosqlbench/adapter/amqp/util/AmqpClientConf.java
diff --git a/adapter-amqp/src/main/resources/amqp.md b/nb-adapters/adapter-amqp/src/main/resources/amqp.md
similarity index 100%
rename from adapter-amqp/src/main/resources/amqp.md
rename to nb-adapters/adapter-amqp/src/main/resources/amqp.md
diff --git a/adapter-amqp/src/main/resources/conf/amqp_config.properties b/nb-adapters/adapter-amqp/src/main/resources/conf/amqp_config.properties
similarity index 100%
rename from adapter-amqp/src/main/resources/conf/amqp_config.properties
rename to nb-adapters/adapter-amqp/src/main/resources/conf/amqp_config.properties
diff --git a/adapter-amqp/src/main/resources/scenarios/amqp_msg_receiver.yaml b/nb-adapters/adapter-amqp/src/main/resources/scenarios/amqp_msg_receiver.yaml
similarity index 100%
rename from adapter-amqp/src/main/resources/scenarios/amqp_msg_receiver.yaml
rename to nb-adapters/adapter-amqp/src/main/resources/scenarios/amqp_msg_receiver.yaml
diff --git a/adapter-amqp/src/main/resources/scenarios/amqp_msg_sender.yaml b/nb-adapters/adapter-amqp/src/main/resources/scenarios/amqp_msg_sender.yaml
similarity index 100%
rename from adapter-amqp/src/main/resources/scenarios/amqp_msg_sender.yaml
rename to nb-adapters/adapter-amqp/src/main/resources/scenarios/amqp_msg_sender.yaml
diff --git a/adapter-amqp/src/main/resources/scenarios/csv/binding_keys.csv b/nb-adapters/adapter-amqp/src/main/resources/scenarios/csv/binding_keys.csv
similarity index 100%
rename from adapter-amqp/src/main/resources/scenarios/csv/binding_keys.csv
rename to nb-adapters/adapter-amqp/src/main/resources/scenarios/csv/binding_keys.csv
diff --git a/adapter-amqp/src/main/resources/scenarios/csv/routing_keys.csv b/nb-adapters/adapter-amqp/src/main/resources/scenarios/csv/routing_keys.csv
similarity index 100%
rename from adapter-amqp/src/main/resources/scenarios/csv/routing_keys.csv
rename to nb-adapters/adapter-amqp/src/main/resources/scenarios/csv/routing_keys.csv
diff --git a/adapter-amqp/src/main/resources/scenarios/nbamqp_msg_proc_named.yaml b/nb-adapters/adapter-amqp/src/main/resources/scenarios/nbamqp_msg_proc_named.yaml
similarity index 100%
rename from adapter-amqp/src/main/resources/scenarios/nbamqp_msg_proc_named.yaml
rename to nb-adapters/adapter-amqp/src/main/resources/scenarios/nbamqp_msg_proc_named.yaml
diff --git a/adapter-aws-opensearch/pom.xml b/nb-adapters/adapter-aws-opensearch/pom.xml
similarity index 98%
rename from adapter-aws-opensearch/pom.xml
rename to nb-adapters/adapter-aws-opensearch/pom.xml
index 99f12d6574..ca1f1995d1 100644
--- a/adapter-aws-opensearch/pom.xml
+++ b/nb-adapters/adapter-aws-opensearch/pom.xml
@@ -26,7 +26,7 @@
mvn-defaults
io.nosqlbench
${revision}
- ../mvn-defaults
+ ../../mvn-defaults
${project.artifactId}
diff --git a/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/AOSAdapter.java b/nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/AOSAdapter.java
similarity index 100%
rename from adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/AOSAdapter.java
rename to nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/AOSAdapter.java
diff --git a/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/AOSAdapterLoader.java b/nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/AOSAdapterLoader.java
similarity index 100%
rename from adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/AOSAdapterLoader.java
rename to nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/AOSAdapterLoader.java
diff --git a/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/AOSOpMapper.java b/nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/AOSOpMapper.java
similarity index 100%
rename from adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/AOSOpMapper.java
rename to nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/AOSOpMapper.java
diff --git a/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/AOSOpTypes.java b/nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/AOSOpTypes.java
similarity index 100%
rename from adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/AOSOpTypes.java
rename to nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/AOSOpTypes.java
diff --git a/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/AOSServiceType.java b/nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/AOSServiceType.java
similarity index 100%
rename from adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/AOSServiceType.java
rename to nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/AOSServiceType.java
diff --git a/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/AOSSpace.java b/nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/AOSSpace.java
similarity index 100%
rename from adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/AOSSpace.java
rename to nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/AOSSpace.java
diff --git a/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/AOSUtils.java b/nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/AOSUtils.java
similarity index 100%
rename from adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/AOSUtils.java
rename to nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/AOSUtils.java
diff --git a/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/dispensers/AOSBaseOpDispenser.java b/nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/dispensers/AOSBaseOpDispenser.java
similarity index 100%
rename from adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/dispensers/AOSBaseOpDispenser.java
rename to nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/dispensers/AOSBaseOpDispenser.java
diff --git a/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/dispensers/AOSBulkOpDispenser.java b/nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/dispensers/AOSBulkOpDispenser.java
similarity index 100%
rename from adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/dispensers/AOSBulkOpDispenser.java
rename to nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/dispensers/AOSBulkOpDispenser.java
diff --git a/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/dispensers/AOSBulkOpTypes.java b/nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/dispensers/AOSBulkOpTypes.java
similarity index 100%
rename from adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/dispensers/AOSBulkOpTypes.java
rename to nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/dispensers/AOSBulkOpTypes.java
diff --git a/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/dispensers/AOSCreateIndexOpDispenser.java b/nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/dispensers/AOSCreateIndexOpDispenser.java
similarity index 100%
rename from adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/dispensers/AOSCreateIndexOpDispenser.java
rename to nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/dispensers/AOSCreateIndexOpDispenser.java
diff --git a/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/dispensers/AOSDeleteIndexOpDispenser.java b/nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/dispensers/AOSDeleteIndexOpDispenser.java
similarity index 100%
rename from adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/dispensers/AOSDeleteIndexOpDispenser.java
rename to nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/dispensers/AOSDeleteIndexOpDispenser.java
diff --git a/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/dispensers/AOSDeleteOpDispenser.java b/nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/dispensers/AOSDeleteOpDispenser.java
similarity index 100%
rename from adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/dispensers/AOSDeleteOpDispenser.java
rename to nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/dispensers/AOSDeleteOpDispenser.java
diff --git a/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/dispensers/AOSIndexOpDispenser.java b/nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/dispensers/AOSIndexOpDispenser.java
similarity index 100%
rename from adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/dispensers/AOSIndexOpDispenser.java
rename to nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/dispensers/AOSIndexOpDispenser.java
diff --git a/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/dispensers/AOSKnnSearchOpDispenser.java b/nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/dispensers/AOSKnnSearchOpDispenser.java
similarity index 100%
rename from adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/dispensers/AOSKnnSearchOpDispenser.java
rename to nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/dispensers/AOSKnnSearchOpDispenser.java
diff --git a/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/dispensers/AOSRequests.java b/nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/dispensers/AOSRequests.java
similarity index 100%
rename from adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/dispensers/AOSRequests.java
rename to nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/dispensers/AOSRequests.java
diff --git a/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/dispensers/AOSUpdateOpDispenser.java b/nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/dispensers/AOSUpdateOpDispenser.java
similarity index 100%
rename from adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/dispensers/AOSUpdateOpDispenser.java
rename to nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/dispensers/AOSUpdateOpDispenser.java
diff --git a/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/ops/AOSBaseOp.java b/nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/ops/AOSBaseOp.java
similarity index 100%
rename from adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/ops/AOSBaseOp.java
rename to nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/ops/AOSBaseOp.java
diff --git a/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/ops/AOSBulkOp.java b/nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/ops/AOSBulkOp.java
similarity index 100%
rename from adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/ops/AOSBulkOp.java
rename to nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/ops/AOSBulkOp.java
diff --git a/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/ops/AOSCreateIndexOp.java b/nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/ops/AOSCreateIndexOp.java
similarity index 100%
rename from adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/ops/AOSCreateIndexOp.java
rename to nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/ops/AOSCreateIndexOp.java
diff --git a/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/ops/AOSDeleteIndexOp.java b/nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/ops/AOSDeleteIndexOp.java
similarity index 100%
rename from adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/ops/AOSDeleteIndexOp.java
rename to nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/ops/AOSDeleteIndexOp.java
diff --git a/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/ops/AOSDeleteOp.java b/nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/ops/AOSDeleteOp.java
similarity index 100%
rename from adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/ops/AOSDeleteOp.java
rename to nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/ops/AOSDeleteOp.java
diff --git a/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/ops/AOSIndexOp.java b/nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/ops/AOSIndexOp.java
similarity index 100%
rename from adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/ops/AOSIndexOp.java
rename to nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/ops/AOSIndexOp.java
diff --git a/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/ops/AOSKnnSearchOp.java b/nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/ops/AOSKnnSearchOp.java
similarity index 100%
rename from adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/ops/AOSKnnSearchOp.java
rename to nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/ops/AOSKnnSearchOp.java
diff --git a/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/ops/AOSUpdateOp.java b/nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/ops/AOSUpdateOp.java
similarity index 100%
rename from adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/ops/AOSUpdateOp.java
rename to nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/ops/AOSUpdateOp.java
diff --git a/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/pojos/Doc.java b/nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/pojos/Doc.java
similarity index 100%
rename from adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/pojos/Doc.java
rename to nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/pojos/Doc.java
diff --git a/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/pojos/UserDefinedSchema.java b/nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/pojos/UserDefinedSchema.java
similarity index 100%
rename from adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/pojos/UserDefinedSchema.java
rename to nb-adapters/adapter-aws-opensearch/src/main/java/io/nosqlbench/adapter/opensearch/pojos/UserDefinedSchema.java
diff --git a/adapter-aws-opensearch/src/main/resources/activities/osvectors_advancedsearch.yaml b/nb-adapters/adapter-aws-opensearch/src/main/resources/activities/osvectors_advancedsearch.yaml
similarity index 100%
rename from adapter-aws-opensearch/src/main/resources/activities/osvectors_advancedsearch.yaml
rename to nb-adapters/adapter-aws-opensearch/src/main/resources/activities/osvectors_advancedsearch.yaml
diff --git a/adapter-aws-opensearch/src/main/resources/opensearch.md b/nb-adapters/adapter-aws-opensearch/src/main/resources/opensearch.md
similarity index 100%
rename from adapter-aws-opensearch/src/main/resources/opensearch.md
rename to nb-adapters/adapter-aws-opensearch/src/main/resources/opensearch.md
diff --git a/adapter-cqld4/pom.xml b/nb-adapters/adapter-cqld4/pom.xml
similarity index 98%
rename from adapter-cqld4/pom.xml
rename to nb-adapters/adapter-cqld4/pom.xml
index 953be5201b..cbd7011e8e 100644
--- a/adapter-cqld4/pom.xml
+++ b/nb-adapters/adapter-cqld4/pom.xml
@@ -21,7 +21,7 @@
io.nosqlbench
mvn-defaults
${revision}
- ../mvn-defaults
+ ../../mvn-defaults
adapter-cqld4
@@ -29,7 +29,7 @@
${project.artifactId}
- A CQL ActivityType driver for http://nosqlbench.io/
+ A CQL ActivityType driver for https://nosqlbench.io/
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/CqlDriverAdapterLoader.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/CqlDriverAdapterLoader.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/CqlDriverAdapterLoader.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/CqlDriverAdapterLoader.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/CqlDriverAdapterStub.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/CqlDriverAdapterStub.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/CqlDriverAdapterStub.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/CqlDriverAdapterStub.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4CqlReboundStatement.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4CqlReboundStatement.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4CqlReboundStatement.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4CqlReboundStatement.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4DriverAdapter.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4DriverAdapter.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4DriverAdapter.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4DriverAdapter.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4DriverAdapterLoader.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4DriverAdapterLoader.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4DriverAdapterLoader.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4DriverAdapterLoader.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4PrintProcessor.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4PrintProcessor.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4PrintProcessor.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4PrintProcessor.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4Processors.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4Processors.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4Processors.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4Processors.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4Space.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4Space.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4Space.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/Cqld4Space.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/LWTRebinder.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/LWTRebinder.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/LWTRebinder.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/LWTRebinder.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/RSProcessors.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/RSProcessors.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/RSProcessors.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/RSProcessors.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/ResultSetProcessor.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/ResultSetProcessor.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/ResultSetProcessor.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/ResultSetProcessor.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/diagnostics/CQLD4PreparedStmtDiagnostics.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/diagnostics/CQLD4PreparedStmtDiagnostics.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/diagnostics/CQLD4PreparedStmtDiagnostics.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/diagnostics/CQLD4PreparedStmtDiagnostics.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/exceptions/ChangeUnappliedCycleException.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/exceptions/ChangeUnappliedCycleException.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/exceptions/ChangeUnappliedCycleException.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/exceptions/ChangeUnappliedCycleException.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/exceptions/CqlGenericCycleException.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/exceptions/CqlGenericCycleException.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/exceptions/CqlGenericCycleException.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/exceptions/CqlGenericCycleException.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/exceptions/ExceededRetryReplaceException.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/exceptions/ExceededRetryReplaceException.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/exceptions/ExceededRetryReplaceException.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/exceptions/ExceededRetryReplaceException.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/exceptions/UndefinedResultSetException.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/exceptions/UndefinedResultSetException.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/exceptions/UndefinedResultSetException.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/exceptions/UndefinedResultSetException.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/exceptions/UnexpectedPagingException.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/exceptions/UnexpectedPagingException.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/exceptions/UnexpectedPagingException.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/exceptions/UnexpectedPagingException.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/instruments/CqlOpMetrics.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/instruments/CqlOpMetrics.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/instruments/CqlOpMetrics.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/instruments/CqlOpMetrics.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/CqlD4BatchStmtDispenser.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/CqlD4BatchStmtDispenser.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/CqlD4BatchStmtDispenser.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/CqlD4BatchStmtDispenser.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/CqlD4RainbowTableDispenser.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/CqlD4RainbowTableDispenser.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/CqlD4RainbowTableDispenser.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/CqlD4RainbowTableDispenser.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4BaseOpDispenser.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4BaseOpDispenser.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4BaseOpDispenser.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4BaseOpDispenser.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4FluentGraphOpDispenser.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4FluentGraphOpDispenser.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4FluentGraphOpDispenser.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4FluentGraphOpDispenser.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4GremlinOpDispenser.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4GremlinOpDispenser.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4GremlinOpDispenser.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4GremlinOpDispenser.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4PreparedStmtDispenser.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4PreparedStmtDispenser.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4PreparedStmtDispenser.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4PreparedStmtDispenser.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4RawStmtDispenser.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4RawStmtDispenser.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4RawStmtDispenser.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4RawStmtDispenser.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4SimpleCqlStmtDispenser.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4SimpleCqlStmtDispenser.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4SimpleCqlStmtDispenser.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4SimpleCqlStmtDispenser.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4SsTableDispenser.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4SsTableDispenser.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4SsTableDispenser.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opdispensers/Cqld4SsTableDispenser.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/CqlD4BatchStmtMapper.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/CqlD4BatchStmtMapper.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/CqlD4BatchStmtMapper.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/CqlD4BatchStmtMapper.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/CqlD4CqlSimpleStmtMapper.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/CqlD4CqlSimpleStmtMapper.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/CqlD4CqlSimpleStmtMapper.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/CqlD4CqlSimpleStmtMapper.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/CqlD4OpType.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/CqlD4OpType.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/CqlD4OpType.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/CqlD4OpType.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/CqlD4PreparedStmtMapper.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/CqlD4PreparedStmtMapper.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/CqlD4PreparedStmtMapper.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/CqlD4PreparedStmtMapper.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/CqlD4RainbowTableMapper.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/CqlD4RainbowTableMapper.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/CqlD4RainbowTableMapper.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/CqlD4RainbowTableMapper.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/CqlD4RawStmtMapper.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/CqlD4RawStmtMapper.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/CqlD4RawStmtMapper.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/CqlD4RawStmtMapper.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4CoreOpMapper.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4CoreOpMapper.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4CoreOpMapper.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4CoreOpMapper.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4FluentGraphOpMapper.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4FluentGraphOpMapper.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4FluentGraphOpMapper.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4FluentGraphOpMapper.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4GremlinOpMapper.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4GremlinOpMapper.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4GremlinOpMapper.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/opmappers/Cqld4GremlinOpMapper.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optionhelpers/BatchTypeEnum.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optionhelpers/BatchTypeEnum.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optionhelpers/BatchTypeEnum.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optionhelpers/BatchTypeEnum.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optionhelpers/OptionHelpers.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optionhelpers/OptionHelpers.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optionhelpers/OptionHelpers.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optionhelpers/OptionHelpers.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlBatchStatement.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlBatchStatement.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlBatchStatement.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlBatchStatement.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlOp.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlOp.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlOp.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlOp.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlPreparedStatement.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlPreparedStatement.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlPreparedStatement.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlPreparedStatement.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlSimpleStatement.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlSimpleStatement.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlSimpleStatement.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4CqlSimpleStatement.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4FluentGraphOp.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4FluentGraphOp.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4FluentGraphOp.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4FluentGraphOp.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4RainbowTableOp.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4RainbowTableOp.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4RainbowTableOp.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4RainbowTableOp.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4ScriptGraphOp.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4ScriptGraphOp.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4ScriptGraphOp.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/Cqld4ScriptGraphOp.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/NBExecutionException.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/NBExecutionException.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/NBExecutionException.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/NBExecutionException.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/NBInterruptedException.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/NBInterruptedException.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/NBInterruptedException.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/NBInterruptedException.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/NBTimeoutException.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/NBTimeoutException.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/NBTimeoutException.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/optypes/NBTimeoutException.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/processors/CqlFieldCaptureProcessor.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/processors/CqlFieldCaptureProcessor.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/processors/CqlFieldCaptureProcessor.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/processors/CqlFieldCaptureProcessor.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/processors/RSIterableCapture.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/processors/RSIterableCapture.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/processors/RSIterableCapture.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/processors/RSIterableCapture.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/wrapper/Cqld4DriverContext.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/wrapper/Cqld4DriverContext.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/wrapper/Cqld4DriverContext.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/wrapper/Cqld4DriverContext.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/wrapper/Cqld4LoadBalancerObserver.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/wrapper/Cqld4LoadBalancerObserver.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/wrapper/Cqld4LoadBalancerObserver.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/wrapper/Cqld4LoadBalancerObserver.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/wrapper/Cqld4ObserverSession.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/wrapper/Cqld4ObserverSession.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/wrapper/Cqld4ObserverSession.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/wrapper/Cqld4ObserverSession.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/wrapper/Cqld4SessionBuilder.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/wrapper/Cqld4SessionBuilder.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/wrapper/Cqld4SessionBuilder.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/wrapper/Cqld4SessionBuilder.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/wrapper/NodeSummary.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/wrapper/NodeSummary.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/wrapper/NodeSummary.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/wrapper/NodeSummary.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/wrapper/package-info.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/wrapper/package-info.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/wrapper/package-info.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/adapter/cqld4/wrapper/package-info.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/analysis/RingAnalyzer.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/analysis/RingAnalyzer.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/analysis/RingAnalyzer.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/analysis/RingAnalyzer.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/analysis/RingAnalyzerConfig.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/analysis/RingAnalyzerConfig.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/analysis/RingAnalyzerConfig.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/analysis/RingAnalyzerConfig.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/api/BindingsLibrary.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/api/BindingsLibrary.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/api/BindingsLibrary.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/api/BindingsLibrary.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/api/CGModelTransformer.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/api/CGModelTransformer.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/api/CGModelTransformer.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/api/CGModelTransformer.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/api/CGTextTransformer.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/api/CGTextTransformer.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/api/CGTextTransformer.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/api/CGTextTransformer.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/api/CGTransformerConfigurable.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/api/CGTransformerConfigurable.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/api/CGTransformerConfigurable.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/api/CGTransformerConfigurable.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/binders/Binding.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/binders/Binding.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/binders/Binding.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/binders/Binding.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/binders/BindingsAccumulator.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/binders/BindingsAccumulator.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/binders/BindingsAccumulator.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/binders/BindingsAccumulator.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/binders/NamingFolio.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/binders/NamingFolio.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/binders/NamingFolio.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/binders/NamingFolio.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/binders/NamingStyle.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/binders/NamingStyle.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/binders/NamingStyle.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/binders/NamingStyle.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/binders/UnresolvedBindingException.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/binders/UnresolvedBindingException.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/binders/UnresolvedBindingException.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/binders/UnresolvedBindingException.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/bindspecs/BindingBuilder.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/bindspecs/BindingBuilder.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/bindspecs/BindingBuilder.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/bindspecs/BindingBuilder.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/bindspecs/BindingSpec.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/bindspecs/BindingSpec.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/bindspecs/BindingSpec.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/bindspecs/BindingSpec.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/bindspecs/BindingSpecImpl.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/bindspecs/BindingSpecImpl.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/bindspecs/BindingSpecImpl.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/bindspecs/BindingSpecImpl.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGColumnRebinder.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGColumnRebinder.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGColumnRebinder.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGColumnRebinder.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGDefaultCqlBindings.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGDefaultCqlBindings.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGDefaultCqlBindings.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGDefaultCqlBindings.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGElementNamer.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGElementNamer.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGElementNamer.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGElementNamer.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGKeyspaceStats.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGKeyspaceStats.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGKeyspaceStats.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGKeyspaceStats.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGLiteralFormat.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGLiteralFormat.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGLiteralFormat.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGLiteralFormat.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGSchemaStats.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGSchemaStats.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGSchemaStats.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGSchemaStats.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGTableStats.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGTableStats.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGTableStats.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGTableStats.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGTextTransformers.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGTextTransformers.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGTextTransformers.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGTextTransformers.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGWorkloadExporter.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGWorkloadExporter.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGWorkloadExporter.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGWorkloadExporter.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/grammars/CqlLexer.g4 b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/grammars/CqlLexer.g4
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/grammars/CqlLexer.g4
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/grammars/CqlLexer.g4
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/grammars/CqlParser.g4 b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/grammars/CqlParser.g4
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/grammars/CqlParser.g4
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/grammars/CqlParser.g4
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CGErrorListener.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CGErrorListener.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CGErrorListener.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CGErrorListener.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/ColType.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/ColType.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/ColType.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/ColType.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/ColumnPosition.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/ColumnPosition.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/ColumnPosition.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/ColumnPosition.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/ComputedSchemaStats.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/ComputedSchemaStats.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/ComputedSchemaStats.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/ComputedSchemaStats.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlColumnBase.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlColumnBase.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlColumnBase.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlColumnBase.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlKeyspaceDef.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlKeyspaceDef.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlKeyspaceDef.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlKeyspaceDef.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlModel.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlModel.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlModel.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlModel.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlModelBuilder.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlModelBuilder.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlModelBuilder.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlModelBuilder.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlTable.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlTable.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlTable.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlTable.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlTableColumn.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlTableColumn.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlTableColumn.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlTableColumn.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlType.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlType.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlType.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlType.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlTypeColumn.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlTypeColumn.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlTypeColumn.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/model/CqlTypeColumn.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/parser/CqlModelParser.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/parser/CqlModelParser.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/parser/CqlModelParser.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/parser/CqlModelParser.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGCachingNameRemapper.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGCachingNameRemapper.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGCachingNameRemapper.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGCachingNameRemapper.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGGenStatsInjector.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGGenStatsInjector.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGGenStatsInjector.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGGenStatsInjector.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGKeySpaceDDLRemover.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGKeySpaceDDLRemover.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGKeySpaceDDLRemover.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGKeySpaceDDLRemover.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGKeyspaceFilter.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGKeyspaceFilter.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGKeyspaceFilter.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGKeyspaceFilter.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGModelTransformers.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGModelTransformers.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGModelTransformers.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGModelTransformers.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGNameObfuscator.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGNameObfuscator.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGNameObfuscator.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGNameObfuscator.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGRatioCalculator.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGRatioCalculator.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGRatioCalculator.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGRatioCalculator.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGRatioSuffixer.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGRatioSuffixer.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGRatioSuffixer.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGRatioSuffixer.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGRegexReplacer.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGRegexReplacer.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGRegexReplacer.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGRegexReplacer.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGReplicationSettingInjector.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGReplicationSettingInjector.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGReplicationSettingInjector.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGReplicationSettingInjector.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGUdtReplacer.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGUdtReplacer.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGUdtReplacer.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CGUdtReplacer.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/ComputedTableStats.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/ComputedTableStats.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/ComputedTableStats.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/ComputedTableStats.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CqlSchemaStatsParser.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CqlSchemaStatsParser.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CqlSchemaStatsParser.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/CqlSchemaStatsParser.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/UnusedTableRemover.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/UnusedTableRemover.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/UnusedTableRemover.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/UnusedTableRemover.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/namecache/NameCache.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/namecache/NameCache.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/namecache/NameCache.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/namecache/NameCache.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/namecache/NamedColumn.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/namecache/NamedColumn.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/namecache/NamedColumn.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/namecache/NamedColumn.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/namecache/NamedKeyspace.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/namecache/NamedKeyspace.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/namecache/NamedKeyspace.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/namecache/NamedKeyspace.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/namecache/NamedTable.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/namecache/NamedTable.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/namecache/NamedTable.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/namecache/NamedTable.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/namecache/NamedType.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/namecache/NamedType.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/namecache/NamedType.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/transformers/namecache/NamedType.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/diagnostics/ToCqlType.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/diagnostics/ToCqlType.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/diagnostics/ToCqlType.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/diagnostics/ToCqlType.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/double_to_cqlduration/ToCqlDuration.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/double_to_cqlduration/ToCqlDuration.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/double_to_cqlduration/ToCqlDuration.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/double_to_cqlduration/ToCqlDuration.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/geometry/Distance.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/geometry/Distance.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/geometry/Distance.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/geometry/Distance.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/geometry/LineString.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/geometry/LineString.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/geometry/LineString.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/geometry/LineString.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/geometry/NormalizeCqlVector.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/geometry/NormalizeCqlVector.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/geometry/NormalizeCqlVector.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/geometry/NormalizeCqlVector.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/geometry/Point.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/geometry/Point.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/geometry/Point.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/geometry/Point.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/geometry/Polygon.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/geometry/Polygon.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/geometry/Polygon.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/geometry/Polygon.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/geometry/PolygonOnGrid.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/geometry/PolygonOnGrid.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/geometry/PolygonOnGrid.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/geometry/PolygonOnGrid.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/hdf_to_cql/HdfDatasetToCqlPredicates.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/hdf_to_cql/HdfDatasetToCqlPredicates.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/hdf_to_cql/HdfDatasetToCqlPredicates.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/hdf_to_cql/HdfDatasetToCqlPredicates.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/hdf_to_cql/HdfPredicatesToCql.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/hdf_to_cql/HdfPredicatesToCql.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/hdf_to_cql/HdfPredicatesToCql.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/hdf_to_cql/HdfPredicatesToCql.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/long_localdate/EpochMillisToCqlLocalDate.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/long_localdate/EpochMillisToCqlLocalDate.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/long_localdate/EpochMillisToCqlLocalDate.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/long_localdate/EpochMillisToCqlLocalDate.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/long_localdate/EpochMillisToJavaLocalDate.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/long_localdate/EpochMillisToJavaLocalDate.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/long_localdate/EpochMillisToJavaLocalDate.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/long_localdate/EpochMillisToJavaLocalDate.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/long_localdate/EpochMillisToJavaLocalDateTime.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/long_localdate/EpochMillisToJavaLocalDateTime.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/long_localdate/EpochMillisToJavaLocalDateTime.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/long_localdate/EpochMillisToJavaLocalDateTime.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/long_localdate/LongToLocalDateDays.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/long_localdate/LongToLocalDateDays.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/long_localdate/LongToLocalDateDays.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/long_localdate/LongToLocalDateDays.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/long_to_cqlduration/CqlDurationFunctions.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/long_to_cqlduration/CqlDurationFunctions.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/long_to_cqlduration/CqlDurationFunctions.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/long_to_cqlduration/CqlDurationFunctions.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/long_to_cqlduration/ToCqlDurationNanos.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/long_to_cqlduration/ToCqlDurationNanos.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/long_to_cqlduration/ToCqlDurationNanos.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/long_to_cqlduration/ToCqlDurationNanos.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/long_uuid/ToTimeUUIDMax.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/long_uuid/ToTimeUUIDMax.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/long_uuid/ToTimeUUIDMax.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/long_uuid/ToTimeUUIDMax.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/long_uuid/ToTimeUUIDMin.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/long_uuid/ToTimeUUIDMin.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/long_uuid/ToTimeUUIDMin.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/long_uuid/ToTimeUUIDMin.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/rainbow/TokenMapFileAPIService.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/rainbow/TokenMapFileAPIService.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/rainbow/TokenMapFileAPIService.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/rainbow/TokenMapFileAPIService.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/rainbow/TokenMapFileBaseFunction.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/rainbow/TokenMapFileBaseFunction.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/rainbow/TokenMapFileBaseFunction.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/rainbow/TokenMapFileBaseFunction.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/rainbow/TokenMapFileCycle.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/rainbow/TokenMapFileCycle.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/rainbow/TokenMapFileCycle.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/rainbow/TokenMapFileCycle.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/rainbow/TokenMapFileNextCycle.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/rainbow/TokenMapFileNextCycle.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/rainbow/TokenMapFileNextCycle.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/rainbow/TokenMapFileNextCycle.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/rainbow/TokenMapFileNextToken.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/rainbow/TokenMapFileNextToken.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/rainbow/TokenMapFileNextToken.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/rainbow/TokenMapFileNextToken.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/rainbow/TokenMapFileSharedBuffers.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/rainbow/TokenMapFileSharedBuffers.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/rainbow/TokenMapFileSharedBuffers.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/rainbow/TokenMapFileSharedBuffers.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/rainbow/TokenMapFileToken.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/rainbow/TokenMapFileToken.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/rainbow/TokenMapFileToken.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/rainbow/TokenMapFileToken.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/string_string/SnappyComp.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/string_string/SnappyComp.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/string_string/SnappyComp.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/string_string/SnappyComp.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_cqlvector/CqlVector.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_cqlvector/CqlVector.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_cqlvector/CqlVector.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_cqlvector/CqlVector.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_cqlvector/LoadCqlVector.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_cqlvector/LoadCqlVector.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_cqlvector/LoadCqlVector.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_cqlvector/LoadCqlVector.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_cqlvector/LoadCqlVectorFromArray.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_cqlvector/LoadCqlVectorFromArray.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_cqlvector/LoadCqlVectorFromArray.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_cqlvector/LoadCqlVectorFromArray.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_cqlvector/from_double_ary/ToCqlVector.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_cqlvector/from_double_ary/ToCqlVector.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_cqlvector/from_double_ary/ToCqlVector.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_cqlvector/from_double_ary/ToCqlVector.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_cqlvector/from_float_ary/ToCqlVector.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_cqlvector/from_float_ary/ToCqlVector.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_cqlvector/from_float_ary/ToCqlVector.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_cqlvector/from_float_ary/ToCqlVector.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_cqlvector/from_number_list/ToCqlVector.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_cqlvector/from_number_list/ToCqlVector.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_cqlvector/from_number_list/ToCqlVector.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_cqlvector/from_number_list/ToCqlVector.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_daterange/DateRangeDuring.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_daterange/DateRangeDuring.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_daterange/DateRangeDuring.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_daterange/DateRangeDuring.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_daterange/DateRangeFunc.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_daterange/DateRangeFunc.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_daterange/DateRangeFunc.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_daterange/DateRangeFunc.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_daterange/DateRangeOnOrAfter.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_daterange/DateRangeOnOrAfter.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_daterange/DateRangeOnOrAfter.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_daterange/DateRangeOnOrAfter.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_daterange/DateRangeOnOrBefore.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_daterange/DateRangeOnOrBefore.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_daterange/DateRangeOnOrBefore.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_daterange/DateRangeOnOrBefore.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_daterange/DateRangeParser.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_daterange/DateRangeParser.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_daterange/DateRangeParser.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/to_daterange/DateRangeParser.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/udts/ToUdt.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/udts/ToUdt.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/udts/ToUdt.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/datamappers/functions/udts/ToUdt.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/engine/extensions/vectormath/CqlUtils.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/engine/extensions/vectormath/CqlUtils.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/engine/extensions/vectormath/CqlUtils.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/engine/extensions/vectormath/CqlUtils.java
diff --git a/adapter-cqld4/src/main/java/io/nosqlbench/engine/extensions/vectormath/CqlUtilsPluginInfo.java b/nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/engine/extensions/vectormath/CqlUtilsPluginInfo.java
similarity index 100%
rename from adapter-cqld4/src/main/java/io/nosqlbench/engine/extensions/vectormath/CqlUtilsPluginInfo.java
rename to nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/engine/extensions/vectormath/CqlUtilsPluginInfo.java
diff --git a/adapter-cqld4/src/main/resources/activities/baselines/README.md b/nb-adapters/adapter-cqld4/src/main/resources/activities/baselines/README.md
similarity index 100%
rename from adapter-cqld4/src/main/resources/activities/baselines/README.md
rename to nb-adapters/adapter-cqld4/src/main/resources/activities/baselines/README.md
diff --git a/adapter-cqld4/src/main/resources/activities/baselines/astra_vectors_live.yaml b/nb-adapters/adapter-cqld4/src/main/resources/activities/baselines/astra_vectors_live.yaml
similarity index 100%
rename from adapter-cqld4/src/main/resources/activities/baselines/astra_vectors_live.yaml
rename to nb-adapters/adapter-cqld4/src/main/resources/activities/baselines/astra_vectors_live.yaml
diff --git a/adapter-cqld4/src/main/resources/activities/baselines/cql_iot.md b/nb-adapters/adapter-cqld4/src/main/resources/activities/baselines/cql_iot.md
similarity index 100%
rename from adapter-cqld4/src/main/resources/activities/baselines/cql_iot.md
rename to nb-adapters/adapter-cqld4/src/main/resources/activities/baselines/cql_iot.md
diff --git a/adapter-cqld4/src/main/resources/activities/baselines/cql_iot.yaml b/nb-adapters/adapter-cqld4/src/main/resources/activities/baselines/cql_iot.yaml
similarity index 100%
rename from adapter-cqld4/src/main/resources/activities/baselines/cql_iot.yaml
rename to nb-adapters/adapter-cqld4/src/main/resources/activities/baselines/cql_iot.yaml
diff --git a/adapter-cqld4/src/main/resources/activities/baselines/cql_iot_dse.yaml b/nb-adapters/adapter-cqld4/src/main/resources/activities/baselines/cql_iot_dse.yaml
similarity index 100%
rename from adapter-cqld4/src/main/resources/activities/baselines/cql_iot_dse.yaml
rename to nb-adapters/adapter-cqld4/src/main/resources/activities/baselines/cql_iot_dse.yaml
diff --git a/adapter-cqld4/src/main/resources/activities/baselines/cql_keyvalue.md b/nb-adapters/adapter-cqld4/src/main/resources/activities/baselines/cql_keyvalue.md
similarity index 100%
rename from adapter-cqld4/src/main/resources/activities/baselines/cql_keyvalue.md
rename to nb-adapters/adapter-cqld4/src/main/resources/activities/baselines/cql_keyvalue.md
diff --git a/adapter-cqld4/src/main/resources/activities/baselines/cql_keyvalue.yaml b/nb-adapters/adapter-cqld4/src/main/resources/activities/baselines/cql_keyvalue.yaml
similarity index 100%
rename from adapter-cqld4/src/main/resources/activities/baselines/cql_keyvalue.yaml
rename to nb-adapters/adapter-cqld4/src/main/resources/activities/baselines/cql_keyvalue.yaml
diff --git a/adapter-cqld4/src/main/resources/activities/baselines/cql_starter.yaml b/nb-adapters/adapter-cqld4/src/main/resources/activities/baselines/cql_starter.yaml
similarity index 100%
rename from adapter-cqld4/src/main/resources/activities/baselines/cql_starter.yaml
rename to nb-adapters/adapter-cqld4/src/main/resources/activities/baselines/cql_starter.yaml
diff --git a/adapter-cqld4/src/main/resources/activities/baselines/cql_tabular.yaml b/nb-adapters/adapter-cqld4/src/main/resources/activities/baselines/cql_tabular.yaml
similarity index 100%
rename from adapter-cqld4/src/main/resources/activities/baselines/cql_tabular.yaml
rename to nb-adapters/adapter-cqld4/src/main/resources/activities/baselines/cql_tabular.yaml
diff --git a/adapter-cqld4/src/main/resources/activities/baselines/cql_vector.yaml b/nb-adapters/adapter-cqld4/src/main/resources/activities/baselines/cql_vector.yaml
similarity index 100%
rename from adapter-cqld4/src/main/resources/activities/baselines/cql_vector.yaml
rename to nb-adapters/adapter-cqld4/src/main/resources/activities/baselines/cql_vector.yaml
diff --git a/adapter-cqld4/src/main/resources/activities/baselines/cql_vector_typed.yaml b/nb-adapters/adapter-cqld4/src/main/resources/activities/baselines/cql_vector_typed.yaml
similarity index 100%
rename from adapter-cqld4/src/main/resources/activities/baselines/cql_vector_typed.yaml
rename to nb-adapters/adapter-cqld4/src/main/resources/activities/baselines/cql_vector_typed.yaml
diff --git a/adapter-cqld4/src/main/resources/activities/baselines/cql_widerows.md b/nb-adapters/adapter-cqld4/src/main/resources/activities/baselines/cql_widerows.md
similarity index 100%
rename from adapter-cqld4/src/main/resources/activities/baselines/cql_widerows.md
rename to nb-adapters/adapter-cqld4/src/main/resources/activities/baselines/cql_widerows.md
diff --git a/adapter-cqld4/src/main/resources/activities/baselines/graph_wheels.yaml b/nb-adapters/adapter-cqld4/src/main/resources/activities/baselines/graph_wheels.yaml
similarity index 100%
rename from adapter-cqld4/src/main/resources/activities/baselines/graph_wheels.yaml
rename to nb-adapters/adapter-cqld4/src/main/resources/activities/baselines/graph_wheels.yaml
diff --git a/adapter-cqld4/src/main/resources/activities/baselines/incremental.yaml b/nb-adapters/adapter-cqld4/src/main/resources/activities/baselines/incremental.yaml
similarity index 100%
rename from adapter-cqld4/src/main/resources/activities/baselines/incremental.yaml
rename to nb-adapters/adapter-cqld4/src/main/resources/activities/baselines/incremental.yaml
diff --git a/adapter-cqld4/src/main/resources/activities/baselinesv2/README.md b/nb-adapters/adapter-cqld4/src/main/resources/activities/baselinesv2/README.md
similarity index 100%
rename from adapter-cqld4/src/main/resources/activities/baselinesv2/README.md
rename to nb-adapters/adapter-cqld4/src/main/resources/activities/baselinesv2/README.md
diff --git a/adapter-cqld4/src/main/resources/activities/baselinesv2/cql_keyvalue2.yaml b/nb-adapters/adapter-cqld4/src/main/resources/activities/baselinesv2/cql_keyvalue2.yaml
similarity index 100%
rename from adapter-cqld4/src/main/resources/activities/baselinesv2/cql_keyvalue2.yaml
rename to nb-adapters/adapter-cqld4/src/main/resources/activities/baselinesv2/cql_keyvalue2.yaml
diff --git a/adapter-cqld4/src/main/resources/activities/baselinesv2/cql_keyvalue2_bulky.yaml b/nb-adapters/adapter-cqld4/src/main/resources/activities/baselinesv2/cql_keyvalue2_bulky.yaml
similarity index 100%
rename from adapter-cqld4/src/main/resources/activities/baselinesv2/cql_keyvalue2_bulky.yaml
rename to nb-adapters/adapter-cqld4/src/main/resources/activities/baselinesv2/cql_keyvalue2_bulky.yaml
diff --git a/adapter-cqld4/src/main/resources/activities/baselinesv2/cql_tabular2.yaml b/nb-adapters/adapter-cqld4/src/main/resources/activities/baselinesv2/cql_tabular2.yaml
similarity index 100%
rename from adapter-cqld4/src/main/resources/activities/baselinesv2/cql_tabular2.yaml
rename to nb-adapters/adapter-cqld4/src/main/resources/activities/baselinesv2/cql_tabular2.yaml
diff --git a/adapter-cqld4/src/main/resources/activities/baselinesv2/cql_timeseries2.yaml b/nb-adapters/adapter-cqld4/src/main/resources/activities/baselinesv2/cql_timeseries2.yaml
similarity index 100%
rename from adapter-cqld4/src/main/resources/activities/baselinesv2/cql_timeseries2.yaml
rename to nb-adapters/adapter-cqld4/src/main/resources/activities/baselinesv2/cql_timeseries2.yaml
diff --git a/adapter-cqld4/src/main/resources/activities/baselinesv2/cql_vector2.yaml b/nb-adapters/adapter-cqld4/src/main/resources/activities/baselinesv2/cql_vector2.yaml
similarity index 100%
rename from adapter-cqld4/src/main/resources/activities/baselinesv2/cql_vector2.yaml
rename to nb-adapters/adapter-cqld4/src/main/resources/activities/baselinesv2/cql_vector2.yaml
diff --git a/adapter-cqld4/src/main/resources/activities/baselinesv2/cql_vector2_fvec.yaml b/nb-adapters/adapter-cqld4/src/main/resources/activities/baselinesv2/cql_vector2_fvec.yaml
similarity index 100%
rename from adapter-cqld4/src/main/resources/activities/baselinesv2/cql_vector2_fvec.yaml
rename to nb-adapters/adapter-cqld4/src/main/resources/activities/baselinesv2/cql_vector2_fvec.yaml
diff --git a/adapter-cqld4/src/main/resources/activities/baselinesv2/get_datasets.sh b/nb-adapters/adapter-cqld4/src/main/resources/activities/baselinesv2/get_datasets.sh
similarity index 100%
rename from adapter-cqld4/src/main/resources/activities/baselinesv2/get_datasets.sh
rename to nb-adapters/adapter-cqld4/src/main/resources/activities/baselinesv2/get_datasets.sh
diff --git a/adapter-cqld4/src/main/resources/activities/examples/bindings/cqltypes.yaml b/nb-adapters/adapter-cqld4/src/main/resources/activities/examples/bindings/cqltypes.yaml
similarity index 100%
rename from adapter-cqld4/src/main/resources/activities/examples/bindings/cqltypes.yaml
rename to nb-adapters/adapter-cqld4/src/main/resources/activities/examples/bindings/cqltypes.yaml
diff --git a/adapter-cqld4/src/main/resources/activities/examples/bindings/cqlvectors.yaml b/nb-adapters/adapter-cqld4/src/main/resources/activities/examples/bindings/cqlvectors.yaml
similarity index 100%
rename from adapter-cqld4/src/main/resources/activities/examples/bindings/cqlvectors.yaml
rename to nb-adapters/adapter-cqld4/src/main/resources/activities/examples/bindings/cqlvectors.yaml
diff --git a/adapter-cqld4/src/main/resources/activities/examples/bindings/date.yaml b/nb-adapters/adapter-cqld4/src/main/resources/activities/examples/bindings/date.yaml
similarity index 100%
rename from adapter-cqld4/src/main/resources/activities/examples/bindings/date.yaml
rename to nb-adapters/adapter-cqld4/src/main/resources/activities/examples/bindings/date.yaml
diff --git a/adapter-cqld4/src/main/resources/activities/examples/bindings/expr.yaml b/nb-adapters/adapter-cqld4/src/main/resources/activities/examples/bindings/expr.yaml
similarity index 100%
rename from adapter-cqld4/src/main/resources/activities/examples/bindings/expr.yaml
rename to nb-adapters/adapter-cqld4/src/main/resources/activities/examples/bindings/expr.yaml
diff --git a/adapter-cqld4/src/main/resources/activities/examples/bindings/text.yaml b/nb-adapters/adapter-cqld4/src/main/resources/activities/examples/bindings/text.yaml
similarity index 100%
rename from adapter-cqld4/src/main/resources/activities/examples/bindings/text.yaml
rename to nb-adapters/adapter-cqld4/src/main/resources/activities/examples/bindings/text.yaml
diff --git a/adapter-cqld4/src/main/resources/activities/examples/bindings/timestamp.yaml b/nb-adapters/adapter-cqld4/src/main/resources/activities/examples/bindings/timestamp.yaml
similarity index 100%
rename from adapter-cqld4/src/main/resources/activities/examples/bindings/timestamp.yaml
rename to nb-adapters/adapter-cqld4/src/main/resources/activities/examples/bindings/timestamp.yaml
diff --git a/adapter-cqld4/src/main/resources/activities/examples/bindings/timeuuid.yaml b/nb-adapters/adapter-cqld4/src/main/resources/activities/examples/bindings/timeuuid.yaml
similarity index 100%
rename from adapter-cqld4/src/main/resources/activities/examples/bindings/timeuuid.yaml
rename to nb-adapters/adapter-cqld4/src/main/resources/activities/examples/bindings/timeuuid.yaml
diff --git a/adapter-cqld4/src/main/resources/activities/examples/bindings/uuid.yaml b/nb-adapters/adapter-cqld4/src/main/resources/activities/examples/bindings/uuid.yaml
similarity index 100%
rename from adapter-cqld4/src/main/resources/activities/examples/bindings/uuid.yaml
rename to nb-adapters/adapter-cqld4/src/main/resources/activities/examples/bindings/uuid.yaml
diff --git a/adapter-cqld4/src/main/resources/activities/examples/cql-rowops.yaml b/nb-adapters/adapter-cqld4/src/main/resources/activities/examples/cql-rowops.yaml
similarity index 100%
rename from adapter-cqld4/src/main/resources/activities/examples/cql-rowops.yaml
rename to nb-adapters/adapter-cqld4/src/main/resources/activities/examples/cql-rowops.yaml
diff --git a/adapter-cqld4/src/main/resources/cql.md b/nb-adapters/adapter-cqld4/src/main/resources/cql.md
similarity index 100%
rename from adapter-cqld4/src/main/resources/cql.md
rename to nb-adapters/adapter-cqld4/src/main/resources/cql.md
diff --git a/adapter-cqld4/src/main/resources/cqld4.md b/nb-adapters/adapter-cqld4/src/main/resources/cqld4.md
similarity index 100%
rename from adapter-cqld4/src/main/resources/cqld4.md
rename to nb-adapters/adapter-cqld4/src/main/resources/cqld4.md
diff --git a/adapter-cqld4/src/main/resources/cqlgen.md b/nb-adapters/adapter-cqld4/src/main/resources/cqlgen.md
similarity index 100%
rename from adapter-cqld4/src/main/resources/cqlgen.md
rename to nb-adapters/adapter-cqld4/src/main/resources/cqlgen.md
diff --git a/adapter-cqld4/src/main/resources/cqlgen/bindings-cqlgen.yaml b/nb-adapters/adapter-cqld4/src/main/resources/cqlgen/bindings-cqlgen.yaml
similarity index 100%
rename from adapter-cqld4/src/main/resources/cqlgen/bindings-cqlgen.yaml
rename to nb-adapters/adapter-cqld4/src/main/resources/cqlgen/bindings-cqlgen.yaml
diff --git a/adapter-cqld4/src/main/resources/cqlgen/cqlgen.conf b/nb-adapters/adapter-cqld4/src/main/resources/cqlgen/cqlgen.conf
similarity index 100%
rename from adapter-cqld4/src/main/resources/cqlgen/cqlgen.conf
rename to nb-adapters/adapter-cqld4/src/main/resources/cqlgen/cqlgen.conf
diff --git a/adapter-cqld4/src/main/resources/curate_docs/README.md b/nb-adapters/adapter-cqld4/src/main/resources/curate_docs/README.md
similarity index 100%
rename from adapter-cqld4/src/main/resources/curate_docs/README.md
rename to nb-adapters/adapter-cqld4/src/main/resources/curate_docs/README.md
diff --git a/adapter-cqld4/src/main/resources/curate_docs/advanced-cql.md b/nb-adapters/adapter-cqld4/src/main/resources/curate_docs/advanced-cql.md
similarity index 100%
rename from adapter-cqld4/src/main/resources/curate_docs/advanced-cql.md
rename to nb-adapters/adapter-cqld4/src/main/resources/curate_docs/advanced-cql.md
diff --git a/adapter-cqld4/src/main/resources/curate_docs/cql-errors.md b/nb-adapters/adapter-cqld4/src/main/resources/curate_docs/cql-errors.md
similarity index 100%
rename from adapter-cqld4/src/main/resources/curate_docs/cql-errors.md
rename to nb-adapters/adapter-cqld4/src/main/resources/curate_docs/cql-errors.md
diff --git a/adapter-cqld4/src/main/resources/curate_docs/cql-exception-list.md b/nb-adapters/adapter-cqld4/src/main/resources/curate_docs/cql-exception-list.md
similarity index 100%
rename from adapter-cqld4/src/main/resources/curate_docs/cql-exception-list.md
rename to nb-adapters/adapter-cqld4/src/main/resources/curate_docs/cql-exception-list.md
diff --git a/adapter-cqld4/src/main/resources/curate_docs/cql-loadbalancing.md b/nb-adapters/adapter-cqld4/src/main/resources/curate_docs/cql-loadbalancing.md
similarity index 100%
rename from adapter-cqld4/src/main/resources/curate_docs/cql-loadbalancing.md
rename to nb-adapters/adapter-cqld4/src/main/resources/curate_docs/cql-loadbalancing.md
diff --git a/adapter-cqld4/src/main/resources/curate_docs/cql.md b/nb-adapters/adapter-cqld4/src/main/resources/curate_docs/cql.md
similarity index 100%
rename from adapter-cqld4/src/main/resources/curate_docs/cql.md
rename to nb-adapters/adapter-cqld4/src/main/resources/curate_docs/cql.md
diff --git a/adapter-cqld4/src/main/resources/curate_docs/cql_olddocs.md b/nb-adapters/adapter-cqld4/src/main/resources/curate_docs/cql_olddocs.md
similarity index 100%
rename from adapter-cqld4/src/main/resources/curate_docs/cql_olddocs.md
rename to nb-adapters/adapter-cqld4/src/main/resources/curate_docs/cql_olddocs.md
diff --git a/adapter-cqld4/src/main/resources/curate_docs/dsegraph.md b/nb-adapters/adapter-cqld4/src/main/resources/curate_docs/dsegraph.md
similarity index 100%
rename from adapter-cqld4/src/main/resources/curate_docs/dsegraph.md
rename to nb-adapters/adapter-cqld4/src/main/resources/curate_docs/dsegraph.md
diff --git a/adapter-cqld4/src/main/resources/curate_docs/topics.md b/nb-adapters/adapter-cqld4/src/main/resources/curate_docs/topics.md
similarity index 100%
rename from adapter-cqld4/src/main/resources/curate_docs/topics.md
rename to nb-adapters/adapter-cqld4/src/main/resources/curate_docs/topics.md
diff --git a/adapter-cqld4/src/main/resources/data/cql-starter-message.txt b/nb-adapters/adapter-cqld4/src/main/resources/data/cql-starter-message.txt
similarity index 100%
rename from adapter-cqld4/src/main/resources/data/cql-starter-message.txt
rename to nb-adapters/adapter-cqld4/src/main/resources/data/cql-starter-message.txt
diff --git a/adapter-cqld4/src/main/resources/ssl.md b/nb-adapters/adapter-cqld4/src/main/resources/ssl.md
similarity index 100%
rename from adapter-cqld4/src/main/resources/ssl.md
rename to nb-adapters/adapter-cqld4/src/main/resources/ssl.md
diff --git a/adapter-cqld4/src/test/java/io/nosqlbench/converters/cql/cql/parser/CqlParserHarnessTest.java b/nb-adapters/adapter-cqld4/src/test/java/io/nosqlbench/converters/cql/cql/parser/CqlParserHarnessTest.java
similarity index 100%
rename from adapter-cqld4/src/test/java/io/nosqlbench/converters/cql/cql/parser/CqlParserHarnessTest.java
rename to nb-adapters/adapter-cqld4/src/test/java/io/nosqlbench/converters/cql/cql/parser/CqlParserHarnessTest.java
diff --git a/adapter-cqld4/src/test/java/io/nosqlbench/converters/cql/exporters/CGElementNamerTest.java b/nb-adapters/adapter-cqld4/src/test/java/io/nosqlbench/converters/cql/exporters/CGElementNamerTest.java
similarity index 100%
rename from adapter-cqld4/src/test/java/io/nosqlbench/converters/cql/exporters/CGElementNamerTest.java
rename to nb-adapters/adapter-cqld4/src/test/java/io/nosqlbench/converters/cql/exporters/CGElementNamerTest.java
diff --git a/adapter-cqld4/src/test/java/io/nosqlbench/converters/cql/exporters/CGWorkloadExporterTest.java b/nb-adapters/adapter-cqld4/src/test/java/io/nosqlbench/converters/cql/exporters/CGWorkloadExporterTest.java
similarity index 100%
rename from adapter-cqld4/src/test/java/io/nosqlbench/converters/cql/exporters/CGWorkloadExporterTest.java
rename to nb-adapters/adapter-cqld4/src/test/java/io/nosqlbench/converters/cql/exporters/CGWorkloadExporterTest.java
diff --git a/adapter-cqld4/src/test/java/io/nosqlbench/converters/cql/exporters/NamingFolioTest.java b/nb-adapters/adapter-cqld4/src/test/java/io/nosqlbench/converters/cql/exporters/NamingFolioTest.java
similarity index 100%
rename from adapter-cqld4/src/test/java/io/nosqlbench/converters/cql/exporters/NamingFolioTest.java
rename to nb-adapters/adapter-cqld4/src/test/java/io/nosqlbench/converters/cql/exporters/NamingFolioTest.java
diff --git a/adapter-cqld4/src/test/java/io/nosqlbench/cqlgen/exporter/transformers/CGRegexReplacerTest.java b/nb-adapters/adapter-cqld4/src/test/java/io/nosqlbench/cqlgen/exporter/transformers/CGRegexReplacerTest.java
similarity index 100%
rename from adapter-cqld4/src/test/java/io/nosqlbench/cqlgen/exporter/transformers/CGRegexReplacerTest.java
rename to nb-adapters/adapter-cqld4/src/test/java/io/nosqlbench/cqlgen/exporter/transformers/CGRegexReplacerTest.java
diff --git a/adapter-cqld4/src/test/java/io/nosqlbench/datamappers/functions/double_to_cqlduration/CqlDurationTests.java b/nb-adapters/adapter-cqld4/src/test/java/io/nosqlbench/datamappers/functions/double_to_cqlduration/CqlDurationTests.java
similarity index 100%
rename from adapter-cqld4/src/test/java/io/nosqlbench/datamappers/functions/double_to_cqlduration/CqlDurationTests.java
rename to nb-adapters/adapter-cqld4/src/test/java/io/nosqlbench/datamappers/functions/double_to_cqlduration/CqlDurationTests.java
diff --git a/adapter-cqld4/src/test/java/io/nosqlbench/datamappers/functions/geometry/NormalizeCqlVectorTest.java b/nb-adapters/adapter-cqld4/src/test/java/io/nosqlbench/datamappers/functions/geometry/NormalizeCqlVectorTest.java
similarity index 100%
rename from adapter-cqld4/src/test/java/io/nosqlbench/datamappers/functions/geometry/NormalizeCqlVectorTest.java
rename to nb-adapters/adapter-cqld4/src/test/java/io/nosqlbench/datamappers/functions/geometry/NormalizeCqlVectorTest.java
diff --git a/adapter-cqld4/src/test/java/io/nosqlbench/datamappers/functions/long_localdate/EpochMillisToJavaLocalDateTest.java b/nb-adapters/adapter-cqld4/src/test/java/io/nosqlbench/datamappers/functions/long_localdate/EpochMillisToJavaLocalDateTest.java
similarity index 100%
rename from adapter-cqld4/src/test/java/io/nosqlbench/datamappers/functions/long_localdate/EpochMillisToJavaLocalDateTest.java
rename to nb-adapters/adapter-cqld4/src/test/java/io/nosqlbench/datamappers/functions/long_localdate/EpochMillisToJavaLocalDateTest.java
diff --git a/adapter-cqld4/src/test/java/io/nosqlbench/datamappers/functions/to_cqlvector/CqlVectorTest.java b/nb-adapters/adapter-cqld4/src/test/java/io/nosqlbench/datamappers/functions/to_cqlvector/CqlVectorTest.java
similarity index 100%
rename from adapter-cqld4/src/test/java/io/nosqlbench/datamappers/functions/to_cqlvector/CqlVectorTest.java
rename to nb-adapters/adapter-cqld4/src/test/java/io/nosqlbench/datamappers/functions/to_cqlvector/CqlVectorTest.java
diff --git a/adapter-cqld4/src/test/java/io/nosqlbench/datamappers/functions/to_cqlvector/ToCqlVectorTest.java b/nb-adapters/adapter-cqld4/src/test/java/io/nosqlbench/datamappers/functions/to_cqlvector/ToCqlVectorTest.java
similarity index 100%
rename from adapter-cqld4/src/test/java/io/nosqlbench/datamappers/functions/to_cqlvector/ToCqlVectorTest.java
rename to nb-adapters/adapter-cqld4/src/test/java/io/nosqlbench/datamappers/functions/to_cqlvector/ToCqlVectorTest.java
diff --git a/adapter-cqld4/src/test/java/io/nosqlbench/datamappers/functions/to_daterange/DateRangeFuncTest.java b/nb-adapters/adapter-cqld4/src/test/java/io/nosqlbench/datamappers/functions/to_daterange/DateRangeFuncTest.java
similarity index 100%
rename from adapter-cqld4/src/test/java/io/nosqlbench/datamappers/functions/to_daterange/DateRangeFuncTest.java
rename to nb-adapters/adapter-cqld4/src/test/java/io/nosqlbench/datamappers/functions/to_daterange/DateRangeFuncTest.java
diff --git a/adapter-cqld4/src/test/resources/cql3_examples/alterKeyspace.cql b/nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/alterKeyspace.cql
similarity index 100%
rename from adapter-cqld4/src/test/resources/cql3_examples/alterKeyspace.cql
rename to nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/alterKeyspace.cql
diff --git a/adapter-cqld4/src/test/resources/cql3_examples/alterMaterializedView.cql b/nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/alterMaterializedView.cql
similarity index 100%
rename from adapter-cqld4/src/test/resources/cql3_examples/alterMaterializedView.cql
rename to nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/alterMaterializedView.cql
diff --git a/adapter-cqld4/src/test/resources/cql3_examples/alterRole.cql b/nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/alterRole.cql
similarity index 100%
rename from adapter-cqld4/src/test/resources/cql3_examples/alterRole.cql
rename to nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/alterRole.cql
diff --git a/adapter-cqld4/src/test/resources/cql3_examples/alterTable.cql b/nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/alterTable.cql
similarity index 100%
rename from adapter-cqld4/src/test/resources/cql3_examples/alterTable.cql
rename to nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/alterTable.cql
diff --git a/adapter-cqld4/src/test/resources/cql3_examples/alterType.cql b/nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/alterType.cql
similarity index 100%
rename from adapter-cqld4/src/test/resources/cql3_examples/alterType.cql
rename to nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/alterType.cql
diff --git a/adapter-cqld4/src/test/resources/cql3_examples/alterUser.cql b/nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/alterUser.cql
similarity index 100%
rename from adapter-cqld4/src/test/resources/cql3_examples/alterUser.cql
rename to nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/alterUser.cql
diff --git a/adapter-cqld4/src/test/resources/cql3_examples/applyBatch.cql b/nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/applyBatch.cql
similarity index 100%
rename from adapter-cqld4/src/test/resources/cql3_examples/applyBatch.cql
rename to nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/applyBatch.cql
diff --git a/adapter-cqld4/src/test/resources/cql3_examples/createAggregate.cql b/nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/createAggregate.cql
similarity index 100%
rename from adapter-cqld4/src/test/resources/cql3_examples/createAggregate.cql
rename to nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/createAggregate.cql
diff --git a/adapter-cqld4/src/test/resources/cql3_examples/createFunction.cql b/nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/createFunction.cql
similarity index 100%
rename from adapter-cqld4/src/test/resources/cql3_examples/createFunction.cql
rename to nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/createFunction.cql
diff --git a/adapter-cqld4/src/test/resources/cql3_examples/createIndex.cql b/nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/createIndex.cql
similarity index 100%
rename from adapter-cqld4/src/test/resources/cql3_examples/createIndex.cql
rename to nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/createIndex.cql
diff --git a/adapter-cqld4/src/test/resources/cql3_examples/createKeyspace.cql b/nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/createKeyspace.cql
similarity index 100%
rename from adapter-cqld4/src/test/resources/cql3_examples/createKeyspace.cql
rename to nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/createKeyspace.cql
diff --git a/adapter-cqld4/src/test/resources/cql3_examples/createMaterializedView.cql b/nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/createMaterializedView.cql
similarity index 100%
rename from adapter-cqld4/src/test/resources/cql3_examples/createMaterializedView.cql
rename to nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/createMaterializedView.cql
diff --git a/adapter-cqld4/src/test/resources/cql3_examples/createRole.cql b/nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/createRole.cql
similarity index 100%
rename from adapter-cqld4/src/test/resources/cql3_examples/createRole.cql
rename to nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/createRole.cql
diff --git a/adapter-cqld4/src/test/resources/cql3_examples/createTable.cql b/nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/createTable.cql
similarity index 100%
rename from adapter-cqld4/src/test/resources/cql3_examples/createTable.cql
rename to nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/createTable.cql
diff --git a/adapter-cqld4/src/test/resources/cql3_examples/createTrigger.cql b/nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/createTrigger.cql
similarity index 100%
rename from adapter-cqld4/src/test/resources/cql3_examples/createTrigger.cql
rename to nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/createTrigger.cql
diff --git a/adapter-cqld4/src/test/resources/cql3_examples/createType.cql b/nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/createType.cql
similarity index 100%
rename from adapter-cqld4/src/test/resources/cql3_examples/createType.cql
rename to nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/createType.cql
diff --git a/adapter-cqld4/src/test/resources/cql3_examples/createUser.cql b/nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/createUser.cql
similarity index 100%
rename from adapter-cqld4/src/test/resources/cql3_examples/createUser.cql
rename to nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/createUser.cql
diff --git a/adapter-cqld4/src/test/resources/cql3_examples/delete.cql b/nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/delete.cql
similarity index 100%
rename from adapter-cqld4/src/test/resources/cql3_examples/delete.cql
rename to nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/delete.cql
diff --git a/adapter-cqld4/src/test/resources/cql3_examples/dropAggregate.cql b/nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/dropAggregate.cql
similarity index 100%
rename from adapter-cqld4/src/test/resources/cql3_examples/dropAggregate.cql
rename to nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/dropAggregate.cql
diff --git a/adapter-cqld4/src/test/resources/cql3_examples/dropFunction.cql b/nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/dropFunction.cql
similarity index 100%
rename from adapter-cqld4/src/test/resources/cql3_examples/dropFunction.cql
rename to nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/dropFunction.cql
diff --git a/adapter-cqld4/src/test/resources/cql3_examples/dropIndex.cql b/nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/dropIndex.cql
similarity index 100%
rename from adapter-cqld4/src/test/resources/cql3_examples/dropIndex.cql
rename to nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/dropIndex.cql
diff --git a/adapter-cqld4/src/test/resources/cql3_examples/dropKeyspace.cql b/nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/dropKeyspace.cql
similarity index 100%
rename from adapter-cqld4/src/test/resources/cql3_examples/dropKeyspace.cql
rename to nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/dropKeyspace.cql
diff --git a/adapter-cqld4/src/test/resources/cql3_examples/dropMaterializedView.cql b/nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/dropMaterializedView.cql
similarity index 100%
rename from adapter-cqld4/src/test/resources/cql3_examples/dropMaterializedView.cql
rename to nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/dropMaterializedView.cql
diff --git a/adapter-cqld4/src/test/resources/cql3_examples/dropRole.cql b/nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/dropRole.cql
similarity index 100%
rename from adapter-cqld4/src/test/resources/cql3_examples/dropRole.cql
rename to nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/dropRole.cql
diff --git a/adapter-cqld4/src/test/resources/cql3_examples/dropTable.cql b/nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/dropTable.cql
similarity index 100%
rename from adapter-cqld4/src/test/resources/cql3_examples/dropTable.cql
rename to nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/dropTable.cql
diff --git a/adapter-cqld4/src/test/resources/cql3_examples/dropTrigger.cql b/nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/dropTrigger.cql
similarity index 100%
rename from adapter-cqld4/src/test/resources/cql3_examples/dropTrigger.cql
rename to nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/dropTrigger.cql
diff --git a/adapter-cqld4/src/test/resources/cql3_examples/dropType.cql b/nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/dropType.cql
similarity index 100%
rename from adapter-cqld4/src/test/resources/cql3_examples/dropType.cql
rename to nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/dropType.cql
diff --git a/adapter-cqld4/src/test/resources/cql3_examples/dropUser.cql b/nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/dropUser.cql
similarity index 100%
rename from adapter-cqld4/src/test/resources/cql3_examples/dropUser.cql
rename to nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/dropUser.cql
diff --git a/adapter-cqld4/src/test/resources/cql3_examples/grant.cql b/nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/grant.cql
similarity index 100%
rename from adapter-cqld4/src/test/resources/cql3_examples/grant.cql
rename to nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/grant.cql
diff --git a/adapter-cqld4/src/test/resources/cql3_examples/insert.cql b/nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/insert.cql
similarity index 100%
rename from adapter-cqld4/src/test/resources/cql3_examples/insert.cql
rename to nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/insert.cql
diff --git a/adapter-cqld4/src/test/resources/cql3_examples/listPermissions.cql b/nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/listPermissions.cql
similarity index 100%
rename from adapter-cqld4/src/test/resources/cql3_examples/listPermissions.cql
rename to nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/listPermissions.cql
diff --git a/adapter-cqld4/src/test/resources/cql3_examples/listRoles.cql b/nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/listRoles.cql
similarity index 100%
rename from adapter-cqld4/src/test/resources/cql3_examples/listRoles.cql
rename to nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/listRoles.cql
diff --git a/adapter-cqld4/src/test/resources/cql3_examples/revoke.cql b/nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/revoke.cql
similarity index 100%
rename from adapter-cqld4/src/test/resources/cql3_examples/revoke.cql
rename to nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/revoke.cql
diff --git a/adapter-cqld4/src/test/resources/cql3_examples/select.cql b/nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/select.cql
similarity index 100%
rename from adapter-cqld4/src/test/resources/cql3_examples/select.cql
rename to nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/select.cql
diff --git a/adapter-cqld4/src/test/resources/cql3_examples/truncate.cql b/nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/truncate.cql
similarity index 100%
rename from adapter-cqld4/src/test/resources/cql3_examples/truncate.cql
rename to nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/truncate.cql
diff --git a/adapter-cqld4/src/test/resources/cql3_examples/update.cql b/nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/update.cql
similarity index 100%
rename from adapter-cqld4/src/test/resources/cql3_examples/update.cql
rename to nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/update.cql
diff --git a/adapter-cqld4/src/test/resources/cql3_examples/use.cql b/nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/use.cql
similarity index 100%
rename from adapter-cqld4/src/test/resources/cql3_examples/use.cql
rename to nb-adapters/adapter-cqld4/src/test/resources/cql3_examples/use.cql
diff --git a/adapter-cqld4/src/test/resources/testschemas/cql_alltypes.cql b/nb-adapters/adapter-cqld4/src/test/resources/testschemas/cql_alltypes.cql
similarity index 100%
rename from adapter-cqld4/src/test/resources/testschemas/cql_alltypes.cql
rename to nb-adapters/adapter-cqld4/src/test/resources/testschemas/cql_alltypes.cql
diff --git a/adapter-cqld4/src/test/resources/testschemas/cql_alltypes.yaml b/nb-adapters/adapter-cqld4/src/test/resources/testschemas/cql_alltypes.yaml
similarity index 100%
rename from adapter-cqld4/src/test/resources/testschemas/cql_alltypes.yaml
rename to nb-adapters/adapter-cqld4/src/test/resources/testschemas/cql_alltypes.yaml
diff --git a/adapter-diag/pom.xml b/nb-adapters/adapter-diag/pom.xml
similarity index 95%
rename from adapter-diag/pom.xml
rename to nb-adapters/adapter-diag/pom.xml
index 160406237f..8fc3853a76 100644
--- a/adapter-diag/pom.xml
+++ b/nb-adapters/adapter-diag/pom.xml
@@ -22,7 +22,7 @@
mvn-defaults
io.nosqlbench
${revision}
- ../mvn-defaults
+ ../../mvn-defaults
adapter-diag
@@ -58,7 +58,7 @@
io.nosqlbench
- engine-core
+ nb-engine-core
${revision}
compile
diff --git a/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/DiagDriverAdapter.java b/nb-adapters/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/DiagDriverAdapter.java
similarity index 100%
rename from adapter-diag/src/main/java/io/nosqlbench/adapter/diag/DiagDriverAdapter.java
rename to nb-adapters/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/DiagDriverAdapter.java
diff --git a/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/DiagDriverAdapterLoader.java b/nb-adapters/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/DiagDriverAdapterLoader.java
similarity index 100%
rename from adapter-diag/src/main/java/io/nosqlbench/adapter/diag/DiagDriverAdapterLoader.java
rename to nb-adapters/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/DiagDriverAdapterLoader.java
diff --git a/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/DiagOp.java b/nb-adapters/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/DiagOp.java
similarity index 100%
rename from adapter-diag/src/main/java/io/nosqlbench/adapter/diag/DiagOp.java
rename to nb-adapters/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/DiagOp.java
diff --git a/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/DiagOpDispenser.java b/nb-adapters/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/DiagOpDispenser.java
similarity index 100%
rename from adapter-diag/src/main/java/io/nosqlbench/adapter/diag/DiagOpDispenser.java
rename to nb-adapters/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/DiagOpDispenser.java
diff --git a/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/DiagOpMapper.java b/nb-adapters/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/DiagOpMapper.java
similarity index 100%
rename from adapter-diag/src/main/java/io/nosqlbench/adapter/diag/DiagOpMapper.java
rename to nb-adapters/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/DiagOpMapper.java
diff --git a/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/DiagSpace.java b/nb-adapters/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/DiagSpace.java
similarity index 100%
rename from adapter-diag/src/main/java/io/nosqlbench/adapter/diag/DiagSpace.java
rename to nb-adapters/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/DiagSpace.java
diff --git a/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/BaseDiagTask.java b/nb-adapters/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/BaseDiagTask.java
similarity index 100%
rename from adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/BaseDiagTask.java
rename to nb-adapters/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/BaseDiagTask.java
diff --git a/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/DiagTask.java b/nb-adapters/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/DiagTask.java
similarity index 100%
rename from adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/DiagTask.java
rename to nb-adapters/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/DiagTask.java
diff --git a/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/DiagTask_diagrate.java b/nb-adapters/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/DiagTask_diagrate.java
similarity index 100%
rename from adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/DiagTask_diagrate.java
rename to nb-adapters/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/DiagTask_diagrate.java
diff --git a/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/DiagTask_erroroncycle.java b/nb-adapters/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/DiagTask_erroroncycle.java
similarity index 100%
rename from adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/DiagTask_erroroncycle.java
rename to nb-adapters/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/DiagTask_erroroncycle.java
diff --git a/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/DiagTask_gauge.java b/nb-adapters/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/DiagTask_gauge.java
similarity index 100%
rename from adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/DiagTask_gauge.java
rename to nb-adapters/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/DiagTask_gauge.java
diff --git a/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/DiagTask_initdelay.java b/nb-adapters/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/DiagTask_initdelay.java
similarity index 100%
rename from adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/DiagTask_initdelay.java
rename to nb-adapters/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/DiagTask_initdelay.java
diff --git a/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/DiagTask_log.java b/nb-adapters/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/DiagTask_log.java
similarity index 100%
rename from adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/DiagTask_log.java
rename to nb-adapters/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/DiagTask_log.java
diff --git a/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/DiagTask_noop.java b/nb-adapters/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/DiagTask_noop.java
similarity index 100%
rename from adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/DiagTask_noop.java
rename to nb-adapters/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/optasks/DiagTask_noop.java
diff --git a/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/types/OpNameAware.java b/nb-adapters/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/types/OpNameAware.java
similarity index 100%
rename from adapter-diag/src/main/java/io/nosqlbench/adapter/diag/types/OpNameAware.java
rename to nb-adapters/adapter-diag/src/main/java/io/nosqlbench/adapter/diag/types/OpNameAware.java
diff --git a/adapter-diag/src/main/resources/activities/examples/diag-gauge.yaml b/nb-adapters/adapter-diag/src/main/resources/activities/examples/diag-gauge.yaml
similarity index 100%
rename from adapter-diag/src/main/resources/activities/examples/diag-gauge.yaml
rename to nb-adapters/adapter-diag/src/main/resources/activities/examples/diag-gauge.yaml
diff --git a/adapter-diag/src/main/resources/diag.md b/nb-adapters/adapter-diag/src/main/resources/diag.md
similarity index 100%
rename from adapter-diag/src/main/resources/diag.md
rename to nb-adapters/adapter-diag/src/main/resources/diag.md
diff --git a/adapter-diag/src/main/resources/example-data/lorem_ipsum_full.txt b/nb-adapters/adapter-diag/src/main/resources/example-data/lorem_ipsum_full.txt
similarity index 100%
rename from adapter-diag/src/main/resources/example-data/lorem_ipsum_full.txt
rename to nb-adapters/adapter-diag/src/main/resources/example-data/lorem_ipsum_full.txt
diff --git a/adapter-diag/src/main/resources/topics.md b/nb-adapters/adapter-diag/src/main/resources/topics.md
similarity index 100%
rename from adapter-diag/src/main/resources/topics.md
rename to nb-adapters/adapter-diag/src/main/resources/topics.md
diff --git a/adapter-diag/src/test/java/io/nosqlbench/adapter/diag/optasks/DiagTask_gaugeTest.java b/nb-adapters/adapter-diag/src/test/java/io/nosqlbench/adapter/diag/optasks/DiagTask_gaugeTest.java
similarity index 100%
rename from adapter-diag/src/test/java/io/nosqlbench/adapter/diag/optasks/DiagTask_gaugeTest.java
rename to nb-adapters/adapter-diag/src/test/java/io/nosqlbench/adapter/diag/optasks/DiagTask_gaugeTest.java
diff --git a/adapter-dynamodb/pom.xml b/nb-adapters/adapter-dynamodb/pom.xml
similarity index 96%
rename from adapter-dynamodb/pom.xml
rename to nb-adapters/adapter-dynamodb/pom.xml
index 59794a9c14..766f2a0613 100644
--- a/adapter-dynamodb/pom.xml
+++ b/nb-adapters/adapter-dynamodb/pom.xml
@@ -21,7 +21,7 @@
io.nosqlbench
mvn-defaults
${revision}
- ../mvn-defaults
+ ../../mvn-defaults
adapter-dynamodb
diff --git a/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/DynamoDBCmdType.java b/nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/DynamoDBCmdType.java
similarity index 100%
rename from adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/DynamoDBCmdType.java
rename to nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/DynamoDBCmdType.java
diff --git a/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/DynamoDBDriverAdapter.java b/nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/DynamoDBDriverAdapter.java
similarity index 100%
rename from adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/DynamoDBDriverAdapter.java
rename to nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/DynamoDBDriverAdapter.java
diff --git a/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/DynamoDBDriverAdapterLoader.java b/nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/DynamoDBDriverAdapterLoader.java
similarity index 100%
rename from adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/DynamoDBDriverAdapterLoader.java
rename to nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/DynamoDBDriverAdapterLoader.java
diff --git a/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/DynamoDBOpMapper.java b/nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/DynamoDBOpMapper.java
similarity index 100%
rename from adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/DynamoDBOpMapper.java
rename to nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/DynamoDBOpMapper.java
diff --git a/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/DynamoDBSpace.java b/nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/DynamoDBSpace.java
similarity index 100%
rename from adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/DynamoDBSpace.java
rename to nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/DynamoDBSpace.java
diff --git a/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/opdispensers/DDBCreateTableOpDispenser.java b/nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/opdispensers/DDBCreateTableOpDispenser.java
similarity index 100%
rename from adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/opdispensers/DDBCreateTableOpDispenser.java
rename to nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/opdispensers/DDBCreateTableOpDispenser.java
diff --git a/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/opdispensers/DDBDeleteTableOpDispenser.java b/nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/opdispensers/DDBDeleteTableOpDispenser.java
similarity index 100%
rename from adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/opdispensers/DDBDeleteTableOpDispenser.java
rename to nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/opdispensers/DDBDeleteTableOpDispenser.java
diff --git a/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/opdispensers/DDBGetItemOpDispenser.java b/nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/opdispensers/DDBGetItemOpDispenser.java
similarity index 100%
rename from adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/opdispensers/DDBGetItemOpDispenser.java
rename to nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/opdispensers/DDBGetItemOpDispenser.java
diff --git a/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/opdispensers/DDBPutItemOpDispenser.java b/nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/opdispensers/DDBPutItemOpDispenser.java
similarity index 100%
rename from adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/opdispensers/DDBPutItemOpDispenser.java
rename to nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/opdispensers/DDBPutItemOpDispenser.java
diff --git a/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/opdispensers/DDBQueryOpDispenser.java b/nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/opdispensers/DDBQueryOpDispenser.java
similarity index 100%
rename from adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/opdispensers/DDBQueryOpDispenser.java
rename to nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/opdispensers/DDBQueryOpDispenser.java
diff --git a/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/opdispensers/RawDynamoDBOpDispenser.java b/nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/opdispensers/RawDynamoDBOpDispenser.java
similarity index 100%
rename from adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/opdispensers/RawDynamoDBOpDispenser.java
rename to nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/opdispensers/RawDynamoDBOpDispenser.java
diff --git a/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/optypes/DDBCreateTableOp.java b/nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/optypes/DDBCreateTableOp.java
similarity index 100%
rename from adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/optypes/DDBCreateTableOp.java
rename to nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/optypes/DDBCreateTableOp.java
diff --git a/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/optypes/DDBDeleteTableOp.java b/nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/optypes/DDBDeleteTableOp.java
similarity index 100%
rename from adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/optypes/DDBDeleteTableOp.java
rename to nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/optypes/DDBDeleteTableOp.java
diff --git a/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/optypes/DDBGetItemOp.java b/nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/optypes/DDBGetItemOp.java
similarity index 100%
rename from adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/optypes/DDBGetItemOp.java
rename to nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/optypes/DDBGetItemOp.java
diff --git a/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/optypes/DDBPutItemOp.java b/nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/optypes/DDBPutItemOp.java
similarity index 100%
rename from adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/optypes/DDBPutItemOp.java
rename to nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/optypes/DDBPutItemOp.java
diff --git a/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/optypes/DDBQueryOp.java b/nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/optypes/DDBQueryOp.java
similarity index 100%
rename from adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/optypes/DDBQueryOp.java
rename to nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/optypes/DDBQueryOp.java
diff --git a/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/optypes/DynamoDBOp.java b/nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/optypes/DynamoDBOp.java
similarity index 100%
rename from adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/optypes/DynamoDBOp.java
rename to nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/optypes/DynamoDBOp.java
diff --git a/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/optypes/RawDynamodOp.java b/nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/optypes/RawDynamodOp.java
similarity index 100%
rename from adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/optypes/RawDynamodOp.java
rename to nb-adapters/adapter-dynamodb/src/main/java/io/nosqlbench/adapter/dynamodb/optypes/RawDynamodOp.java
diff --git a/adapter-dynamodb/src/main/resources/activities/baselinesv2/dynamodb-keyvalue2.yaml b/nb-adapters/adapter-dynamodb/src/main/resources/activities/baselinesv2/dynamodb-keyvalue2.yaml
similarity index 100%
rename from adapter-dynamodb/src/main/resources/activities/baselinesv2/dynamodb-keyvalue2.yaml
rename to nb-adapters/adapter-dynamodb/src/main/resources/activities/baselinesv2/dynamodb-keyvalue2.yaml
diff --git a/adapter-dynamodb/src/main/resources/activities/baselinesv2/dynamodb-tabular2.yaml b/nb-adapters/adapter-dynamodb/src/main/resources/activities/baselinesv2/dynamodb-tabular2.yaml
similarity index 100%
rename from adapter-dynamodb/src/main/resources/activities/baselinesv2/dynamodb-tabular2.yaml
rename to nb-adapters/adapter-dynamodb/src/main/resources/activities/baselinesv2/dynamodb-tabular2.yaml
diff --git a/adapter-dynamodb/src/main/resources/activities/baselinesv2/dynamodb-timeseries2.yaml b/nb-adapters/adapter-dynamodb/src/main/resources/activities/baselinesv2/dynamodb-timeseries2.yaml
similarity index 100%
rename from adapter-dynamodb/src/main/resources/activities/baselinesv2/dynamodb-timeseries2.yaml
rename to nb-adapters/adapter-dynamodb/src/main/resources/activities/baselinesv2/dynamodb-timeseries2.yaml
diff --git a/adapter-dynamodb/src/main/resources/dynamodb.md b/nb-adapters/adapter-dynamodb/src/main/resources/dynamodb.md
similarity index 100%
rename from adapter-dynamodb/src/main/resources/dynamodb.md
rename to nb-adapters/adapter-dynamodb/src/main/resources/dynamodb.md
diff --git a/adapter-http/pom.xml b/nb-adapters/adapter-http/pom.xml
similarity index 97%
rename from adapter-http/pom.xml
rename to nb-adapters/adapter-http/pom.xml
index 6bdf5f4fd9..1e82188e44 100644
--- a/adapter-http/pom.xml
+++ b/nb-adapters/adapter-http/pom.xml
@@ -21,7 +21,7 @@
mvn-defaults
io.nosqlbench
${revision}
- ../mvn-defaults
+ ../../mvn-defaults
adapter-http
diff --git a/adapter-http/src/main/java/io/nosqlbench/adapter/http/HttpDriverAdapter.java b/nb-adapters/adapter-http/src/main/java/io/nosqlbench/adapter/http/HttpDriverAdapter.java
similarity index 100%
rename from adapter-http/src/main/java/io/nosqlbench/adapter/http/HttpDriverAdapter.java
rename to nb-adapters/adapter-http/src/main/java/io/nosqlbench/adapter/http/HttpDriverAdapter.java
diff --git a/adapter-http/src/main/java/io/nosqlbench/adapter/http/HttpDriverAdapterLoader.java b/nb-adapters/adapter-http/src/main/java/io/nosqlbench/adapter/http/HttpDriverAdapterLoader.java
similarity index 100%
rename from adapter-http/src/main/java/io/nosqlbench/adapter/http/HttpDriverAdapterLoader.java
rename to nb-adapters/adapter-http/src/main/java/io/nosqlbench/adapter/http/HttpDriverAdapterLoader.java
diff --git a/adapter-http/src/main/java/io/nosqlbench/adapter/http/JsonElementUtils.java b/nb-adapters/adapter-http/src/main/java/io/nosqlbench/adapter/http/JsonElementUtils.java
similarity index 100%
rename from adapter-http/src/main/java/io/nosqlbench/adapter/http/JsonElementUtils.java
rename to nb-adapters/adapter-http/src/main/java/io/nosqlbench/adapter/http/JsonElementUtils.java
diff --git a/adapter-http/src/main/java/io/nosqlbench/adapter/http/apps/BodySchemaAssembly.java b/nb-adapters/adapter-http/src/main/java/io/nosqlbench/adapter/http/apps/BodySchemaAssembly.java
similarity index 100%
rename from adapter-http/src/main/java/io/nosqlbench/adapter/http/apps/BodySchemaAssembly.java
rename to nb-adapters/adapter-http/src/main/java/io/nosqlbench/adapter/http/apps/BodySchemaAssembly.java
diff --git a/adapter-http/src/main/java/io/nosqlbench/adapter/http/apps/OpenApiExporter.java b/nb-adapters/adapter-http/src/main/java/io/nosqlbench/adapter/http/apps/OpenApiExporter.java
similarity index 100%
rename from adapter-http/src/main/java/io/nosqlbench/adapter/http/apps/OpenApiExporter.java
rename to nb-adapters/adapter-http/src/main/java/io/nosqlbench/adapter/http/apps/OpenApiExporter.java
diff --git a/adapter-http/src/main/java/io/nosqlbench/adapter/http/apps/app-openapi-exporter.md b/nb-adapters/adapter-http/src/main/java/io/nosqlbench/adapter/http/apps/app-openapi-exporter.md
similarity index 100%
rename from adapter-http/src/main/java/io/nosqlbench/adapter/http/apps/app-openapi-exporter.md
rename to nb-adapters/adapter-http/src/main/java/io/nosqlbench/adapter/http/apps/app-openapi-exporter.md
diff --git a/adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpConsoleFormats.java b/nb-adapters/adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpConsoleFormats.java
similarity index 100%
rename from adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpConsoleFormats.java
rename to nb-adapters/adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpConsoleFormats.java
diff --git a/adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpFormatParser.java b/nb-adapters/adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpFormatParser.java
similarity index 100%
rename from adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpFormatParser.java
rename to nb-adapters/adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpFormatParser.java
diff --git a/adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpMetrics.java b/nb-adapters/adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpMetrics.java
similarity index 100%
rename from adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpMetrics.java
rename to nb-adapters/adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpMetrics.java
diff --git a/adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpOp.java b/nb-adapters/adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpOp.java
similarity index 100%
rename from adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpOp.java
rename to nb-adapters/adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpOp.java
diff --git a/adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpOpDispenser.java b/nb-adapters/adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpOpDispenser.java
similarity index 100%
rename from adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpOpDispenser.java
rename to nb-adapters/adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpOpDispenser.java
diff --git a/adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpOpMapper.java b/nb-adapters/adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpOpMapper.java
similarity index 100%
rename from adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpOpMapper.java
rename to nb-adapters/adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpOpMapper.java
diff --git a/adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpResultType.java b/nb-adapters/adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpResultType.java
similarity index 100%
rename from adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpResultType.java
rename to nb-adapters/adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpResultType.java
diff --git a/adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpSpace.java b/nb-adapters/adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpSpace.java
similarity index 100%
rename from adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpSpace.java
rename to nb-adapters/adapter-http/src/main/java/io/nosqlbench/adapter/http/core/HttpSpace.java
diff --git a/adapter-http/src/main/java/io/nosqlbench/adapter/http/errors/InvalidResponseBodyException.java b/nb-adapters/adapter-http/src/main/java/io/nosqlbench/adapter/http/errors/InvalidResponseBodyException.java
similarity index 100%
rename from adapter-http/src/main/java/io/nosqlbench/adapter/http/errors/InvalidResponseBodyException.java
rename to nb-adapters/adapter-http/src/main/java/io/nosqlbench/adapter/http/errors/InvalidResponseBodyException.java
diff --git a/adapter-http/src/main/java/io/nosqlbench/adapter/http/errors/InvalidStatusCodeException.java b/nb-adapters/adapter-http/src/main/java/io/nosqlbench/adapter/http/errors/InvalidStatusCodeException.java
similarity index 100%
rename from adapter-http/src/main/java/io/nosqlbench/adapter/http/errors/InvalidStatusCodeException.java
rename to nb-adapters/adapter-http/src/main/java/io/nosqlbench/adapter/http/errors/InvalidStatusCodeException.java
diff --git a/adapter-http/src/main/java/io/nosqlbench/adapter/http/statuscodes/HttpStatusCodes.java b/nb-adapters/adapter-http/src/main/java/io/nosqlbench/adapter/http/statuscodes/HttpStatusCodes.java
similarity index 100%
rename from adapter-http/src/main/java/io/nosqlbench/adapter/http/statuscodes/HttpStatusCodes.java
rename to nb-adapters/adapter-http/src/main/java/io/nosqlbench/adapter/http/statuscodes/HttpStatusCodes.java
diff --git a/adapter-http/src/main/java/io/nosqlbench/adapter/http/statuscodes/HttpStatusRanges.java b/nb-adapters/adapter-http/src/main/java/io/nosqlbench/adapter/http/statuscodes/HttpStatusRanges.java
similarity index 100%
rename from adapter-http/src/main/java/io/nosqlbench/adapter/http/statuscodes/HttpStatusRanges.java
rename to nb-adapters/adapter-http/src/main/java/io/nosqlbench/adapter/http/statuscodes/HttpStatusRanges.java
diff --git a/adapter-http/src/main/java/io/nosqlbench/adapter/http/statuscodes/IetfStatusCode.java b/nb-adapters/adapter-http/src/main/java/io/nosqlbench/adapter/http/statuscodes/IetfStatusCode.java
similarity index 100%
rename from adapter-http/src/main/java/io/nosqlbench/adapter/http/statuscodes/IetfStatusCode.java
rename to nb-adapters/adapter-http/src/main/java/io/nosqlbench/adapter/http/statuscodes/IetfStatusCode.java
diff --git a/adapter-http/src/main/resources/activities/baselines/http-rest-keyvalue.yaml b/nb-adapters/adapter-http/src/main/resources/activities/baselines/http-rest-keyvalue.yaml
similarity index 100%
rename from adapter-http/src/main/resources/activities/baselines/http-rest-keyvalue.yaml
rename to nb-adapters/adapter-http/src/main/resources/activities/baselines/http-rest-keyvalue.yaml
diff --git a/adapter-http/src/main/resources/activities/baselines/http-rest-starter.yaml b/nb-adapters/adapter-http/src/main/resources/activities/baselines/http-rest-starter.yaml
similarity index 100%
rename from adapter-http/src/main/resources/activities/baselines/http-rest-starter.yaml
rename to nb-adapters/adapter-http/src/main/resources/activities/baselines/http-rest-starter.yaml
diff --git a/adapter-http/src/main/resources/activities/baselines/http-rest-tabular.yaml b/nb-adapters/adapter-http/src/main/resources/activities/baselines/http-rest-tabular.yaml
similarity index 100%
rename from adapter-http/src/main/resources/activities/baselines/http-rest-tabular.yaml
rename to nb-adapters/adapter-http/src/main/resources/activities/baselines/http-rest-tabular.yaml
diff --git a/adapter-http/src/main/resources/activities/baselines/http-rest-timeseries.yaml b/nb-adapters/adapter-http/src/main/resources/activities/baselines/http-rest-timeseries.yaml
similarity index 100%
rename from adapter-http/src/main/resources/activities/baselines/http-rest-timeseries.yaml
rename to nb-adapters/adapter-http/src/main/resources/activities/baselines/http-rest-timeseries.yaml
diff --git a/adapter-http/src/main/resources/activities/baselines/http-rest.md b/nb-adapters/adapter-http/src/main/resources/activities/baselines/http-rest.md
similarity index 100%
rename from adapter-http/src/main/resources/activities/baselines/http-rest.md
rename to nb-adapters/adapter-http/src/main/resources/activities/baselines/http-rest.md
diff --git a/adapter-http/src/main/resources/activities/baselinesv2/http_elastic_vector.yaml b/nb-adapters/adapter-http/src/main/resources/activities/baselinesv2/http_elastic_vector.yaml
similarity index 100%
rename from adapter-http/src/main/resources/activities/baselinesv2/http_elastic_vector.yaml
rename to nb-adapters/adapter-http/src/main/resources/activities/baselinesv2/http_elastic_vector.yaml
diff --git a/adapter-http/src/main/resources/activities/documents-api/http-docsapi-crud-basic.md b/nb-adapters/adapter-http/src/main/resources/activities/documents-api/http-docsapi-crud-basic.md
similarity index 100%
rename from adapter-http/src/main/resources/activities/documents-api/http-docsapi-crud-basic.md
rename to nb-adapters/adapter-http/src/main/resources/activities/documents-api/http-docsapi-crud-basic.md
diff --git a/adapter-http/src/main/resources/activities/documents-api/http-docsapi-crud-basic.yaml b/nb-adapters/adapter-http/src/main/resources/activities/documents-api/http-docsapi-crud-basic.yaml
similarity index 100%
rename from adapter-http/src/main/resources/activities/documents-api/http-docsapi-crud-basic.yaml
rename to nb-adapters/adapter-http/src/main/resources/activities/documents-api/http-docsapi-crud-basic.yaml
diff --git a/adapter-http/src/main/resources/activities/documents-api/http-docsapi-crud-dataset.md b/nb-adapters/adapter-http/src/main/resources/activities/documents-api/http-docsapi-crud-dataset.md
similarity index 100%
rename from adapter-http/src/main/resources/activities/documents-api/http-docsapi-crud-dataset.md
rename to nb-adapters/adapter-http/src/main/resources/activities/documents-api/http-docsapi-crud-dataset.md
diff --git a/adapter-http/src/main/resources/activities/documents-api/http-docsapi-crud-dataset.yaml b/nb-adapters/adapter-http/src/main/resources/activities/documents-api/http-docsapi-crud-dataset.yaml
similarity index 100%
rename from adapter-http/src/main/resources/activities/documents-api/http-docsapi-crud-dataset.yaml
rename to nb-adapters/adapter-http/src/main/resources/activities/documents-api/http-docsapi-crud-dataset.yaml
diff --git a/adapter-http/src/main/resources/activities/documents-api/http-docsapi-keyvalue.yaml b/nb-adapters/adapter-http/src/main/resources/activities/documents-api/http-docsapi-keyvalue.yaml
similarity index 100%
rename from adapter-http/src/main/resources/activities/documents-api/http-docsapi-keyvalue.yaml
rename to nb-adapters/adapter-http/src/main/resources/activities/documents-api/http-docsapi-keyvalue.yaml
diff --git a/adapter-http/src/main/resources/activities/documents-api/http-docsapi-search-advanced.md b/nb-adapters/adapter-http/src/main/resources/activities/documents-api/http-docsapi-search-advanced.md
similarity index 100%
rename from adapter-http/src/main/resources/activities/documents-api/http-docsapi-search-advanced.md
rename to nb-adapters/adapter-http/src/main/resources/activities/documents-api/http-docsapi-search-advanced.md
diff --git a/adapter-http/src/main/resources/activities/documents-api/http-docsapi-search-advanced.yaml b/nb-adapters/adapter-http/src/main/resources/activities/documents-api/http-docsapi-search-advanced.yaml
similarity index 100%
rename from adapter-http/src/main/resources/activities/documents-api/http-docsapi-search-advanced.yaml
rename to nb-adapters/adapter-http/src/main/resources/activities/documents-api/http-docsapi-search-advanced.yaml
diff --git a/adapter-http/src/main/resources/activities/documents-api/http-docsapi-search-basic.md b/nb-adapters/adapter-http/src/main/resources/activities/documents-api/http-docsapi-search-basic.md
similarity index 100%
rename from adapter-http/src/main/resources/activities/documents-api/http-docsapi-search-basic.md
rename to nb-adapters/adapter-http/src/main/resources/activities/documents-api/http-docsapi-search-basic.md
diff --git a/adapter-http/src/main/resources/activities/documents-api/http-docsapi-search-basic.yaml b/nb-adapters/adapter-http/src/main/resources/activities/documents-api/http-docsapi-search-basic.yaml
similarity index 100%
rename from adapter-http/src/main/resources/activities/documents-api/http-docsapi-search-basic.yaml
rename to nb-adapters/adapter-http/src/main/resources/activities/documents-api/http-docsapi-search-basic.yaml
diff --git a/adapter-http/src/main/resources/activities/graphql-cql-first/http-graphql-cql-keyvalue.yaml b/nb-adapters/adapter-http/src/main/resources/activities/graphql-cql-first/http-graphql-cql-keyvalue.yaml
similarity index 100%
rename from adapter-http/src/main/resources/activities/graphql-cql-first/http-graphql-cql-keyvalue.yaml
rename to nb-adapters/adapter-http/src/main/resources/activities/graphql-cql-first/http-graphql-cql-keyvalue.yaml
diff --git a/adapter-http/src/main/resources/activities/graphql-cql-first/http-graphql-cql-tabular.yaml b/nb-adapters/adapter-http/src/main/resources/activities/graphql-cql-first/http-graphql-cql-tabular.yaml
similarity index 100%
rename from adapter-http/src/main/resources/activities/graphql-cql-first/http-graphql-cql-tabular.yaml
rename to nb-adapters/adapter-http/src/main/resources/activities/graphql-cql-first/http-graphql-cql-tabular.yaml
diff --git a/adapter-http/src/main/resources/activities/graphql-cql-first/http-graphql-cql-timeseries.yaml b/nb-adapters/adapter-http/src/main/resources/activities/graphql-cql-first/http-graphql-cql-timeseries.yaml
similarity index 100%
rename from adapter-http/src/main/resources/activities/graphql-cql-first/http-graphql-cql-timeseries.yaml
rename to nb-adapters/adapter-http/src/main/resources/activities/graphql-cql-first/http-graphql-cql-timeseries.yaml
diff --git a/adapter-http/src/main/resources/activities/graphql-schema-first/http-graphql-keyvalue.yaml b/nb-adapters/adapter-http/src/main/resources/activities/graphql-schema-first/http-graphql-keyvalue.yaml
similarity index 100%
rename from adapter-http/src/main/resources/activities/graphql-schema-first/http-graphql-keyvalue.yaml
rename to nb-adapters/adapter-http/src/main/resources/activities/graphql-schema-first/http-graphql-keyvalue.yaml
diff --git a/adapter-http/src/main/resources/activities/graphql-schema-first/http-graphql-tabular.yaml b/nb-adapters/adapter-http/src/main/resources/activities/graphql-schema-first/http-graphql-tabular.yaml
similarity index 100%
rename from adapter-http/src/main/resources/activities/graphql-schema-first/http-graphql-tabular.yaml
rename to nb-adapters/adapter-http/src/main/resources/activities/graphql-schema-first/http-graphql-tabular.yaml
diff --git a/adapter-http/src/main/resources/activities/graphql-schema-first/http-graphql-timeseries.yaml b/nb-adapters/adapter-http/src/main/resources/activities/graphql-schema-first/http-graphql-timeseries.yaml
similarity index 100%
rename from adapter-http/src/main/resources/activities/graphql-schema-first/http-graphql-timeseries.yaml
rename to nb-adapters/adapter-http/src/main/resources/activities/graphql-schema-first/http-graphql-timeseries.yaml
diff --git a/adapter-http/src/main/resources/data/docsapi-dataset.json b/nb-adapters/adapter-http/src/main/resources/data/docsapi-dataset.json
similarity index 100%
rename from adapter-http/src/main/resources/data/docsapi-dataset.json
rename to nb-adapters/adapter-http/src/main/resources/data/docsapi-dataset.json
diff --git a/adapter-http/src/main/resources/http.md b/nb-adapters/adapter-http/src/main/resources/http.md
similarity index 100%
rename from adapter-http/src/main/resources/http.md
rename to nb-adapters/adapter-http/src/main/resources/http.md
diff --git a/adapter-http/src/main/resources/ietf-http-status-codes.csv b/nb-adapters/adapter-http/src/main/resources/ietf-http-status-codes.csv
similarity index 100%
rename from adapter-http/src/main/resources/ietf-http-status-codes.csv
rename to nb-adapters/adapter-http/src/main/resources/ietf-http-status-codes.csv
diff --git a/adapter-http/src/main/resources/topics.md b/nb-adapters/adapter-http/src/main/resources/topics.md
similarity index 100%
rename from adapter-http/src/main/resources/topics.md
rename to nb-adapters/adapter-http/src/main/resources/topics.md
diff --git a/adapter-http/src/test/java/io/nosqlbench/adapter/http/HttpOpMapperTest.java b/nb-adapters/adapter-http/src/test/java/io/nosqlbench/adapter/http/HttpOpMapperTest.java
similarity index 100%
rename from adapter-http/src/test/java/io/nosqlbench/adapter/http/HttpOpMapperTest.java
rename to nb-adapters/adapter-http/src/test/java/io/nosqlbench/adapter/http/HttpOpMapperTest.java
diff --git a/adapter-http/src/test/java/io/nosqlbench/adapter/http/cmds/HttpFormatParserTest.java b/nb-adapters/adapter-http/src/test/java/io/nosqlbench/adapter/http/cmds/HttpFormatParserTest.java
similarity index 100%
rename from adapter-http/src/test/java/io/nosqlbench/adapter/http/cmds/HttpFormatParserTest.java
rename to nb-adapters/adapter-http/src/test/java/io/nosqlbench/adapter/http/cmds/HttpFormatParserTest.java
diff --git a/adapter-http/src/test/java/io/nosqlbench/adapter/http/cmds/ReadyHttpOpTest.java b/nb-adapters/adapter-http/src/test/java/io/nosqlbench/adapter/http/cmds/ReadyHttpOpTest.java
similarity index 100%
rename from adapter-http/src/test/java/io/nosqlbench/adapter/http/cmds/ReadyHttpOpTest.java
rename to nb-adapters/adapter-http/src/test/java/io/nosqlbench/adapter/http/cmds/ReadyHttpOpTest.java
diff --git a/adapter-http/src/test/java/io/nosqlbench/adapter/http/statuscodes/HttpStatusCodesTest.java b/nb-adapters/adapter-http/src/test/java/io/nosqlbench/adapter/http/statuscodes/HttpStatusCodesTest.java
similarity index 100%
rename from adapter-http/src/test/java/io/nosqlbench/adapter/http/statuscodes/HttpStatusCodesTest.java
rename to nb-adapters/adapter-http/src/test/java/io/nosqlbench/adapter/http/statuscodes/HttpStatusCodesTest.java
diff --git a/adapter-http/src/test/resources/activities/http-google.yaml b/nb-adapters/adapter-http/src/test/resources/activities/http-google.yaml
similarity index 100%
rename from adapter-http/src/test/resources/activities/http-google.yaml
rename to nb-adapters/adapter-http/src/test/resources/activities/http-google.yaml
diff --git a/adapter-http/src/test/resources/activities/http-solr.yaml b/nb-adapters/adapter-http/src/test/resources/activities/http-solr.yaml
similarity index 100%
rename from adapter-http/src/test/resources/activities/http-solr.yaml
rename to nb-adapters/adapter-http/src/test/resources/activities/http-solr.yaml
diff --git a/adapter-http/src/test/resources/activities/test-http-1.yaml b/nb-adapters/adapter-http/src/test/resources/activities/test-http-1.yaml
similarity index 100%
rename from adapter-http/src/test/resources/activities/test-http-1.yaml
rename to nb-adapters/adapter-http/src/test/resources/activities/test-http-1.yaml
diff --git a/adapter-http/src/test/resources/activities/test-http-2.yaml b/nb-adapters/adapter-http/src/test/resources/activities/test-http-2.yaml
similarity index 100%
rename from adapter-http/src/test/resources/activities/test-http-2.yaml
rename to nb-adapters/adapter-http/src/test/resources/activities/test-http-2.yaml
diff --git a/adapter-http/src/test/resources/activities/test-http-3.yaml b/nb-adapters/adapter-http/src/test/resources/activities/test-http-3.yaml
similarity index 100%
rename from adapter-http/src/test/resources/activities/test-http-3.yaml
rename to nb-adapters/adapter-http/src/test/resources/activities/test-http-3.yaml
diff --git a/adapter-http/src/test/resources/activities/test-http-4.yaml b/nb-adapters/adapter-http/src/test/resources/activities/test-http-4.yaml
similarity index 100%
rename from adapter-http/src/test/resources/activities/test-http-4.yaml
rename to nb-adapters/adapter-http/src/test/resources/activities/test-http-4.yaml
diff --git a/adapter-http/src/test/resources/activities/test-http-5.yaml b/nb-adapters/adapter-http/src/test/resources/activities/test-http-5.yaml
similarity index 100%
rename from adapter-http/src/test/resources/activities/test-http-5.yaml
rename to nb-adapters/adapter-http/src/test/resources/activities/test-http-5.yaml
diff --git a/adapter-http/src/test/resources/activities/test-http-6.yaml b/nb-adapters/adapter-http/src/test/resources/activities/test-http-6.yaml
similarity index 100%
rename from adapter-http/src/test/resources/activities/test-http-6.yaml
rename to nb-adapters/adapter-http/src/test/resources/activities/test-http-6.yaml
diff --git a/adapter-http/src/test/resources/activities/test-http-7.yaml b/nb-adapters/adapter-http/src/test/resources/activities/test-http-7.yaml
similarity index 100%
rename from adapter-http/src/test/resources/activities/test-http-7.yaml
rename to nb-adapters/adapter-http/src/test/resources/activities/test-http-7.yaml
diff --git a/adapter-jdbc/pom.xml b/nb-adapters/adapter-jdbc/pom.xml
similarity index 97%
rename from adapter-jdbc/pom.xml
rename to nb-adapters/adapter-jdbc/pom.xml
index 92a02cdb09..987742f5e6 100644
--- a/adapter-jdbc/pom.xml
+++ b/nb-adapters/adapter-jdbc/pom.xml
@@ -21,7 +21,7 @@
io.nosqlbench
mvn-defaults
${revision}
- ../mvn-defaults
+ ../../mvn-defaults
adapter-jdbc
diff --git a/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/JDBCDriverAdapter.java b/nb-adapters/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/JDBCDriverAdapter.java
similarity index 100%
rename from adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/JDBCDriverAdapter.java
rename to nb-adapters/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/JDBCDriverAdapter.java
diff --git a/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/JDBCOpMapper.java b/nb-adapters/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/JDBCOpMapper.java
similarity index 100%
rename from adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/JDBCOpMapper.java
rename to nb-adapters/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/JDBCOpMapper.java
diff --git a/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/JDBCOpType.java b/nb-adapters/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/JDBCOpType.java
similarity index 100%
rename from adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/JDBCOpType.java
rename to nb-adapters/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/JDBCOpType.java
diff --git a/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/JDBCSpace.java b/nb-adapters/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/JDBCSpace.java
similarity index 100%
rename from adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/JDBCSpace.java
rename to nb-adapters/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/JDBCSpace.java
diff --git a/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/exceptions/JDBCAdapterInvalidParamException.java b/nb-adapters/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/exceptions/JDBCAdapterInvalidParamException.java
similarity index 100%
rename from adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/exceptions/JDBCAdapterInvalidParamException.java
rename to nb-adapters/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/exceptions/JDBCAdapterInvalidParamException.java
diff --git a/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/exceptions/JDBCAdapterUnexpectedException.java b/nb-adapters/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/exceptions/JDBCAdapterUnexpectedException.java
similarity index 100%
rename from adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/exceptions/JDBCAdapterUnexpectedException.java
rename to nb-adapters/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/exceptions/JDBCAdapterUnexpectedException.java
diff --git a/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/exceptions/JDBCPgVectorException.java b/nb-adapters/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/exceptions/JDBCPgVectorException.java
similarity index 100%
rename from adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/exceptions/JDBCPgVectorException.java
rename to nb-adapters/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/exceptions/JDBCPgVectorException.java
diff --git a/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/opdispensers/JDBCBaseOpDispenser.java b/nb-adapters/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/opdispensers/JDBCBaseOpDispenser.java
similarity index 100%
rename from adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/opdispensers/JDBCBaseOpDispenser.java
rename to nb-adapters/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/opdispensers/JDBCBaseOpDispenser.java
diff --git a/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/opdispensers/JDBCDDLOpDispenser.java b/nb-adapters/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/opdispensers/JDBCDDLOpDispenser.java
similarity index 100%
rename from adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/opdispensers/JDBCDDLOpDispenser.java
rename to nb-adapters/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/opdispensers/JDBCDDLOpDispenser.java
diff --git a/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/opdispensers/JDBCDMLOpDispenser.java b/nb-adapters/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/opdispensers/JDBCDMLOpDispenser.java
similarity index 100%
rename from adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/opdispensers/JDBCDMLOpDispenser.java
rename to nb-adapters/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/opdispensers/JDBCDMLOpDispenser.java
diff --git a/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/optypes/JDBCDDLOp.java b/nb-adapters/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/optypes/JDBCDDLOp.java
similarity index 100%
rename from adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/optypes/JDBCDDLOp.java
rename to nb-adapters/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/optypes/JDBCDDLOp.java
diff --git a/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/optypes/JDBCDMLOp.java b/nb-adapters/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/optypes/JDBCDMLOp.java
similarity index 100%
rename from adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/optypes/JDBCDMLOp.java
rename to nb-adapters/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/optypes/JDBCDMLOp.java
diff --git a/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/optypes/JDBCDMLReadOp.java b/nb-adapters/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/optypes/JDBCDMLReadOp.java
similarity index 100%
rename from adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/optypes/JDBCDMLReadOp.java
rename to nb-adapters/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/optypes/JDBCDMLReadOp.java
diff --git a/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/optypes/JDBCDMLWriteOp.java b/nb-adapters/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/optypes/JDBCDMLWriteOp.java
similarity index 100%
rename from adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/optypes/JDBCDMLWriteOp.java
rename to nb-adapters/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/optypes/JDBCDMLWriteOp.java
diff --git a/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/optypes/JDBCOp.java b/nb-adapters/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/optypes/JDBCOp.java
similarity index 100%
rename from adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/optypes/JDBCOp.java
rename to nb-adapters/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/optypes/JDBCOp.java
diff --git a/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/utils/JDBCAdapterUtil.java b/nb-adapters/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/utils/JDBCAdapterUtil.java
similarity index 100%
rename from adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/utils/JDBCAdapterUtil.java
rename to nb-adapters/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/utils/JDBCAdapterUtil.java
diff --git a/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/utils/JDBCDriverAdapterLoader.java b/nb-adapters/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/utils/JDBCDriverAdapterLoader.java
similarity index 100%
rename from adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/utils/JDBCDriverAdapterLoader.java
rename to nb-adapters/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/utils/JDBCDriverAdapterLoader.java
diff --git a/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/utils/JDBCPgVector.java b/nb-adapters/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/utils/JDBCPgVector.java
similarity index 100%
rename from adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/utils/JDBCPgVector.java
rename to nb-adapters/adapter-jdbc/src/main/java/io/nosqlbench/adapter/jdbc/utils/JDBCPgVector.java
diff --git a/adapter-jdbc/src/main/java/io/nosqlbench/engine/extensions/vectormath/PgvecUtils.java b/nb-adapters/adapter-jdbc/src/main/java/io/nosqlbench/engine/extensions/vectormath/PgvecUtils.java
similarity index 100%
rename from adapter-jdbc/src/main/java/io/nosqlbench/engine/extensions/vectormath/PgvecUtils.java
rename to nb-adapters/adapter-jdbc/src/main/java/io/nosqlbench/engine/extensions/vectormath/PgvecUtils.java
diff --git a/adapter-jdbc/src/main/resources/activities.baselinesv2/pgvector.yaml b/nb-adapters/adapter-jdbc/src/main/resources/activities.baselinesv2/pgvector.yaml
similarity index 100%
rename from adapter-jdbc/src/main/resources/activities.baselinesv2/pgvector.yaml
rename to nb-adapters/adapter-jdbc/src/main/resources/activities.baselinesv2/pgvector.yaml
diff --git a/adapter-jdbc/src/main/resources/jdbc.md b/nb-adapters/adapter-jdbc/src/main/resources/jdbc.md
similarity index 100%
rename from adapter-jdbc/src/main/resources/jdbc.md
rename to nb-adapters/adapter-jdbc/src/main/resources/jdbc.md
diff --git a/adapter-kafka/pom.xml b/nb-adapters/adapter-kafka/pom.xml
similarity index 97%
rename from adapter-kafka/pom.xml
rename to nb-adapters/adapter-kafka/pom.xml
index f143330d48..b2204f008a 100644
--- a/adapter-kafka/pom.xml
+++ b/nb-adapters/adapter-kafka/pom.xml
@@ -24,7 +24,7 @@
mvn-defaults
io.nosqlbench
${revision}
- ../mvn-defaults
+ ../../mvn-defaults
${project.artifactId}
diff --git a/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/KafkaDriverAdapter.java b/nb-adapters/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/KafkaDriverAdapter.java
similarity index 100%
rename from adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/KafkaDriverAdapter.java
rename to nb-adapters/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/KafkaDriverAdapter.java
diff --git a/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/KafkaDriverAdapterLoader.java b/nb-adapters/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/KafkaDriverAdapterLoader.java
similarity index 100%
rename from adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/KafkaDriverAdapterLoader.java
rename to nb-adapters/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/KafkaDriverAdapterLoader.java
diff --git a/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/KafkaOpMapper.java b/nb-adapters/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/KafkaOpMapper.java
similarity index 100%
rename from adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/KafkaOpMapper.java
rename to nb-adapters/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/KafkaOpMapper.java
diff --git a/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/KafkaOpType.java b/nb-adapters/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/KafkaOpType.java
similarity index 100%
rename from adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/KafkaOpType.java
rename to nb-adapters/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/KafkaOpType.java
diff --git a/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/KafkaSpace.java b/nb-adapters/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/KafkaSpace.java
similarity index 100%
rename from adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/KafkaSpace.java
rename to nb-adapters/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/KafkaSpace.java
diff --git a/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/dispensers/KafkaBaseOpDispenser.java b/nb-adapters/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/dispensers/KafkaBaseOpDispenser.java
similarity index 100%
rename from adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/dispensers/KafkaBaseOpDispenser.java
rename to nb-adapters/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/dispensers/KafkaBaseOpDispenser.java
diff --git a/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/dispensers/MessageConsumerOpDispenser.java b/nb-adapters/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/dispensers/MessageConsumerOpDispenser.java
similarity index 100%
rename from adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/dispensers/MessageConsumerOpDispenser.java
rename to nb-adapters/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/dispensers/MessageConsumerOpDispenser.java
diff --git a/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/dispensers/MessageProducerOpDispenser.java b/nb-adapters/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/dispensers/MessageProducerOpDispenser.java
similarity index 100%
rename from adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/dispensers/MessageProducerOpDispenser.java
rename to nb-adapters/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/dispensers/MessageProducerOpDispenser.java
diff --git a/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/exception/KafkaAdapterInvalidParamException.java b/nb-adapters/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/exception/KafkaAdapterInvalidParamException.java
similarity index 100%
rename from adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/exception/KafkaAdapterInvalidParamException.java
rename to nb-adapters/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/exception/KafkaAdapterInvalidParamException.java
diff --git a/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/exception/KafkaAdapterUnexpectedException.java b/nb-adapters/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/exception/KafkaAdapterUnexpectedException.java
similarity index 100%
rename from adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/exception/KafkaAdapterUnexpectedException.java
rename to nb-adapters/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/exception/KafkaAdapterUnexpectedException.java
diff --git a/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/exception/KafkaAdapterUnsupportedOpException.java b/nb-adapters/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/exception/KafkaAdapterUnsupportedOpException.java
similarity index 100%
rename from adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/exception/KafkaAdapterUnsupportedOpException.java
rename to nb-adapters/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/exception/KafkaAdapterUnsupportedOpException.java
diff --git a/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/ops/KafkaOp.java b/nb-adapters/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/ops/KafkaOp.java
similarity index 100%
rename from adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/ops/KafkaOp.java
rename to nb-adapters/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/ops/KafkaOp.java
diff --git a/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/ops/OpTimeTrackKafkaClient.java b/nb-adapters/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/ops/OpTimeTrackKafkaClient.java
similarity index 100%
rename from adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/ops/OpTimeTrackKafkaClient.java
rename to nb-adapters/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/ops/OpTimeTrackKafkaClient.java
diff --git a/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/ops/OpTimeTrackKafkaConsumer.java b/nb-adapters/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/ops/OpTimeTrackKafkaConsumer.java
similarity index 100%
rename from adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/ops/OpTimeTrackKafkaConsumer.java
rename to nb-adapters/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/ops/OpTimeTrackKafkaConsumer.java
diff --git a/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/ops/OpTimeTrackKafkaProducer.java b/nb-adapters/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/ops/OpTimeTrackKafkaProducer.java
similarity index 100%
rename from adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/ops/OpTimeTrackKafkaProducer.java
rename to nb-adapters/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/ops/OpTimeTrackKafkaProducer.java
diff --git a/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/util/EndToEndStartingTimeSource.java b/nb-adapters/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/util/EndToEndStartingTimeSource.java
similarity index 100%
rename from adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/util/EndToEndStartingTimeSource.java
rename to nb-adapters/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/util/EndToEndStartingTimeSource.java
diff --git a/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/util/KafkaAdapterMetrics.java b/nb-adapters/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/util/KafkaAdapterMetrics.java
similarity index 100%
rename from adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/util/KafkaAdapterMetrics.java
rename to nb-adapters/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/util/KafkaAdapterMetrics.java
diff --git a/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/util/KafkaAdapterUtil.java b/nb-adapters/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/util/KafkaAdapterUtil.java
similarity index 100%
rename from adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/util/KafkaAdapterUtil.java
rename to nb-adapters/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/util/KafkaAdapterUtil.java
diff --git a/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/util/KafkaClientConf.java b/nb-adapters/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/util/KafkaClientConf.java
similarity index 100%
rename from adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/util/KafkaClientConf.java
rename to nb-adapters/adapter-kafka/src/main/java/io/nosqlbench/adapter/kafka/util/KafkaClientConf.java
diff --git a/adapter-kafka/src/main/resources/build-nb-kafka-driver.sh b/nb-adapters/adapter-kafka/src/main/resources/build-nb-kafka-driver.sh
similarity index 100%
rename from adapter-kafka/src/main/resources/build-nb-kafka-driver.sh
rename to nb-adapters/adapter-kafka/src/main/resources/build-nb-kafka-driver.sh
diff --git a/adapter-kafka/src/main/resources/conf/kafka_config.properties b/nb-adapters/adapter-kafka/src/main/resources/conf/kafka_config.properties
similarity index 100%
rename from adapter-kafka/src/main/resources/conf/kafka_config.properties
rename to nb-adapters/adapter-kafka/src/main/resources/conf/kafka_config.properties
diff --git a/adapter-kafka/src/main/resources/kafka.md b/nb-adapters/adapter-kafka/src/main/resources/kafka.md
similarity index 100%
rename from adapter-kafka/src/main/resources/kafka.md
rename to nb-adapters/adapter-kafka/src/main/resources/kafka.md
diff --git a/adapter-kafka/src/main/resources/scenarios/kafka_consumer.yaml b/nb-adapters/adapter-kafka/src/main/resources/scenarios/kafka_consumer.yaml
similarity index 100%
rename from adapter-kafka/src/main/resources/scenarios/kafka_consumer.yaml
rename to nb-adapters/adapter-kafka/src/main/resources/scenarios/kafka_consumer.yaml
diff --git a/adapter-kafka/src/main/resources/scenarios/kafka_producer.yaml b/nb-adapters/adapter-kafka/src/main/resources/scenarios/kafka_producer.yaml
similarity index 100%
rename from adapter-kafka/src/main/resources/scenarios/kafka_producer.yaml
rename to nb-adapters/adapter-kafka/src/main/resources/scenarios/kafka_producer.yaml
diff --git a/adapter-kafka/src/main/resources/scenarios/nbkafka_msg_proc_named.yaml b/nb-adapters/adapter-kafka/src/main/resources/scenarios/nbkafka_msg_proc_named.yaml
similarity index 100%
rename from adapter-kafka/src/main/resources/scenarios/nbkafka_msg_proc_named.yaml
rename to nb-adapters/adapter-kafka/src/main/resources/scenarios/nbkafka_msg_proc_named.yaml
diff --git a/adapter-kafka/src/main/resources/start_kafka_consumer.sh b/nb-adapters/adapter-kafka/src/main/resources/start_kafka_consumer.sh
similarity index 100%
rename from adapter-kafka/src/main/resources/start_kafka_consumer.sh
rename to nb-adapters/adapter-kafka/src/main/resources/start_kafka_consumer.sh
diff --git a/adapter-kafka/src/main/resources/start_kafka_producer.sh b/nb-adapters/adapter-kafka/src/main/resources/start_kafka_producer.sh
similarity index 100%
rename from adapter-kafka/src/main/resources/start_kafka_producer.sh
rename to nb-adapters/adapter-kafka/src/main/resources/start_kafka_producer.sh
diff --git a/adapter-milvus/.gitignore b/nb-adapters/adapter-milvus/.gitignore
similarity index 100%
rename from adapter-milvus/.gitignore
rename to nb-adapters/adapter-milvus/.gitignore
diff --git a/adapter-milvus/pom.xml b/nb-adapters/adapter-milvus/pom.xml
similarity index 97%
rename from adapter-milvus/pom.xml
rename to nb-adapters/adapter-milvus/pom.xml
index f4843048f8..f7ca70941d 100644
--- a/adapter-milvus/pom.xml
+++ b/nb-adapters/adapter-milvus/pom.xml
@@ -25,7 +25,7 @@
mvn-defaults
io.nosqlbench
${revision}
- ../mvn-defaults
+ ../../mvn-defaults
${project.artifactId}
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/MilvusAdapterUtils.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/MilvusAdapterUtils.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/MilvusAdapterUtils.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/MilvusAdapterUtils.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/MilvusDriverAdapter.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/MilvusDriverAdapter.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/MilvusDriverAdapter.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/MilvusDriverAdapter.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/MilvusDriverAdapterLoader.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/MilvusDriverAdapterLoader.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/MilvusDriverAdapterLoader.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/MilvusDriverAdapterLoader.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/MilvusOpMapper.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/MilvusOpMapper.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/MilvusOpMapper.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/MilvusOpMapper.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/MilvusSpace.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/MilvusSpace.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/MilvusSpace.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/MilvusSpace.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/exceptions/MilvusAwaitStateIncompleteError.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/exceptions/MilvusAwaitStateIncompleteError.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/exceptions/MilvusAwaitStateIncompleteError.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/exceptions/MilvusAwaitStateIncompleteError.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/exceptions/MilvusIndexingIncompleteError.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/exceptions/MilvusIndexingIncompleteError.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/exceptions/MilvusIndexingIncompleteError.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/exceptions/MilvusIndexingIncompleteError.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusAlterAliasOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusAlterAliasOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusAlterAliasOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusAlterAliasOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusAlterCollectionOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusAlterCollectionOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusAlterCollectionOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusAlterCollectionOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusBaseOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusBaseOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusBaseOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusBaseOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusBulkInsertOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusBulkInsertOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusBulkInsertOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusBulkInsertOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusCreateAliasOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusCreateAliasOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusCreateAliasOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusCreateAliasOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusCreateCollectionOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusCreateCollectionOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusCreateCollectionOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusCreateCollectionOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusCreateCredentialOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusCreateCredentialOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusCreateCredentialOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusCreateCredentialOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusCreateDatabaseOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusCreateDatabaseOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusCreateDatabaseOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusCreateDatabaseOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusCreateIndexOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusCreateIndexOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusCreateIndexOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusCreateIndexOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusCreatePartitionOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusCreatePartitionOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusCreatePartitionOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusCreatePartitionOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusDeleteCredentialOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusDeleteCredentialOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusDeleteCredentialOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusDeleteCredentialOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusDeleteOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusDeleteOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusDeleteOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusDeleteOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusDescribeCollectionOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusDescribeCollectionOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusDescribeCollectionOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusDescribeCollectionOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusDescribeIndexOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusDescribeIndexOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusDescribeIndexOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusDescribeIndexOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusDropAliasOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusDropAliasOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusDropAliasOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusDropAliasOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusDropCollectionOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusDropCollectionOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusDropCollectionOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusDropCollectionOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusDropDatabaseOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusDropDatabaseOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusDropDatabaseOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusDropDatabaseOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusDropIndexOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusDropIndexOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusDropIndexOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusDropIndexOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusDropPartitionOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusDropPartitionOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusDropPartitionOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusDropPartitionOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusFlushOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusFlushOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusFlushOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusFlushOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetBulkInsertStateOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetBulkInsertStateOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetBulkInsertStateOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetBulkInsertStateOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetCollectionStatisticsOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetCollectionStatisticsOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetCollectionStatisticsOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetCollectionStatisticsOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetCompactionStateOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetCompactionStateOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetCompactionStateOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetCompactionStateOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetCompactionStateWithPlansOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetCompactionStateWithPlansOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetCompactionStateWithPlansOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetCompactionStateWithPlansOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetFlushAllStateOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetFlushAllStateOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetFlushAllStateOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetFlushAllStateOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetFlushStateOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetFlushStateOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetFlushStateOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetFlushStateOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetIndexBuildProgressOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetIndexBuildProgressOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetIndexBuildProgressOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetIndexBuildProgressOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetIndexStateOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetIndexStateOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetIndexStateOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetIndexStateOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetLoadStateOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetLoadStateOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetLoadStateOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetLoadStateOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetLoadingProgressOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetLoadingProgressOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetLoadingProgressOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetLoadingProgressOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetMetricsOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetMetricsOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetMetricsOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetMetricsOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetPartitionStatisticsOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetPartitionStatisticsOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetPartitionStatisticsOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetPartitionStatisticsOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetPersistentSegmentInfoOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetPersistentSegmentInfoOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetPersistentSegmentInfoOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetPersistentSegmentInfoOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetQuerySegmentInfoOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetQuerySegmentInfoOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetQuerySegmentInfoOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetQuerySegmentInfoOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetReplicasOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetReplicasOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetReplicasOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusGetReplicasOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusHasPartitionOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusHasPartitionOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusHasPartitionOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusHasPartitionOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusInsertOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusInsertOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusInsertOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusInsertOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusInsertRowsOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusInsertRowsOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusInsertRowsOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusInsertRowsOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusListBulkInsertTasksOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusListBulkInsertTasksOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusListBulkInsertTasksOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusListBulkInsertTasksOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusListCollectionsOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusListCollectionsOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusListCollectionsOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusListCollectionsOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusListCredUsersOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusListCredUsersOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusListCredUsersOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusListCredUsersOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusListDatabasesOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusListDatabasesOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusListDatabasesOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusListDatabasesOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusLoadBalanceOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusLoadBalanceOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusLoadBalanceOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusLoadBalanceOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusLoadCollectionOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusLoadCollectionOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusLoadCollectionOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusLoadCollectionOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusLoadPartitionsOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusLoadPartitionsOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusLoadPartitionsOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusLoadPartitionsOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusLoadingProgressOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusLoadingProgressOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusLoadingProgressOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusLoadingProgressOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusManualCompactOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusManualCompactOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusManualCompactOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusManualCompactOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusOpUtils.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusOpUtils.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusOpUtils.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusOpUtils.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusQueryOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusQueryOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusQueryOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusQueryOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusReleaseCollectionOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusReleaseCollectionOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusReleaseCollectionOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusReleaseCollectionOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusReleasePartitionsOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusReleasePartitionsOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusReleasePartitionsOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusReleasePartitionsOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusSearchOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusSearchOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusSearchOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusSearchOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusShowCollectionsOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusShowCollectionsOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusShowCollectionsOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusShowCollectionsOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusShowPartitionsOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusShowPartitionsOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusShowPartitionsOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusShowPartitionsOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusUpdateCredentialOpDispenser.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusUpdateCredentialOpDispenser.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusUpdateCredentialOpDispenser.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/opdispensers/MilvusUpdateCredentialOpDispenser.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusAlterAliasOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusAlterAliasOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusAlterAliasOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusAlterAliasOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusAlterCollectionOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusAlterCollectionOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusAlterCollectionOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusAlterCollectionOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusBaseOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusBaseOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusBaseOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusBaseOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusBulkInsertOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusBulkInsertOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusBulkInsertOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusBulkInsertOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusCreateAliasOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusCreateAliasOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusCreateAliasOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusCreateAliasOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusCreateCollectionOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusCreateCollectionOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusCreateCollectionOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusCreateCollectionOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusCreateCredentialOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusCreateCredentialOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusCreateCredentialOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusCreateCredentialOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusCreateDatabaseOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusCreateDatabaseOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusCreateDatabaseOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusCreateDatabaseOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusCreateIndexOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusCreateIndexOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusCreateIndexOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusCreateIndexOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusCreatePartitionOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusCreatePartitionOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusCreatePartitionOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusCreatePartitionOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusDeleteCredentialOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusDeleteCredentialOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusDeleteCredentialOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusDeleteCredentialOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusDeleteParamOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusDeleteParamOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusDeleteParamOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusDeleteParamOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusDescribeCollectionOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusDescribeCollectionOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusDescribeCollectionOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusDescribeCollectionOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusDescribeIndexOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusDescribeIndexOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusDescribeIndexOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusDescribeIndexOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusDropAliasOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusDropAliasOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusDropAliasOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusDropAliasOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusDropCollectionOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusDropCollectionOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusDropCollectionOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusDropCollectionOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusDropDatabaseOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusDropDatabaseOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusDropDatabaseOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusDropDatabaseOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusDropIndexOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusDropIndexOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusDropIndexOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusDropIndexOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusDropPartitionOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusDropPartitionOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusDropPartitionOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusDropPartitionOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusFlushOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusFlushOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusFlushOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusFlushOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetBulkInsertStateOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetBulkInsertStateOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetBulkInsertStateOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetBulkInsertStateOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetCollectionStatisticsOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetCollectionStatisticsOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetCollectionStatisticsOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetCollectionStatisticsOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetCompactionStateOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetCompactionStateOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetCompactionStateOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetCompactionStateOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetCompactionStateWithPlansOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetCompactionStateWithPlansOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetCompactionStateWithPlansOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetCompactionStateWithPlansOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetFlushAllStateOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetFlushAllStateOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetFlushAllStateOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetFlushAllStateOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetFlushStateOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetFlushStateOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetFlushStateOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetFlushStateOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetIndexBuildProgressOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetIndexBuildProgressOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetIndexBuildProgressOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetIndexBuildProgressOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetIndexStateOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetIndexStateOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetIndexStateOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetIndexStateOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetLoadStateOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetLoadStateOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetLoadStateOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetLoadStateOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetLoadingProgressOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetLoadingProgressOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetLoadingProgressOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetLoadingProgressOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetMetricsOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetMetricsOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetMetricsOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetMetricsOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetPartitionStatisticsOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetPartitionStatisticsOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetPartitionStatisticsOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetPartitionStatisticsOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetPersistentSegmentInfoOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetPersistentSegmentInfoOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetPersistentSegmentInfoOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetPersistentSegmentInfoOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetQuerySegmentInfoOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetQuerySegmentInfoOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetQuerySegmentInfoOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetQuerySegmentInfoOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetReplicasOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetReplicasOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetReplicasOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusGetReplicasOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusHasPartitionOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusHasPartitionOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusHasPartitionOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusHasPartitionOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusInsertOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusInsertOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusInsertOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusInsertOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusInsertRowsOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusInsertRowsOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusInsertRowsOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusInsertRowsOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusListBulkInsertTasksOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusListBulkInsertTasksOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusListBulkInsertTasksOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusListBulkInsertTasksOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusListCollectionsOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusListCollectionsOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusListCollectionsOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusListCollectionsOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusListCredUsersOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusListCredUsersOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusListCredUsersOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusListCredUsersOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusListDatabasesOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusListDatabasesOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusListDatabasesOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusListDatabasesOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusLoadBalanceOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusLoadBalanceOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusLoadBalanceOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusLoadBalanceOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusLoadCollectionOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusLoadCollectionOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusLoadCollectionOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusLoadCollectionOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusLoadPartitionsOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusLoadPartitionsOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusLoadPartitionsOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusLoadPartitionsOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusManualCompactOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusManualCompactOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusManualCompactOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusManualCompactOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusQueryOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusQueryOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusQueryOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusQueryOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusReleaseCollectionOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusReleaseCollectionOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusReleaseCollectionOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusReleaseCollectionOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusReleasePartitionsOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusReleasePartitionsOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusReleasePartitionsOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusReleasePartitionsOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusSearchOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusSearchOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusSearchOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusSearchOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusShowCollectionsOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusShowCollectionsOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusShowCollectionsOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusShowCollectionsOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusShowPartitionsOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusShowPartitionsOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusShowPartitionsOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusShowPartitionsOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusUpdateCredentialOp.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusUpdateCredentialOp.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusUpdateCredentialOp.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/ops/MilvusUpdateCredentialOp.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/resultwrappers/MVGetIndexBuildProgressRespones.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/resultwrappers/MVGetIndexBuildProgressRespones.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/resultwrappers/MVGetIndexBuildProgressRespones.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/resultwrappers/MVGetIndexBuildProgressRespones.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/types/MilvusOpGroup.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/types/MilvusOpGroup.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/types/MilvusOpGroup.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/types/MilvusOpGroup.java
diff --git a/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/types/MilvusOpType.java b/nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/types/MilvusOpType.java
similarity index 100%
rename from adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/types/MilvusOpType.java
rename to nb-adapters/adapter-milvus/src/main/java/io/nosqlbench/adapter/milvus/types/MilvusOpType.java
diff --git a/adapter-milvus/src/main/resources/activities/milvus.yaml b/nb-adapters/adapter-milvus/src/main/resources/activities/milvus.yaml
similarity index 100%
rename from adapter-milvus/src/main/resources/activities/milvus.yaml
rename to nb-adapters/adapter-milvus/src/main/resources/activities/milvus.yaml
diff --git a/adapter-milvus/src/main/resources/activities/milvus_kv.yaml b/nb-adapters/adapter-milvus/src/main/resources/activities/milvus_kv.yaml
similarity index 100%
rename from adapter-milvus/src/main/resources/activities/milvus_kv.yaml
rename to nb-adapters/adapter-milvus/src/main/resources/activities/milvus_kv.yaml
diff --git a/adapter-milvus/src/main/resources/milvus.md b/nb-adapters/adapter-milvus/src/main/resources/milvus.md
similarity index 100%
rename from adapter-milvus/src/main/resources/milvus.md
rename to nb-adapters/adapter-milvus/src/main/resources/milvus.md
diff --git a/adapter-milvus/src/test/java/io/nosqlbench/adapter/milvus/MilvusAdapterUtilsTest.java b/nb-adapters/adapter-milvus/src/test/java/io/nosqlbench/adapter/milvus/MilvusAdapterUtilsTest.java
similarity index 100%
rename from adapter-milvus/src/test/java/io/nosqlbench/adapter/milvus/MilvusAdapterUtilsTest.java
rename to nb-adapters/adapter-milvus/src/test/java/io/nosqlbench/adapter/milvus/MilvusAdapterUtilsTest.java
diff --git a/adapter-mongodb/pom.xml b/nb-adapters/adapter-mongodb/pom.xml
similarity index 96%
rename from adapter-mongodb/pom.xml
rename to nb-adapters/adapter-mongodb/pom.xml
index 50e9266215..9ec9723bd1 100644
--- a/adapter-mongodb/pom.xml
+++ b/nb-adapters/adapter-mongodb/pom.xml
@@ -24,7 +24,7 @@
mvn-defaults
io.nosqlbench
${revision}
- ../mvn-defaults
+ ../../mvn-defaults
${project.artifactId}
diff --git a/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/MongoDbUtils.java b/nb-adapters/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/MongoDbUtils.java
similarity index 100%
rename from adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/MongoDbUtils.java
rename to nb-adapters/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/MongoDbUtils.java
diff --git a/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/MongoDBOpTypes.java b/nb-adapters/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/MongoDBOpTypes.java
similarity index 100%
rename from adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/MongoDBOpTypes.java
rename to nb-adapters/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/MongoDBOpTypes.java
diff --git a/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/MongoDriverAdapterLoader.java b/nb-adapters/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/MongoDriverAdapterLoader.java
similarity index 100%
rename from adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/MongoDriverAdapterLoader.java
rename to nb-adapters/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/MongoDriverAdapterLoader.java
diff --git a/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/MongoOpMapper.java b/nb-adapters/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/MongoOpMapper.java
similarity index 100%
rename from adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/MongoOpMapper.java
rename to nb-adapters/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/MongoOpMapper.java
diff --git a/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/MongoSpace.java b/nb-adapters/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/MongoSpace.java
similarity index 100%
rename from adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/MongoSpace.java
rename to nb-adapters/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/MongoSpace.java
diff --git a/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/MongodbDriverAdapter.java b/nb-adapters/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/MongodbDriverAdapter.java
similarity index 100%
rename from adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/MongodbDriverAdapter.java
rename to nb-adapters/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/MongodbDriverAdapter.java
diff --git a/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/dispensers/MongoCommandOpDispenser.java b/nb-adapters/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/dispensers/MongoCommandOpDispenser.java
similarity index 100%
rename from adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/dispensers/MongoCommandOpDispenser.java
rename to nb-adapters/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/dispensers/MongoCommandOpDispenser.java
diff --git a/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/dispensers/MongoDbUpdateOpDispenser.java b/nb-adapters/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/dispensers/MongoDbUpdateOpDispenser.java
similarity index 100%
rename from adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/dispensers/MongoDbUpdateOpDispenser.java
rename to nb-adapters/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/dispensers/MongoDbUpdateOpDispenser.java
diff --git a/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/ops/MongoDirectCommandOp.java b/nb-adapters/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/ops/MongoDirectCommandOp.java
similarity index 100%
rename from adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/ops/MongoDirectCommandOp.java
rename to nb-adapters/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/ops/MongoDirectCommandOp.java
diff --git a/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/ops/MongoOpFailedException.java b/nb-adapters/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/ops/MongoOpFailedException.java
similarity index 100%
rename from adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/ops/MongoOpFailedException.java
rename to nb-adapters/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/ops/MongoOpFailedException.java
diff --git a/adapter-mongodb/src/main/resources/activities/baselinesv2/mongodb-keyvalue2.yaml b/nb-adapters/adapter-mongodb/src/main/resources/activities/baselinesv2/mongodb-keyvalue2.yaml
similarity index 100%
rename from adapter-mongodb/src/main/resources/activities/baselinesv2/mongodb-keyvalue2.yaml
rename to nb-adapters/adapter-mongodb/src/main/resources/activities/baselinesv2/mongodb-keyvalue2.yaml
diff --git a/adapter-mongodb/src/main/resources/activities/baselinesv2/mongodb-tabular2.yaml b/nb-adapters/adapter-mongodb/src/main/resources/activities/baselinesv2/mongodb-tabular2.yaml
similarity index 100%
rename from adapter-mongodb/src/main/resources/activities/baselinesv2/mongodb-tabular2.yaml
rename to nb-adapters/adapter-mongodb/src/main/resources/activities/baselinesv2/mongodb-tabular2.yaml
diff --git a/adapter-mongodb/src/main/resources/activities/baselinesv2/mongodb-timeseries2.yaml b/nb-adapters/adapter-mongodb/src/main/resources/activities/baselinesv2/mongodb-timeseries2.yaml
similarity index 100%
rename from adapter-mongodb/src/main/resources/activities/baselinesv2/mongodb-timeseries2.yaml
rename to nb-adapters/adapter-mongodb/src/main/resources/activities/baselinesv2/mongodb-timeseries2.yaml
diff --git a/adapter-mongodb/src/main/resources/activities/baselinesv2/mongodb_vector_search.yaml b/nb-adapters/adapter-mongodb/src/main/resources/activities/baselinesv2/mongodb_vector_search.yaml
similarity index 100%
rename from adapter-mongodb/src/main/resources/activities/baselinesv2/mongodb_vector_search.yaml
rename to nb-adapters/adapter-mongodb/src/main/resources/activities/baselinesv2/mongodb_vector_search.yaml
diff --git a/adapter-mongodb/src/main/resources/activities/mongodb-basic-uuid.yaml b/nb-adapters/adapter-mongodb/src/main/resources/activities/mongodb-basic-uuid.yaml
similarity index 100%
rename from adapter-mongodb/src/main/resources/activities/mongodb-basic-uuid.yaml
rename to nb-adapters/adapter-mongodb/src/main/resources/activities/mongodb-basic-uuid.yaml
diff --git a/adapter-mongodb/src/main/resources/activities/mongodb-basic.yaml b/nb-adapters/adapter-mongodb/src/main/resources/activities/mongodb-basic.yaml
similarity index 100%
rename from adapter-mongodb/src/main/resources/activities/mongodb-basic.yaml
rename to nb-adapters/adapter-mongodb/src/main/resources/activities/mongodb-basic.yaml
diff --git a/adapter-mongodb/src/main/resources/activities/mongodb-crud-basic.md b/nb-adapters/adapter-mongodb/src/main/resources/activities/mongodb-crud-basic.md
similarity index 100%
rename from adapter-mongodb/src/main/resources/activities/mongodb-crud-basic.md
rename to nb-adapters/adapter-mongodb/src/main/resources/activities/mongodb-crud-basic.md
diff --git a/adapter-mongodb/src/main/resources/activities/mongodb-crud-basic.yaml b/nb-adapters/adapter-mongodb/src/main/resources/activities/mongodb-crud-basic.yaml
similarity index 100%
rename from adapter-mongodb/src/main/resources/activities/mongodb-crud-basic.yaml
rename to nb-adapters/adapter-mongodb/src/main/resources/activities/mongodb-crud-basic.yaml
diff --git a/adapter-mongodb/src/main/resources/activities/mongodb-crud-dataset.md b/nb-adapters/adapter-mongodb/src/main/resources/activities/mongodb-crud-dataset.md
similarity index 100%
rename from adapter-mongodb/src/main/resources/activities/mongodb-crud-dataset.md
rename to nb-adapters/adapter-mongodb/src/main/resources/activities/mongodb-crud-dataset.md
diff --git a/adapter-mongodb/src/main/resources/activities/mongodb-crud-dataset.yaml b/nb-adapters/adapter-mongodb/src/main/resources/activities/mongodb-crud-dataset.yaml
similarity index 100%
rename from adapter-mongodb/src/main/resources/activities/mongodb-crud-dataset.yaml
rename to nb-adapters/adapter-mongodb/src/main/resources/activities/mongodb-crud-dataset.yaml
diff --git a/adapter-mongodb/src/main/resources/activities/mongodb-search-basic.md b/nb-adapters/adapter-mongodb/src/main/resources/activities/mongodb-search-basic.md
similarity index 100%
rename from adapter-mongodb/src/main/resources/activities/mongodb-search-basic.md
rename to nb-adapters/adapter-mongodb/src/main/resources/activities/mongodb-search-basic.md
diff --git a/adapter-mongodb/src/main/resources/activities/mongodb-search-basic.yaml b/nb-adapters/adapter-mongodb/src/main/resources/activities/mongodb-search-basic.yaml
similarity index 100%
rename from adapter-mongodb/src/main/resources/activities/mongodb-search-basic.yaml
rename to nb-adapters/adapter-mongodb/src/main/resources/activities/mongodb-search-basic.yaml
diff --git a/adapter-mongodb/src/main/resources/data/mongo-test-ds.json b/nb-adapters/adapter-mongodb/src/main/resources/data/mongo-test-ds.json
similarity index 100%
rename from adapter-mongodb/src/main/resources/data/mongo-test-ds.json
rename to nb-adapters/adapter-mongodb/src/main/resources/data/mongo-test-ds.json
diff --git a/adapter-mongodb/src/main/resources/mongodb.md b/nb-adapters/adapter-mongodb/src/main/resources/mongodb.md
similarity index 100%
rename from adapter-mongodb/src/main/resources/mongodb.md
rename to nb-adapters/adapter-mongodb/src/main/resources/mongodb.md
diff --git a/adapter-pinecone/.gitignore b/nb-adapters/adapter-pinecone/.gitignore
similarity index 100%
rename from adapter-pinecone/.gitignore
rename to nb-adapters/adapter-pinecone/.gitignore
diff --git a/adapter-pinecone/README.md b/nb-adapters/adapter-pinecone/README.md
similarity index 100%
rename from adapter-pinecone/README.md
rename to nb-adapters/adapter-pinecone/README.md
diff --git a/adapter-pinecone/pom.xml b/nb-adapters/adapter-pinecone/pom.xml
similarity index 97%
rename from adapter-pinecone/pom.xml
rename to nb-adapters/adapter-pinecone/pom.xml
index 1587e792f0..67ac274488 100644
--- a/adapter-pinecone/pom.xml
+++ b/nb-adapters/adapter-pinecone/pom.xml
@@ -24,7 +24,7 @@
mvn-defaults
io.nosqlbench
${revision}
- ../mvn-defaults
+ ../../mvn-defaults
${project.artifactId}
diff --git a/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/PineconeDriverAdapter.java b/nb-adapters/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/PineconeDriverAdapter.java
similarity index 100%
rename from adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/PineconeDriverAdapter.java
rename to nb-adapters/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/PineconeDriverAdapter.java
diff --git a/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/PineconeDriverAdapterLoader.java b/nb-adapters/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/PineconeDriverAdapterLoader.java
similarity index 100%
rename from adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/PineconeDriverAdapterLoader.java
rename to nb-adapters/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/PineconeDriverAdapterLoader.java
diff --git a/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/PineconeOpMapper.java b/nb-adapters/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/PineconeOpMapper.java
similarity index 100%
rename from adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/PineconeOpMapper.java
rename to nb-adapters/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/PineconeOpMapper.java
diff --git a/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/PineconeSpace.java b/nb-adapters/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/PineconeSpace.java
similarity index 100%
rename from adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/PineconeSpace.java
rename to nb-adapters/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/PineconeSpace.java
diff --git a/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/opdispensers/PineconeDeleteOpDispenser.java b/nb-adapters/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/opdispensers/PineconeDeleteOpDispenser.java
similarity index 100%
rename from adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/opdispensers/PineconeDeleteOpDispenser.java
rename to nb-adapters/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/opdispensers/PineconeDeleteOpDispenser.java
diff --git a/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/opdispensers/PineconeDescribeIndexStatsOpDispenser.java b/nb-adapters/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/opdispensers/PineconeDescribeIndexStatsOpDispenser.java
similarity index 100%
rename from adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/opdispensers/PineconeDescribeIndexStatsOpDispenser.java
rename to nb-adapters/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/opdispensers/PineconeDescribeIndexStatsOpDispenser.java
diff --git a/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/opdispensers/PineconeFetchOpDispenser.java b/nb-adapters/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/opdispensers/PineconeFetchOpDispenser.java
similarity index 100%
rename from adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/opdispensers/PineconeFetchOpDispenser.java
rename to nb-adapters/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/opdispensers/PineconeFetchOpDispenser.java
diff --git a/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/opdispensers/PineconeOpDispenser.java b/nb-adapters/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/opdispensers/PineconeOpDispenser.java
similarity index 100%
rename from adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/opdispensers/PineconeOpDispenser.java
rename to nb-adapters/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/opdispensers/PineconeOpDispenser.java
diff --git a/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/opdispensers/PineconeQueryOpDispenser.java b/nb-adapters/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/opdispensers/PineconeQueryOpDispenser.java
similarity index 100%
rename from adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/opdispensers/PineconeQueryOpDispenser.java
rename to nb-adapters/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/opdispensers/PineconeQueryOpDispenser.java
diff --git a/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/opdispensers/PineconeUpdateOpDispenser.java b/nb-adapters/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/opdispensers/PineconeUpdateOpDispenser.java
similarity index 100%
rename from adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/opdispensers/PineconeUpdateOpDispenser.java
rename to nb-adapters/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/opdispensers/PineconeUpdateOpDispenser.java
diff --git a/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/opdispensers/PineconeUpsertOpDispenser.java b/nb-adapters/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/opdispensers/PineconeUpsertOpDispenser.java
similarity index 100%
rename from adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/opdispensers/PineconeUpsertOpDispenser.java
rename to nb-adapters/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/opdispensers/PineconeUpsertOpDispenser.java
diff --git a/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/ops/PineconeDeleteOp.java b/nb-adapters/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/ops/PineconeDeleteOp.java
similarity index 100%
rename from adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/ops/PineconeDeleteOp.java
rename to nb-adapters/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/ops/PineconeDeleteOp.java
diff --git a/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/ops/PineconeDescribeIndexStatsOp.java b/nb-adapters/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/ops/PineconeDescribeIndexStatsOp.java
similarity index 100%
rename from adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/ops/PineconeDescribeIndexStatsOp.java
rename to nb-adapters/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/ops/PineconeDescribeIndexStatsOp.java
diff --git a/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/ops/PineconeFetchOp.java b/nb-adapters/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/ops/PineconeFetchOp.java
similarity index 100%
rename from adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/ops/PineconeFetchOp.java
rename to nb-adapters/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/ops/PineconeFetchOp.java
diff --git a/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/ops/PineconeOp.java b/nb-adapters/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/ops/PineconeOp.java
similarity index 100%
rename from adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/ops/PineconeOp.java
rename to nb-adapters/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/ops/PineconeOp.java
diff --git a/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/ops/PineconeOpTypes.java b/nb-adapters/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/ops/PineconeOpTypes.java
similarity index 100%
rename from adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/ops/PineconeOpTypes.java
rename to nb-adapters/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/ops/PineconeOpTypes.java
diff --git a/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/ops/PineconeQueryOp.java b/nb-adapters/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/ops/PineconeQueryOp.java
similarity index 100%
rename from adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/ops/PineconeQueryOp.java
rename to nb-adapters/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/ops/PineconeQueryOp.java
diff --git a/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/ops/PineconeUpdateOp.java b/nb-adapters/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/ops/PineconeUpdateOp.java
similarity index 100%
rename from adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/ops/PineconeUpdateOp.java
rename to nb-adapters/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/ops/PineconeUpdateOp.java
diff --git a/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/ops/PineconeUpsertOp.java b/nb-adapters/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/ops/PineconeUpsertOp.java
similarity index 100%
rename from adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/ops/PineconeUpsertOp.java
rename to nb-adapters/adapter-pinecone/src/main/java/io/nosqlbench/adapter/pinecone/ops/PineconeUpsertOp.java
diff --git a/adapter-pinecone/src/main/java/io/nosqlbench/engine/extensions/vectormath/PineconeScriptingUtils.java b/nb-adapters/adapter-pinecone/src/main/java/io/nosqlbench/engine/extensions/vectormath/PineconeScriptingUtils.java
similarity index 100%
rename from adapter-pinecone/src/main/java/io/nosqlbench/engine/extensions/vectormath/PineconeScriptingUtils.java
rename to nb-adapters/adapter-pinecone/src/main/java/io/nosqlbench/engine/extensions/vectormath/PineconeScriptingUtils.java
diff --git a/adapter-pinecone/src/main/java/io/nosqlbench/engine/extensions/vectormath/PineconeScriptingUtilsPluginInfo.java b/nb-adapters/adapter-pinecone/src/main/java/io/nosqlbench/engine/extensions/vectormath/PineconeScriptingUtilsPluginInfo.java
similarity index 100%
rename from adapter-pinecone/src/main/java/io/nosqlbench/engine/extensions/vectormath/PineconeScriptingUtilsPluginInfo.java
rename to nb-adapters/adapter-pinecone/src/main/java/io/nosqlbench/engine/extensions/vectormath/PineconeScriptingUtilsPluginInfo.java
diff --git a/adapter-pinecone/src/main/resources/activities/pinecone-delete.yaml b/nb-adapters/adapter-pinecone/src/main/resources/activities/pinecone-delete.yaml
similarity index 100%
rename from adapter-pinecone/src/main/resources/activities/pinecone-delete.yaml
rename to nb-adapters/adapter-pinecone/src/main/resources/activities/pinecone-delete.yaml
diff --git a/adapter-pinecone/src/main/resources/activities/pinecone-fetch.yaml b/nb-adapters/adapter-pinecone/src/main/resources/activities/pinecone-fetch.yaml
similarity index 100%
rename from adapter-pinecone/src/main/resources/activities/pinecone-fetch.yaml
rename to nb-adapters/adapter-pinecone/src/main/resources/activities/pinecone-fetch.yaml
diff --git a/adapter-pinecone/src/main/resources/activities/pinecone-query-all.yaml b/nb-adapters/adapter-pinecone/src/main/resources/activities/pinecone-query-all.yaml
similarity index 100%
rename from adapter-pinecone/src/main/resources/activities/pinecone-query-all.yaml
rename to nb-adapters/adapter-pinecone/src/main/resources/activities/pinecone-query-all.yaml
diff --git a/adapter-pinecone/src/main/resources/activities/pinecone-query-multiple.yaml b/nb-adapters/adapter-pinecone/src/main/resources/activities/pinecone-query-multiple.yaml
similarity index 100%
rename from adapter-pinecone/src/main/resources/activities/pinecone-query-multiple.yaml
rename to nb-adapters/adapter-pinecone/src/main/resources/activities/pinecone-query-multiple.yaml
diff --git a/adapter-pinecone/src/main/resources/activities/pinecone-query.yaml b/nb-adapters/adapter-pinecone/src/main/resources/activities/pinecone-query.yaml
similarity index 100%
rename from adapter-pinecone/src/main/resources/activities/pinecone-query.yaml
rename to nb-adapters/adapter-pinecone/src/main/resources/activities/pinecone-query.yaml
diff --git a/adapter-pinecone/src/main/resources/activities/pinecone-stats.yaml b/nb-adapters/adapter-pinecone/src/main/resources/activities/pinecone-stats.yaml
similarity index 100%
rename from adapter-pinecone/src/main/resources/activities/pinecone-stats.yaml
rename to nb-adapters/adapter-pinecone/src/main/resources/activities/pinecone-stats.yaml
diff --git a/adapter-pinecone/src/main/resources/activities/pinecone-upsert-scenario.yaml b/nb-adapters/adapter-pinecone/src/main/resources/activities/pinecone-upsert-scenario.yaml
similarity index 100%
rename from adapter-pinecone/src/main/resources/activities/pinecone-upsert-scenario.yaml
rename to nb-adapters/adapter-pinecone/src/main/resources/activities/pinecone-upsert-scenario.yaml
diff --git a/adapter-pinecone/src/main/resources/activities/pinecone-upsert.yaml b/nb-adapters/adapter-pinecone/src/main/resources/activities/pinecone-upsert.yaml
similarity index 100%
rename from adapter-pinecone/src/main/resources/activities/pinecone-upsert.yaml
rename to nb-adapters/adapter-pinecone/src/main/resources/activities/pinecone-upsert.yaml
diff --git a/adapter-pinecone/src/main/resources/activities/pinecone-verify.yaml b/nb-adapters/adapter-pinecone/src/main/resources/activities/pinecone-verify.yaml
similarity index 100%
rename from adapter-pinecone/src/main/resources/activities/pinecone-verify.yaml
rename to nb-adapters/adapter-pinecone/src/main/resources/activities/pinecone-verify.yaml
diff --git a/adapter-pinecone/src/main/resources/pinecone.md b/nb-adapters/adapter-pinecone/src/main/resources/pinecone.md
similarity index 100%
rename from adapter-pinecone/src/main/resources/pinecone.md
rename to nb-adapters/adapter-pinecone/src/main/resources/pinecone.md
diff --git a/adapter-pinecone/src/test/java/io/nosqlbench/engine/extensions/vectormath/PineconeScriptingUtilsTest.java b/nb-adapters/adapter-pinecone/src/test/java/io/nosqlbench/engine/extensions/vectormath/PineconeScriptingUtilsTest.java
similarity index 100%
rename from adapter-pinecone/src/test/java/io/nosqlbench/engine/extensions/vectormath/PineconeScriptingUtilsTest.java
rename to nb-adapters/adapter-pinecone/src/test/java/io/nosqlbench/engine/extensions/vectormath/PineconeScriptingUtilsTest.java
diff --git a/adapter-pulsar/pom.xml b/nb-adapters/adapter-pulsar/pom.xml
similarity index 98%
rename from adapter-pulsar/pom.xml
rename to nb-adapters/adapter-pulsar/pom.xml
index 8ac7bdfac2..28dd9ac175 100644
--- a/adapter-pulsar/pom.xml
+++ b/nb-adapters/adapter-pulsar/pom.xml
@@ -24,7 +24,7 @@
mvn-defaults
io.nosqlbench
${revision}
- ../mvn-defaults
+ ../../mvn-defaults
${project.artifactId}
diff --git a/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/PulsarDriverAdapter.java b/nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/PulsarDriverAdapter.java
similarity index 100%
rename from adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/PulsarDriverAdapter.java
rename to nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/PulsarDriverAdapter.java
diff --git a/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/PulsarDriverAdapterLoader.java b/nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/PulsarDriverAdapterLoader.java
similarity index 100%
rename from adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/PulsarDriverAdapterLoader.java
rename to nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/PulsarDriverAdapterLoader.java
diff --git a/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/PulsarOpMapper.java b/nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/PulsarOpMapper.java
similarity index 100%
rename from adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/PulsarOpMapper.java
rename to nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/PulsarOpMapper.java
diff --git a/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/PulsarOpType.java b/nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/PulsarOpType.java
similarity index 100%
rename from adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/PulsarOpType.java
rename to nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/PulsarOpType.java
diff --git a/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/PulsarSpace.java b/nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/PulsarSpace.java
similarity index 100%
rename from adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/PulsarSpace.java
rename to nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/PulsarSpace.java
diff --git a/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/dispensers/AdminNamespaceOpDispenser.java b/nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/dispensers/AdminNamespaceOpDispenser.java
similarity index 100%
rename from adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/dispensers/AdminNamespaceOpDispenser.java
rename to nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/dispensers/AdminNamespaceOpDispenser.java
diff --git a/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/dispensers/AdminTenantOpDispenser.java b/nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/dispensers/AdminTenantOpDispenser.java
similarity index 100%
rename from adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/dispensers/AdminTenantOpDispenser.java
rename to nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/dispensers/AdminTenantOpDispenser.java
diff --git a/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/dispensers/AdminTopicOpDispenser.java b/nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/dispensers/AdminTopicOpDispenser.java
similarity index 100%
rename from adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/dispensers/AdminTopicOpDispenser.java
rename to nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/dispensers/AdminTopicOpDispenser.java
diff --git a/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/dispensers/MessageConsumerOpDispenser.java b/nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/dispensers/MessageConsumerOpDispenser.java
similarity index 100%
rename from adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/dispensers/MessageConsumerOpDispenser.java
rename to nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/dispensers/MessageConsumerOpDispenser.java
diff --git a/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/dispensers/MessageProducerOpDispenser.java b/nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/dispensers/MessageProducerOpDispenser.java
similarity index 100%
rename from adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/dispensers/MessageProducerOpDispenser.java
rename to nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/dispensers/MessageProducerOpDispenser.java
diff --git a/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/dispensers/MessageReaderOpDispenser.java b/nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/dispensers/MessageReaderOpDispenser.java
similarity index 100%
rename from adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/dispensers/MessageReaderOpDispenser.java
rename to nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/dispensers/MessageReaderOpDispenser.java
diff --git a/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/dispensers/PulsarAdminOpDispenser.java b/nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/dispensers/PulsarAdminOpDispenser.java
similarity index 100%
rename from adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/dispensers/PulsarAdminOpDispenser.java
rename to nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/dispensers/PulsarAdminOpDispenser.java
diff --git a/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/dispensers/PulsarBaseOpDispenser.java b/nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/dispensers/PulsarBaseOpDispenser.java
similarity index 100%
rename from adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/dispensers/PulsarBaseOpDispenser.java
rename to nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/dispensers/PulsarBaseOpDispenser.java
diff --git a/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/dispensers/PulsarClientOpDispenser.java b/nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/dispensers/PulsarClientOpDispenser.java
similarity index 100%
rename from adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/dispensers/PulsarClientOpDispenser.java
rename to nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/dispensers/PulsarClientOpDispenser.java
diff --git a/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/exception/PulsarAdapterAsyncOperationFailedException.java b/nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/exception/PulsarAdapterAsyncOperationFailedException.java
similarity index 100%
rename from adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/exception/PulsarAdapterAsyncOperationFailedException.java
rename to nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/exception/PulsarAdapterAsyncOperationFailedException.java
diff --git a/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/exception/PulsarAdapterInvalidParamException.java b/nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/exception/PulsarAdapterInvalidParamException.java
similarity index 100%
rename from adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/exception/PulsarAdapterInvalidParamException.java
rename to nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/exception/PulsarAdapterInvalidParamException.java
diff --git a/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/exception/PulsarAdapterUnexpectedException.java b/nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/exception/PulsarAdapterUnexpectedException.java
similarity index 100%
rename from adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/exception/PulsarAdapterUnexpectedException.java
rename to nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/exception/PulsarAdapterUnexpectedException.java
diff --git a/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/exception/PulsarAdapterUnsupportedOpException.java b/nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/exception/PulsarAdapterUnsupportedOpException.java
similarity index 100%
rename from adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/exception/PulsarAdapterUnsupportedOpException.java
rename to nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/exception/PulsarAdapterUnsupportedOpException.java
diff --git a/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/ops/AdminNamespaceOp.java b/nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/ops/AdminNamespaceOp.java
similarity index 100%
rename from adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/ops/AdminNamespaceOp.java
rename to nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/ops/AdminNamespaceOp.java
diff --git a/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/ops/AdminTenantOp.java b/nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/ops/AdminTenantOp.java
similarity index 100%
rename from adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/ops/AdminTenantOp.java
rename to nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/ops/AdminTenantOp.java
diff --git a/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/ops/AdminTopicOp.java b/nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/ops/AdminTopicOp.java
similarity index 100%
rename from adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/ops/AdminTopicOp.java
rename to nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/ops/AdminTopicOp.java
diff --git a/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/ops/MessageConsumerOp.java b/nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/ops/MessageConsumerOp.java
similarity index 100%
rename from adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/ops/MessageConsumerOp.java
rename to nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/ops/MessageConsumerOp.java
diff --git a/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/ops/MessageProducerOp.java b/nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/ops/MessageProducerOp.java
similarity index 100%
rename from adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/ops/MessageProducerOp.java
rename to nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/ops/MessageProducerOp.java
diff --git a/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/ops/MessageReaderOp.java b/nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/ops/MessageReaderOp.java
similarity index 100%
rename from adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/ops/MessageReaderOp.java
rename to nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/ops/MessageReaderOp.java
diff --git a/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/ops/PulsarAdminOp.java b/nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/ops/PulsarAdminOp.java
similarity index 100%
rename from adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/ops/PulsarAdminOp.java
rename to nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/ops/PulsarAdminOp.java
diff --git a/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/ops/PulsarClientOp.java b/nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/ops/PulsarClientOp.java
similarity index 100%
rename from adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/ops/PulsarClientOp.java
rename to nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/ops/PulsarClientOp.java
diff --git a/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/ops/PulsarOp.java b/nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/ops/PulsarOp.java
similarity index 100%
rename from adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/ops/PulsarOp.java
rename to nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/ops/PulsarOp.java
diff --git a/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/util/EndToEndStartingTimeSource.java b/nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/util/EndToEndStartingTimeSource.java
similarity index 100%
rename from adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/util/EndToEndStartingTimeSource.java
rename to nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/util/EndToEndStartingTimeSource.java
diff --git a/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/util/PulsarAdapterMetrics.java b/nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/util/PulsarAdapterMetrics.java
similarity index 100%
rename from adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/util/PulsarAdapterMetrics.java
rename to nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/util/PulsarAdapterMetrics.java
diff --git a/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/util/PulsarAdapterUtil.java b/nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/util/PulsarAdapterUtil.java
similarity index 100%
rename from adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/util/PulsarAdapterUtil.java
rename to nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/util/PulsarAdapterUtil.java
diff --git a/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/util/PulsarAvroSchemaUtil.java b/nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/util/PulsarAvroSchemaUtil.java
similarity index 100%
rename from adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/util/PulsarAvroSchemaUtil.java
rename to nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/util/PulsarAvroSchemaUtil.java
diff --git a/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/util/PulsarClientConf.java b/nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/util/PulsarClientConf.java
similarity index 100%
rename from adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/util/PulsarClientConf.java
rename to nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/util/PulsarClientConf.java
diff --git a/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/util/PulsarConfConverter.java b/nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/util/PulsarConfConverter.java
similarity index 100%
rename from adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/util/PulsarConfConverter.java
rename to nb-adapters/adapter-pulsar/src/main/java/io/nosqlbench/adapter/pulsar/util/PulsarConfConverter.java
diff --git a/adapter-pulsar/src/main/resources/build-nb-pulsar-driver.sh b/nb-adapters/adapter-pulsar/src/main/resources/build-nb-pulsar-driver.sh
similarity index 100%
rename from adapter-pulsar/src/main/resources/build-nb-pulsar-driver.sh
rename to nb-adapters/adapter-pulsar/src/main/resources/build-nb-pulsar-driver.sh
diff --git a/adapter-pulsar/src/main/resources/conf/iot-key-example.avsc b/nb-adapters/adapter-pulsar/src/main/resources/conf/iot-key-example.avsc
similarity index 100%
rename from adapter-pulsar/src/main/resources/conf/iot-key-example.avsc
rename to nb-adapters/adapter-pulsar/src/main/resources/conf/iot-key-example.avsc
diff --git a/adapter-pulsar/src/main/resources/conf/iot-value-example.avsc b/nb-adapters/adapter-pulsar/src/main/resources/conf/iot-value-example.avsc
similarity index 100%
rename from adapter-pulsar/src/main/resources/conf/iot-value-example.avsc
rename to nb-adapters/adapter-pulsar/src/main/resources/conf/iot-value-example.avsc
diff --git a/adapter-pulsar/src/main/resources/conf/pulsar_config.properties b/nb-adapters/adapter-pulsar/src/main/resources/conf/pulsar_config.properties
similarity index 100%
rename from adapter-pulsar/src/main/resources/conf/pulsar_config.properties
rename to nb-adapters/adapter-pulsar/src/main/resources/conf/pulsar_config.properties
diff --git a/adapter-pulsar/src/main/resources/pulsar.md b/nb-adapters/adapter-pulsar/src/main/resources/pulsar.md
similarity index 100%
rename from adapter-pulsar/src/main/resources/pulsar.md
rename to nb-adapters/adapter-pulsar/src/main/resources/pulsar.md
diff --git a/adapter-pulsar/src/main/resources/scenarios/admin_namespace.yaml b/nb-adapters/adapter-pulsar/src/main/resources/scenarios/admin_namespace.yaml
similarity index 100%
rename from adapter-pulsar/src/main/resources/scenarios/admin_namespace.yaml
rename to nb-adapters/adapter-pulsar/src/main/resources/scenarios/admin_namespace.yaml
diff --git a/adapter-pulsar/src/main/resources/scenarios/admin_tenant.yaml b/nb-adapters/adapter-pulsar/src/main/resources/scenarios/admin_tenant.yaml
similarity index 100%
rename from adapter-pulsar/src/main/resources/scenarios/admin_tenant.yaml
rename to nb-adapters/adapter-pulsar/src/main/resources/scenarios/admin_tenant.yaml
diff --git a/adapter-pulsar/src/main/resources/scenarios/admin_topic.yaml b/nb-adapters/adapter-pulsar/src/main/resources/scenarios/admin_topic.yaml
similarity index 100%
rename from adapter-pulsar/src/main/resources/scenarios/admin_topic.yaml
rename to nb-adapters/adapter-pulsar/src/main/resources/scenarios/admin_topic.yaml
diff --git a/adapter-pulsar/src/main/resources/scenarios/bindingtest.yaml b/nb-adapters/adapter-pulsar/src/main/resources/scenarios/bindingtest.yaml
similarity index 100%
rename from adapter-pulsar/src/main/resources/scenarios/bindingtest.yaml
rename to nb-adapters/adapter-pulsar/src/main/resources/scenarios/bindingtest.yaml
diff --git a/adapter-pulsar/src/main/resources/scenarios/consumer_4KB_workload.yaml b/nb-adapters/adapter-pulsar/src/main/resources/scenarios/consumer_4KB_workload.yaml
similarity index 100%
rename from adapter-pulsar/src/main/resources/scenarios/consumer_4KB_workload.yaml
rename to nb-adapters/adapter-pulsar/src/main/resources/scenarios/consumer_4KB_workload.yaml
diff --git a/adapter-pulsar/src/main/resources/scenarios/msg_recv.yaml b/nb-adapters/adapter-pulsar/src/main/resources/scenarios/msg_recv.yaml
similarity index 100%
rename from adapter-pulsar/src/main/resources/scenarios/msg_recv.yaml
rename to nb-adapters/adapter-pulsar/src/main/resources/scenarios/msg_recv.yaml
diff --git a/adapter-pulsar/src/main/resources/scenarios/msg_send_avro.yaml b/nb-adapters/adapter-pulsar/src/main/resources/scenarios/msg_send_avro.yaml
similarity index 100%
rename from adapter-pulsar/src/main/resources/scenarios/msg_send_avro.yaml
rename to nb-adapters/adapter-pulsar/src/main/resources/scenarios/msg_send_avro.yaml
diff --git a/adapter-pulsar/src/main/resources/scenarios/msg_send_kvraw.yaml b/nb-adapters/adapter-pulsar/src/main/resources/scenarios/msg_send_kvraw.yaml
similarity index 100%
rename from adapter-pulsar/src/main/resources/scenarios/msg_send_kvraw.yaml
rename to nb-adapters/adapter-pulsar/src/main/resources/scenarios/msg_send_kvraw.yaml
diff --git a/adapter-pulsar/src/main/resources/scenarios/nbpulsar_msg_proc_str_named.yaml b/nb-adapters/adapter-pulsar/src/main/resources/scenarios/nbpulsar_msg_proc_str_named.yaml
similarity index 100%
rename from adapter-pulsar/src/main/resources/scenarios/nbpulsar_msg_proc_str_named.yaml
rename to nb-adapters/adapter-pulsar/src/main/resources/scenarios/nbpulsar_msg_proc_str_named.yaml
diff --git a/adapter-pulsar/src/main/resources/scenarios/producer_4KB_workload.yaml b/nb-adapters/adapter-pulsar/src/main/resources/scenarios/producer_4KB_workload.yaml
similarity index 100%
rename from adapter-pulsar/src/main/resources/scenarios/producer_4KB_workload.yaml
rename to nb-adapters/adapter-pulsar/src/main/resources/scenarios/producer_4KB_workload.yaml
diff --git a/adapter-pulsar/src/main/resources/start_pulsar_consumer.sh b/nb-adapters/adapter-pulsar/src/main/resources/start_pulsar_consumer.sh
similarity index 100%
rename from adapter-pulsar/src/main/resources/start_pulsar_consumer.sh
rename to nb-adapters/adapter-pulsar/src/main/resources/start_pulsar_consumer.sh
diff --git a/adapter-pulsar/src/main/resources/start_pulsar_producer.sh b/nb-adapters/adapter-pulsar/src/main/resources/start_pulsar_producer.sh
similarity index 100%
rename from adapter-pulsar/src/main/resources/start_pulsar_producer.sh
rename to nb-adapters/adapter-pulsar/src/main/resources/start_pulsar_producer.sh
diff --git a/adapter-s4j/pom.xml b/nb-adapters/adapter-s4j/pom.xml
similarity index 82%
rename from adapter-s4j/pom.xml
rename to nb-adapters/adapter-s4j/pom.xml
index 2bcc7e93da..b3fec03254 100644
--- a/adapter-s4j/pom.xml
+++ b/nb-adapters/adapter-s4j/pom.xml
@@ -24,7 +24,7 @@
mvn-defaults
io.nosqlbench
${revision}
- ../mvn-defaults
+ ../../mvn-defaults
${project.artifactId}
@@ -87,13 +87,29 @@
-
-
+
+
kr.motd.maven
os-maven-plugin
1.7.1
-
-
+
+
+ initialize
+
+ detect
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/S4JDriverAdapter.java b/nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/S4JDriverAdapter.java
similarity index 100%
rename from adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/S4JDriverAdapter.java
rename to nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/S4JDriverAdapter.java
diff --git a/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/S4JDriverAdapterLoader.java b/nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/S4JDriverAdapterLoader.java
similarity index 100%
rename from adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/S4JDriverAdapterLoader.java
rename to nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/S4JDriverAdapterLoader.java
diff --git a/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/S4JOpMapper.java b/nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/S4JOpMapper.java
similarity index 100%
rename from adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/S4JOpMapper.java
rename to nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/S4JOpMapper.java
diff --git a/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/S4JOpType.java b/nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/S4JOpType.java
similarity index 100%
rename from adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/S4JOpType.java
rename to nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/S4JOpType.java
diff --git a/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/S4JSpace.java b/nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/S4JSpace.java
similarity index 100%
rename from adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/S4JSpace.java
rename to nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/S4JSpace.java
diff --git a/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/dispensers/MessageConsumerOpDispenser.java b/nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/dispensers/MessageConsumerOpDispenser.java
similarity index 100%
rename from adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/dispensers/MessageConsumerOpDispenser.java
rename to nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/dispensers/MessageConsumerOpDispenser.java
diff --git a/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/dispensers/MessageProducerOpDispenser.java b/nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/dispensers/MessageProducerOpDispenser.java
similarity index 100%
rename from adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/dispensers/MessageProducerOpDispenser.java
rename to nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/dispensers/MessageProducerOpDispenser.java
diff --git a/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/dispensers/S4JBaseOpDispenser.java b/nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/dispensers/S4JBaseOpDispenser.java
similarity index 100%
rename from adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/dispensers/S4JBaseOpDispenser.java
rename to nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/dispensers/S4JBaseOpDispenser.java
diff --git a/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/exception/S4JAdapterAsyncOperationFailedException.java b/nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/exception/S4JAdapterAsyncOperationFailedException.java
similarity index 100%
rename from adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/exception/S4JAdapterAsyncOperationFailedException.java
rename to nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/exception/S4JAdapterAsyncOperationFailedException.java
diff --git a/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/exception/S4JAdapterInvalidParamException.java b/nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/exception/S4JAdapterInvalidParamException.java
similarity index 100%
rename from adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/exception/S4JAdapterInvalidParamException.java
rename to nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/exception/S4JAdapterInvalidParamException.java
diff --git a/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/exception/S4JAdapterUnexpectedException.java b/nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/exception/S4JAdapterUnexpectedException.java
similarity index 100%
rename from adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/exception/S4JAdapterUnexpectedException.java
rename to nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/exception/S4JAdapterUnexpectedException.java
diff --git a/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/exception/S4JAdapterUnsupportedOpException.java b/nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/exception/S4JAdapterUnsupportedOpException.java
similarity index 100%
rename from adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/exception/S4JAdapterUnsupportedOpException.java
rename to nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/exception/S4JAdapterUnsupportedOpException.java
diff --git a/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/ops/MessageConsumerOp.java b/nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/ops/MessageConsumerOp.java
similarity index 100%
rename from adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/ops/MessageConsumerOp.java
rename to nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/ops/MessageConsumerOp.java
diff --git a/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/ops/MessageProducerOp.java b/nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/ops/MessageProducerOp.java
similarity index 100%
rename from adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/ops/MessageProducerOp.java
rename to nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/ops/MessageProducerOp.java
diff --git a/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/ops/S4JOp.java b/nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/ops/S4JOp.java
similarity index 100%
rename from adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/ops/S4JOp.java
rename to nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/ops/S4JOp.java
diff --git a/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/util/S4JAdapterMetrics.java b/nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/util/S4JAdapterMetrics.java
similarity index 100%
rename from adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/util/S4JAdapterMetrics.java
rename to nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/util/S4JAdapterMetrics.java
diff --git a/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/util/S4JAdapterUtil.java b/nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/util/S4JAdapterUtil.java
similarity index 100%
rename from adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/util/S4JAdapterUtil.java
rename to nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/util/S4JAdapterUtil.java
diff --git a/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/util/S4JClientConf.java b/nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/util/S4JClientConf.java
similarity index 100%
rename from adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/util/S4JClientConf.java
rename to nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/util/S4JClientConf.java
diff --git a/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/util/S4JClientConfConverter.java b/nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/util/S4JClientConfConverter.java
similarity index 100%
rename from adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/util/S4JClientConfConverter.java
rename to nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/util/S4JClientConfConverter.java
diff --git a/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/util/S4JCompletionListener.java b/nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/util/S4JCompletionListener.java
similarity index 100%
rename from adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/util/S4JCompletionListener.java
rename to nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/util/S4JCompletionListener.java
diff --git a/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/util/S4JJMSContextWrapper.java b/nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/util/S4JJMSContextWrapper.java
similarity index 100%
rename from adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/util/S4JJMSContextWrapper.java
rename to nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/util/S4JJMSContextWrapper.java
diff --git a/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/util/S4JMessageListener.java b/nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/util/S4JMessageListener.java
similarity index 100%
rename from adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/util/S4JMessageListener.java
rename to nb-adapters/adapter-s4j/src/main/java/io/nosqlbench/adapter/s4j/util/S4JMessageListener.java
diff --git a/adapter-s4j/src/main/resources/conf/s4j_config.properties b/nb-adapters/adapter-s4j/src/main/resources/conf/s4j_config.properties
similarity index 100%
rename from adapter-s4j/src/main/resources/conf/s4j_config.properties
rename to nb-adapters/adapter-s4j/src/main/resources/conf/s4j_config.properties
diff --git a/adapter-s4j/src/main/resources/s4j.md b/nb-adapters/adapter-s4j/src/main/resources/s4j.md
similarity index 100%
rename from adapter-s4j/src/main/resources/s4j.md
rename to nb-adapters/adapter-s4j/src/main/resources/s4j.md
diff --git a/adapter-s4j/src/main/resources/scenarios/nbs4j_msg_proc_named.yaml b/nb-adapters/adapter-s4j/src/main/resources/scenarios/nbs4j_msg_proc_named.yaml
similarity index 100%
rename from adapter-s4j/src/main/resources/scenarios/nbs4j_msg_proc_named.yaml
rename to nb-adapters/adapter-s4j/src/main/resources/scenarios/nbs4j_msg_proc_named.yaml
diff --git a/adapter-s4j/src/main/resources/scenarios/pulsar_s4j_consumer.yaml b/nb-adapters/adapter-s4j/src/main/resources/scenarios/pulsar_s4j_consumer.yaml
similarity index 100%
rename from adapter-s4j/src/main/resources/scenarios/pulsar_s4j_consumer.yaml
rename to nb-adapters/adapter-s4j/src/main/resources/scenarios/pulsar_s4j_consumer.yaml
diff --git a/adapter-s4j/src/main/resources/scenarios/pulsar_s4j_producer.yaml b/nb-adapters/adapter-s4j/src/main/resources/scenarios/pulsar_s4j_producer.yaml
similarity index 100%
rename from adapter-s4j/src/main/resources/scenarios/pulsar_s4j_producer.yaml
rename to nb-adapters/adapter-s4j/src/main/resources/scenarios/pulsar_s4j_producer.yaml
diff --git a/adapter-stdout/pom.xml b/nb-adapters/adapter-stdout/pom.xml
similarity index 97%
rename from adapter-stdout/pom.xml
rename to nb-adapters/adapter-stdout/pom.xml
index 62dfc2548c..6b51eeb3af 100644
--- a/adapter-stdout/pom.xml
+++ b/nb-adapters/adapter-stdout/pom.xml
@@ -24,7 +24,7 @@
mvn-defaults
io.nosqlbench
${revision}
- ../mvn-defaults
+ ../../mvn-defaults
${project.artifactId}
diff --git a/adapter-stdout/src/main/java/io/nosqlbench/adapter/stdout/StdoutDriverAdapter.java b/nb-adapters/adapter-stdout/src/main/java/io/nosqlbench/adapter/stdout/StdoutDriverAdapter.java
similarity index 100%
rename from adapter-stdout/src/main/java/io/nosqlbench/adapter/stdout/StdoutDriverAdapter.java
rename to nb-adapters/adapter-stdout/src/main/java/io/nosqlbench/adapter/stdout/StdoutDriverAdapter.java
diff --git a/adapter-stdout/src/main/java/io/nosqlbench/adapter/stdout/StdoutDriverAdapterLoader.java b/nb-adapters/adapter-stdout/src/main/java/io/nosqlbench/adapter/stdout/StdoutDriverAdapterLoader.java
similarity index 100%
rename from adapter-stdout/src/main/java/io/nosqlbench/adapter/stdout/StdoutDriverAdapterLoader.java
rename to nb-adapters/adapter-stdout/src/main/java/io/nosqlbench/adapter/stdout/StdoutDriverAdapterLoader.java
diff --git a/adapter-stdout/src/main/java/io/nosqlbench/adapter/stdout/StdoutOp.java b/nb-adapters/adapter-stdout/src/main/java/io/nosqlbench/adapter/stdout/StdoutOp.java
similarity index 100%
rename from adapter-stdout/src/main/java/io/nosqlbench/adapter/stdout/StdoutOp.java
rename to nb-adapters/adapter-stdout/src/main/java/io/nosqlbench/adapter/stdout/StdoutOp.java
diff --git a/adapter-stdout/src/main/java/io/nosqlbench/adapter/stdout/StdoutOpDispenser.java b/nb-adapters/adapter-stdout/src/main/java/io/nosqlbench/adapter/stdout/StdoutOpDispenser.java
similarity index 100%
rename from adapter-stdout/src/main/java/io/nosqlbench/adapter/stdout/StdoutOpDispenser.java
rename to nb-adapters/adapter-stdout/src/main/java/io/nosqlbench/adapter/stdout/StdoutOpDispenser.java
diff --git a/adapter-stdout/src/main/java/io/nosqlbench/adapter/stdout/StdoutOpMapper.java b/nb-adapters/adapter-stdout/src/main/java/io/nosqlbench/adapter/stdout/StdoutOpMapper.java
similarity index 100%
rename from adapter-stdout/src/main/java/io/nosqlbench/adapter/stdout/StdoutOpMapper.java
rename to nb-adapters/adapter-stdout/src/main/java/io/nosqlbench/adapter/stdout/StdoutOpMapper.java
diff --git a/adapter-stdout/src/main/java/io/nosqlbench/adapter/stdout/StdoutSpace.java b/nb-adapters/adapter-stdout/src/main/java/io/nosqlbench/adapter/stdout/StdoutSpace.java
similarity index 100%
rename from adapter-stdout/src/main/java/io/nosqlbench/adapter/stdout/StdoutSpace.java
rename to nb-adapters/adapter-stdout/src/main/java/io/nosqlbench/adapter/stdout/StdoutSpace.java
diff --git a/adapter-stdout/src/main/java/io/nosqlbench/adapter/stdout/TemplateFormat.java b/nb-adapters/adapter-stdout/src/main/java/io/nosqlbench/adapter/stdout/TemplateFormat.java
similarity index 100%
rename from adapter-stdout/src/main/java/io/nosqlbench/adapter/stdout/TemplateFormat.java
rename to nb-adapters/adapter-stdout/src/main/java/io/nosqlbench/adapter/stdout/TemplateFormat.java
diff --git a/adapter-stdout/src/main/resources/stdout.md b/nb-adapters/adapter-stdout/src/main/resources/stdout.md
similarity index 100%
rename from adapter-stdout/src/main/resources/stdout.md
rename to nb-adapters/adapter-stdout/src/main/resources/stdout.md
diff --git a/adapter-stdout/src/test/java/io/nosqlbench/adapter/stdout/TemplateFormatTest.java b/nb-adapters/adapter-stdout/src/test/java/io/nosqlbench/adapter/stdout/TemplateFormatTest.java
similarity index 100%
rename from adapter-stdout/src/test/java/io/nosqlbench/adapter/stdout/TemplateFormatTest.java
rename to nb-adapters/adapter-stdout/src/test/java/io/nosqlbench/adapter/stdout/TemplateFormatTest.java
diff --git a/adapter-tcp/pom.xml b/nb-adapters/adapter-tcp/pom.xml
similarity index 94%
rename from adapter-tcp/pom.xml
rename to nb-adapters/adapter-tcp/pom.xml
index 475b6b2f3a..79edce1a59 100644
--- a/adapter-tcp/pom.xml
+++ b/nb-adapters/adapter-tcp/pom.xml
@@ -24,7 +24,7 @@
mvn-defaults
io.nosqlbench
${revision}
- ../mvn-defaults
+ ../../mvn-defaults
${project.artifactId}
@@ -39,7 +39,7 @@
io.nosqlbench
- engine-core
+ nb-engine-core
${revision}
diff --git a/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpclient/TcpClientAdapterSpace.java b/nb-adapters/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpclient/TcpClientAdapterSpace.java
similarity index 100%
rename from adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpclient/TcpClientAdapterSpace.java
rename to nb-adapters/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpclient/TcpClientAdapterSpace.java
diff --git a/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpclient/TcpClientDriverAdapter.java b/nb-adapters/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpclient/TcpClientDriverAdapter.java
similarity index 100%
rename from adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpclient/TcpClientDriverAdapter.java
rename to nb-adapters/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpclient/TcpClientDriverAdapter.java
diff --git a/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpclient/TcpClientDriverAdapterLoader.java b/nb-adapters/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpclient/TcpClientDriverAdapterLoader.java
similarity index 100%
rename from adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpclient/TcpClientDriverAdapterLoader.java
rename to nb-adapters/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpclient/TcpClientDriverAdapterLoader.java
diff --git a/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpclient/TcpClientOp.java b/nb-adapters/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpclient/TcpClientOp.java
similarity index 100%
rename from adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpclient/TcpClientOp.java
rename to nb-adapters/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpclient/TcpClientOp.java
diff --git a/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpclient/TcpClientOpDispenser.java b/nb-adapters/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpclient/TcpClientOpDispenser.java
similarity index 100%
rename from adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpclient/TcpClientOpDispenser.java
rename to nb-adapters/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpclient/TcpClientOpDispenser.java
diff --git a/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpclient/TcpClientOpMapper.java b/nb-adapters/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpclient/TcpClientOpMapper.java
similarity index 100%
rename from adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpclient/TcpClientOpMapper.java
rename to nb-adapters/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpclient/TcpClientOpMapper.java
diff --git a/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpserver/TcpServerAdapterSpace.java b/nb-adapters/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpserver/TcpServerAdapterSpace.java
similarity index 100%
rename from adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpserver/TcpServerAdapterSpace.java
rename to nb-adapters/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpserver/TcpServerAdapterSpace.java
diff --git a/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpserver/TcpServerDriverAdapter.java b/nb-adapters/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpserver/TcpServerDriverAdapter.java
similarity index 100%
rename from adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpserver/TcpServerDriverAdapter.java
rename to nb-adapters/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpserver/TcpServerDriverAdapter.java
diff --git a/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpserver/TcpServerDriverAdapterLoader.java b/nb-adapters/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpserver/TcpServerDriverAdapterLoader.java
similarity index 100%
rename from adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpserver/TcpServerDriverAdapterLoader.java
rename to nb-adapters/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpserver/TcpServerDriverAdapterLoader.java
diff --git a/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpserver/TcpServerOp.java b/nb-adapters/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpserver/TcpServerOp.java
similarity index 100%
rename from adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpserver/TcpServerOp.java
rename to nb-adapters/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpserver/TcpServerOp.java
diff --git a/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpserver/TcpServerOpDispenser.java b/nb-adapters/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpserver/TcpServerOpDispenser.java
similarity index 100%
rename from adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpserver/TcpServerOpDispenser.java
rename to nb-adapters/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpserver/TcpServerOpDispenser.java
diff --git a/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpserver/TcpServerOpMapper.java b/nb-adapters/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpserver/TcpServerOpMapper.java
similarity index 100%
rename from adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpserver/TcpServerOpMapper.java
rename to nb-adapters/adapter-tcp/src/main/java/io/nosqlbench/adapter/tcpserver/TcpServerOpMapper.java
diff --git a/adapter-tcp/src/main/resources/tcpclient.md b/nb-adapters/adapter-tcp/src/main/resources/tcpclient.md
similarity index 100%
rename from adapter-tcp/src/main/resources/tcpclient.md
rename to nb-adapters/adapter-tcp/src/main/resources/tcpclient.md
diff --git a/adapter-tcp/src/main/resources/tcpserver.md b/nb-adapters/adapter-tcp/src/main/resources/tcpserver.md
similarity index 100%
rename from adapter-tcp/src/main/resources/tcpserver.md
rename to nb-adapters/adapter-tcp/src/main/resources/tcpserver.md
diff --git a/nb-adapters/nb-adapters-included/pom.xml b/nb-adapters/nb-adapters-included/pom.xml
new file mode 100644
index 0000000000..f2dbd346aa
--- /dev/null
+++ b/nb-adapters/nb-adapters-included/pom.xml
@@ -0,0 +1,229 @@
+
+
+
+ 4.0.0
+
+
+ mvn-defaults
+ io.nosqlbench
+ ${revision}
+ ../../mvn-defaults
+
+
+ nb-adapters-included
+ jar
+ ${project.artifactId}
+ https://nosqlbench.io/
+ ${revision}
+
+
+
+
+
+
+ io.nosqlbench
+ adapter-stdout
+ ${revision}
+ false
+
+
+
+ io.nosqlbench
+ adapter-diag
+ ${revision}
+ false
+
+
+
+
+
+
+
+
+
+ src/main/resources
+
+ META_INF/services/**
+ META-INF/functions
+ data/**
+ docs-for-virtdata/**
+ docs/**
+
+
+
+
+
+
+
+
+ adapter-cqld4-include
+
+ true
+
+
+
+ io.nosqlbench
+ adapter-cqld4
+ ${revision}
+
+
+
+
+
+ adapter-milvus-include
+
+ false
+
+
+
+ io.nosqlbench
+ adapter-milvus
+ ${revision}
+
+
+
+
+
+ adapter-http-include
+
+ true
+
+
+
+ io.nosqlbench
+ adapter-http
+ ${revision}
+
+
+
+
+
+ adapter-jdbc-include
+
+ true
+
+
+
+ io.nosqlbench
+ adapter-jdbc
+ ${revision}
+
+
+
+
+
+ adapter-tcp-include
+
+ true
+
+
+
+ io.nosqlbench
+ adapter-tcp
+ ${revision}
+
+
+
+
+
+ adapter-dynamodb-include
+
+ true
+
+
+
+ io.nosqlbench
+ adapter-dynamodb
+ ${revision}
+
+
+
+
+
+ adapter-mongodb-include
+
+ true
+
+
+
+ io.nosqlbench
+ adapter-mongodb
+ ${revision}
+
+
+
+
+
+ adapter-pulsar-include
+
+ true
+
+
+
+ io.nosqlbench
+ adapter-pulsar
+ ${revision}
+
+
+
+
+
+ adapter-s4j-include
+
+ true
+
+
+
+ io.nosqlbench
+ adapter-s4j
+ ${revision}
+
+
+
+
+
+ adapter-kafka-include
+
+ false
+
+
+
+ io.nosqlbench
+ adapter-kafka
+ ${revision}
+
+
+
+
+
+ adapter-amqp-include
+
+ false
+
+
+
+ io.nosqlbench
+ adapter-amqp
+ ${revision}
+
+
+
+
+
+
diff --git a/nb-adapters/pom.xml b/nb-adapters/pom.xml
new file mode 100644
index 0000000000..193ae67b6b
--- /dev/null
+++ b/nb-adapters/pom.xml
@@ -0,0 +1,168 @@
+
+
+
+ 4.0.0
+
+
+ mvn-defaults
+ io.nosqlbench
+ ${revision}
+ ../mvn-defaults
+
+
+ nb-adapters
+ pom
+ ${project.artifactId}
+ https://nosqlbench.io/
+ ${revision}
+
+
+ adapter-diag
+ adapter-stdout
+ nb-adapters-included
+
+
+
+
+
+ src/main/resources
+
+ META_INF/services/**
+ META-INF/functions
+ data/**
+ docs-for-virtdata/**
+ docs/**
+
+
+
+
+
+
+
+ adapter-cqld4-module
+
+ true
+
+
+ adapter-cqld4
+
+
+
+
+ adapter-milvus-module
+
+ false
+
+
+ adapter-milvus
+
+
+
+
+ adapter-http-module
+
+ true
+
+
+ adapter-http
+
+
+
+
+ adapter-jdbc-module
+
+ true
+
+
+ adapter-jdbc
+
+
+
+
+ adapter-tcp-module
+
+ true
+
+
+ adapter-tcp
+
+
+
+
+ adapter-dynamodb-module
+
+ true
+
+
+ adapter-dynamodb
+
+
+
+
+ adapter-mongodb-module
+
+ true
+
+
+ adapter-mongodb
+
+
+
+
+ adapter-pulsar-module
+
+ true
+
+
+ adapter-pulsar
+
+
+
+
+ adapter-s4j-module
+
+ true
+
+
+ adapter-s4j
+
+
+
+
+ adapter-kafka-module
+
+ false
+
+
+ adapter-kafka
+
+
+
+
+ adapter-amqp-module
+
+ false
+
+
+ adapter-amqp
+
+
+
+
+
diff --git a/adapters-api/pom.xml b/nb-apis/adapters-api/pom.xml
similarity index 95%
rename from adapters-api/pom.xml
rename to nb-apis/adapters-api/pom.xml
index 78e353cb78..fadd66ade7 100644
--- a/adapters-api/pom.xml
+++ b/nb-apis/adapters-api/pom.xml
@@ -22,7 +22,7 @@
mvn-defaults
io.nosqlbench
${revision}
- ../mvn-defaults
+ ../../mvn-defaults
adapters-api
@@ -62,14 +62,14 @@
io.nosqlbench
- virtdata-userlibs
+ nb-virtdata-all
${revision}
com.databricks
sjsonnet_2.13
- 0.4.5
+ 0.4.9
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapter/diag/DriverAdapterLoader.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapter/diag/DriverAdapterLoader.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapter/diag/DriverAdapterLoader.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapter/diag/DriverAdapterLoader.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/MultiMapLookup.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/MultiMapLookup.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/MultiMapLookup.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/MultiMapLookup.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/OpsLoader.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/OpsLoader.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/OpsLoader.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/OpsLoader.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/OpsOwner.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/OpsOwner.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/OpsOwner.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/OpsOwner.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/RawOpDef.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/RawOpDef.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/RawOpDef.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/RawOpDef.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/RawOpFields.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/RawOpFields.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/RawOpFields.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/RawOpFields.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/RawOpsBlock.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/RawOpsBlock.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/RawOpsBlock.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/RawOpsBlock.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/RawOpsDoc.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/RawOpsDoc.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/RawOpsDoc.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/RawOpsDoc.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/RawOpsDocList.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/RawOpsDocList.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/RawOpsDocList.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/RawOpsDocList.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/RawOpsLoader.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/RawOpsLoader.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/RawOpsLoader.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/RawOpsLoader.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/RawScenarios.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/RawScenarios.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/RawScenarios.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/RawScenarios.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/RawYamlLoader.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/RawYamlLoader.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/RawYamlLoader.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/RawYamlLoader.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/Tags.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/Tags.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/Tags.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/Tags.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/yaml/OpData.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/yaml/OpData.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/yaml/OpData.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/yaml/OpData.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/yaml/OpDef.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/yaml/OpDef.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/yaml/OpDef.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/yaml/OpDef.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/yaml/OpTemplate.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/yaml/OpTemplate.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/yaml/OpTemplate.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/yaml/OpTemplate.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/yaml/OpTemplateFormat.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/yaml/OpTemplateFormat.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/yaml/OpTemplateFormat.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/yaml/OpTemplateFormat.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/yaml/OpsBlock.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/yaml/OpsBlock.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/yaml/OpsBlock.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/yaml/OpsBlock.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/yaml/OpsDoc.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/yaml/OpsDoc.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/yaml/OpsDoc.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/yaml/OpsDoc.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/yaml/OpsDocList.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/yaml/OpsDocList.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/yaml/OpsDocList.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/yaml/OpsDocList.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/yaml/Scenarios.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/yaml/Scenarios.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/yaml/Scenarios.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/yaml/Scenarios.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/BaseOpDispenser.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/BaseOpDispenser.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/BaseOpDispenser.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/BaseOpDispenser.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/OpDispenser.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/OpDispenser.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/OpDispenser.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/OpDispenser.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/OpMapper.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/OpMapper.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/OpMapper.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/OpMapper.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/OpResultTracker.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/OpResultTracker.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/OpResultTracker.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/OpResultTracker.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/StandardCycleOp.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/StandardCycleOp.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/StandardCycleOp.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/StandardCycleOp.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/docs/BundledDriverAdapterDocs.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/docs/BundledDriverAdapterDocs.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/docs/BundledDriverAdapterDocs.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/docs/BundledDriverAdapterDocs.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/BaseDriverAdapter.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/BaseDriverAdapter.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/BaseDriverAdapter.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/BaseDriverAdapter.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/DriverAdapter.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/DriverAdapter.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/DriverAdapter.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/DriverAdapter.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/DriverSpaceCache.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/DriverSpaceCache.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/DriverSpaceCache.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/DriverSpaceCache.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/ResultProcessor.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/ResultProcessor.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/ResultProcessor.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/ResultProcessor.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/decorators/SyntheticOpTemplateProvider.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/decorators/SyntheticOpTemplateProvider.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/decorators/SyntheticOpTemplateProvider.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/decorators/SyntheticOpTemplateProvider.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/fieldmappers/FieldDestructuringMapper.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/fieldmappers/FieldDestructuringMapper.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/fieldmappers/FieldDestructuringMapper.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/fieldmappers/FieldDestructuringMapper.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/flowtypes/ChainingOp.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/flowtypes/ChainingOp.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/flowtypes/ChainingOp.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/flowtypes/ChainingOp.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/flowtypes/CycleOp.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/flowtypes/CycleOp.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/flowtypes/CycleOp.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/flowtypes/CycleOp.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/flowtypes/Op.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/flowtypes/Op.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/flowtypes/Op.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/flowtypes/Op.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/flowtypes/OpGenerator.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/flowtypes/OpGenerator.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/flowtypes/OpGenerator.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/flowtypes/OpGenerator.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/flowtypes/OpResultSize.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/flowtypes/OpResultSize.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/flowtypes/OpResultSize.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/flowtypes/OpResultSize.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/flowtypes/RunnableOp.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/flowtypes/RunnableOp.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/flowtypes/RunnableOp.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/flowtypes/RunnableOp.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/flowtypes/RunnableSource.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/flowtypes/RunnableSource.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/flowtypes/RunnableSource.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/flowtypes/RunnableSource.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/flowtypes/VariableCapture.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/flowtypes/VariableCapture.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/flowtypes/VariableCapture.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/flowtypes/VariableCapture.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/opwrappers/DryRunOp.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/opwrappers/DryRunOp.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/opwrappers/DryRunOp.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/opwrappers/DryRunOp.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/opwrappers/DryRunOpDispenserWrapper.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/opwrappers/DryRunOpDispenserWrapper.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/opwrappers/DryRunOpDispenserWrapper.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/opwrappers/DryRunOpDispenserWrapper.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/opwrappers/EmitterOp.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/opwrappers/EmitterOp.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/opwrappers/EmitterOp.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/opwrappers/EmitterOp.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/opwrappers/EmitterOpDispenserWrapper.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/opwrappers/EmitterOpDispenserWrapper.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/opwrappers/EmitterOpDispenserWrapper.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/opwrappers/EmitterOpDispenserWrapper.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/opwrappers/PollingOp.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/opwrappers/PollingOp.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/opwrappers/PollingOp.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/activityimpl/uniform/opwrappers/PollingOp.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/CompoundCycleFunction.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/CompoundCycleFunction.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/CompoundCycleFunction.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/CompoundCycleFunction.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/CycleFunction.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/CycleFunction.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/CycleFunction.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/CycleFunction.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/CycleFunctions.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/CycleFunctions.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/CycleFunctions.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/CycleFunctions.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/ExpressionDetails.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/ExpressionDetails.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/ExpressionDetails.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/ExpressionDetails.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/GroovyBooleanCycleFunction.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/GroovyBooleanCycleFunction.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/GroovyBooleanCycleFunction.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/GroovyBooleanCycleFunction.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/GroovyCycleFunction.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/GroovyCycleFunction.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/GroovyCycleFunction.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/GroovyCycleFunction.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/GroovyObjectEqualityFunction.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/GroovyObjectEqualityFunction.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/GroovyObjectEqualityFunction.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/GroovyObjectEqualityFunction.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/ResultMismatchError.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/ResultMismatchError.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/ResultMismatchError.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/ResultMismatchError.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/ResultVerificationError.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/ResultVerificationError.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/ResultVerificationError.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/ResultVerificationError.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/VariableInjectable.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/VariableInjectable.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/VariableInjectable.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/evalctx/VariableInjectable.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/metrics/EndToEndMetricsAdapterUtil.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/metrics/EndToEndMetricsAdapterUtil.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/metrics/EndToEndMetricsAdapterUtil.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/metrics/EndToEndMetricsAdapterUtil.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/metrics/MessageSequenceNumberSendingHandler.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/metrics/MessageSequenceNumberSendingHandler.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/metrics/MessageSequenceNumberSendingHandler.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/metrics/MessageSequenceNumberSendingHandler.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/metrics/ReceivedMessageSequenceTracker.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/metrics/ReceivedMessageSequenceTracker.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/metrics/ReceivedMessageSequenceTracker.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/metrics/ReceivedMessageSequenceTracker.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/metrics/ThreadLocalNamedTimers.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/metrics/ThreadLocalNamedTimers.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/metrics/ThreadLocalNamedTimers.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/metrics/ThreadLocalNamedTimers.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/scheduling/TimeoutPredicate.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/scheduling/TimeoutPredicate.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/scheduling/TimeoutPredicate.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/scheduling/TimeoutPredicate.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/specifications/SpecDocsManifest.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/specifications/SpecDocsManifest.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/specifications/SpecDocsManifest.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/specifications/SpecDocsManifest.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/templating/DriverAdapterDecorators.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/templating/DriverAdapterDecorators.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/templating/DriverAdapterDecorators.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/templating/DriverAdapterDecorators.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/templating/EnumSetter.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/templating/EnumSetter.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/templating/EnumSetter.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/templating/EnumSetter.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/templating/ParsedOp.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/templating/ParsedOp.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/templating/ParsedOp.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/templating/ParsedOp.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/templating/StrInterpolator.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/templating/StrInterpolator.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/templating/StrInterpolator.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/templating/StrInterpolator.java
diff --git a/adapters-api/src/main/java/io/nosqlbench/adapters/api/util/AdaptersApiVersionInfo.java b/nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/util/AdaptersApiVersionInfo.java
similarity index 100%
rename from adapters-api/src/main/java/io/nosqlbench/adapters/api/util/AdaptersApiVersionInfo.java
rename to nb-apis/adapters-api/src/main/java/io/nosqlbench/adapters/api/util/AdaptersApiVersionInfo.java
diff --git a/adapters-api/src/main/resources/version.properties b/nb-apis/adapters-api/src/main/resources/version.properties
similarity index 100%
rename from adapters-api/src/main/resources/version.properties
rename to nb-apis/adapters-api/src/main/resources/version.properties
diff --git a/adapters-api/src/main/resources/workload_definition/00_workload_specification.md b/nb-apis/adapters-api/src/main/resources/workload_definition/00_workload_specification.md
similarity index 100%
rename from adapters-api/src/main/resources/workload_definition/00_workload_specification.md
rename to nb-apis/adapters-api/src/main/resources/workload_definition/00_workload_specification.md
diff --git a/adapters-api/src/main/resources/workload_definition/01_spectest_formatting.md b/nb-apis/adapters-api/src/main/resources/workload_definition/01_spectest_formatting.md
similarity index 100%
rename from adapters-api/src/main/resources/workload_definition/01_spectest_formatting.md
rename to nb-apis/adapters-api/src/main/resources/workload_definition/01_spectest_formatting.md
diff --git a/adapters-api/src/main/resources/workload_definition/02_workload_structure.md b/nb-apis/adapters-api/src/main/resources/workload_definition/02_workload_structure.md
similarity index 100%
rename from adapters-api/src/main/resources/workload_definition/02_workload_structure.md
rename to nb-apis/adapters-api/src/main/resources/workload_definition/02_workload_structure.md
diff --git a/adapters-api/src/main/resources/workload_definition/04_op_template_basics.md b/nb-apis/adapters-api/src/main/resources/workload_definition/04_op_template_basics.md
similarity index 100%
rename from adapters-api/src/main/resources/workload_definition/04_op_template_basics.md
rename to nb-apis/adapters-api/src/main/resources/workload_definition/04_op_template_basics.md
diff --git a/adapters-api/src/main/resources/workload_definition/05_op_template_payloads.md b/nb-apis/adapters-api/src/main/resources/workload_definition/05_op_template_payloads.md
similarity index 100%
rename from adapters-api/src/main/resources/workload_definition/05_op_template_payloads.md
rename to nb-apis/adapters-api/src/main/resources/workload_definition/05_op_template_payloads.md
diff --git a/adapters-api/src/main/resources/workload_definition/06_op_template_variations.md b/nb-apis/adapters-api/src/main/resources/workload_definition/06_op_template_variations.md
similarity index 100%
rename from adapters-api/src/main/resources/workload_definition/06_op_template_variations.md
rename to nb-apis/adapters-api/src/main/resources/workload_definition/06_op_template_variations.md
diff --git a/adapters-api/src/main/resources/workload_definition/07_template_variables.md b/nb-apis/adapters-api/src/main/resources/workload_definition/07_template_variables.md
similarity index 100%
rename from adapters-api/src/main/resources/workload_definition/07_template_variables.md
rename to nb-apis/adapters-api/src/main/resources/workload_definition/07_template_variables.md
diff --git a/adapters-api/src/main/resources/workload_definition/08_parsed_op_api.md b/nb-apis/adapters-api/src/main/resources/workload_definition/08_parsed_op_api.md
similarity index 100%
rename from adapters-api/src/main/resources/workload_definition/08_parsed_op_api.md
rename to nb-apis/adapters-api/src/main/resources/workload_definition/08_parsed_op_api.md
diff --git a/adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/MultiMapLookupTest.java b/nb-apis/adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/MultiMapLookupTest.java
similarity index 100%
rename from adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/MultiMapLookupTest.java
rename to nb-apis/adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/MultiMapLookupTest.java
diff --git a/adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/OpsLoaderTest.java b/nb-apis/adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/OpsLoaderTest.java
similarity index 100%
rename from adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/OpsLoaderTest.java
rename to nb-apis/adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/OpsLoaderTest.java
diff --git a/adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/BindingEscapingTest.java b/nb-apis/adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/BindingEscapingTest.java
similarity index 100%
rename from adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/BindingEscapingTest.java
rename to nb-apis/adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/BindingEscapingTest.java
diff --git a/adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/OpDefTest.java b/nb-apis/adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/OpDefTest.java
similarity index 100%
rename from adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/OpDefTest.java
rename to nb-apis/adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/OpDefTest.java
diff --git a/adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/OpEscapingTest.java b/nb-apis/adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/OpEscapingTest.java
similarity index 100%
rename from adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/OpEscapingTest.java
rename to nb-apis/adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/OpEscapingTest.java
diff --git a/adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/OpVariationTests.java b/nb-apis/adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/OpVariationTests.java
similarity index 100%
rename from adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/OpVariationTests.java
rename to nb-apis/adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/OpVariationTests.java
diff --git a/adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/RawYamlTemplateLoaderTest.java b/nb-apis/adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/RawYamlTemplateLoaderTest.java
similarity index 100%
rename from adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/RawYamlTemplateLoaderTest.java
rename to nb-apis/adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/rawyaml/RawYamlTemplateLoaderTest.java
diff --git a/adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/specifications/SpecificationDocsManifest.java b/nb-apis/adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/specifications/SpecificationDocsManifest.java
similarity index 100%
rename from adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/specifications/SpecificationDocsManifest.java
rename to nb-apis/adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/specifications/SpecificationDocsManifest.java
diff --git a/adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/specifications/UniformWorkloadSpecificationTest.java b/nb-apis/adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/specifications/UniformWorkloadSpecificationTest.java
similarity index 100%
rename from adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/specifications/UniformWorkloadSpecificationTest.java
rename to nb-apis/adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/specifications/UniformWorkloadSpecificationTest.java
diff --git a/adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/specifications/YamlSpecValidator.java b/nb-apis/adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/specifications/YamlSpecValidator.java
similarity index 100%
rename from adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/specifications/YamlSpecValidator.java
rename to nb-apis/adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/specifications/YamlSpecValidator.java
diff --git a/adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/yaml/OpDetailOverrideTest.java b/nb-apis/adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/yaml/OpDetailOverrideTest.java
similarity index 100%
rename from adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/yaml/OpDetailOverrideTest.java
rename to nb-apis/adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/yaml/OpDetailOverrideTest.java
diff --git a/adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/yaml/OpsDocListTest.java b/nb-apis/adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/yaml/OpsDocListTest.java
similarity index 100%
rename from adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/yaml/OpsDocListTest.java
rename to nb-apis/adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/yaml/OpsDocListTest.java
diff --git a/adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/yaml/ParsedWorkloadTemplateTest.java b/nb-apis/adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/yaml/ParsedWorkloadTemplateTest.java
similarity index 100%
rename from adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/yaml/ParsedWorkloadTemplateTest.java
rename to nb-apis/adapters-api/src/test/java/io/nosqlbench/adapters/api/activityconfig/yaml/ParsedWorkloadTemplateTest.java
diff --git a/adapters-api/src/test/java/io/nosqlbench/adapters/api/evalcontext/CompoundCycleFunctionTest.java b/nb-apis/adapters-api/src/test/java/io/nosqlbench/adapters/api/evalcontext/CompoundCycleFunctionTest.java
similarity index 100%
rename from adapters-api/src/test/java/io/nosqlbench/adapters/api/evalcontext/CompoundCycleFunctionTest.java
rename to nb-apis/adapters-api/src/test/java/io/nosqlbench/adapters/api/evalcontext/CompoundCycleFunctionTest.java
diff --git a/adapters-api/src/test/java/io/nosqlbench/adapters/api/evalcontext/GroovyBooleanCycleFunctionTest.java b/nb-apis/adapters-api/src/test/java/io/nosqlbench/adapters/api/evalcontext/GroovyBooleanCycleFunctionTest.java
similarity index 100%
rename from adapters-api/src/test/java/io/nosqlbench/adapters/api/evalcontext/GroovyBooleanCycleFunctionTest.java
rename to nb-apis/adapters-api/src/test/java/io/nosqlbench/adapters/api/evalcontext/GroovyBooleanCycleFunctionTest.java
diff --git a/adapters-api/src/test/java/io/nosqlbench/adapters/api/metrics/MessageSequenceNumberSendingHandlerTest.java b/nb-apis/adapters-api/src/test/java/io/nosqlbench/adapters/api/metrics/MessageSequenceNumberSendingHandlerTest.java
similarity index 100%
rename from adapters-api/src/test/java/io/nosqlbench/adapters/api/metrics/MessageSequenceNumberSendingHandlerTest.java
rename to nb-apis/adapters-api/src/test/java/io/nosqlbench/adapters/api/metrics/MessageSequenceNumberSendingHandlerTest.java
diff --git a/adapters-api/src/test/java/io/nosqlbench/adapters/api/metrics/ReceivedMessageSequenceTrackerTest.java b/nb-apis/adapters-api/src/test/java/io/nosqlbench/adapters/api/metrics/ReceivedMessageSequenceTrackerTest.java
similarity index 100%
rename from adapters-api/src/test/java/io/nosqlbench/adapters/api/metrics/ReceivedMessageSequenceTrackerTest.java
rename to nb-apis/adapters-api/src/test/java/io/nosqlbench/adapters/api/metrics/ReceivedMessageSequenceTrackerTest.java
diff --git a/adapters-api/src/test/java/io/nosqlbench/adapters/api/scheduling/TimeoutPredicateTest.java b/nb-apis/adapters-api/src/test/java/io/nosqlbench/adapters/api/scheduling/TimeoutPredicateTest.java
similarity index 100%
rename from adapters-api/src/test/java/io/nosqlbench/adapters/api/scheduling/TimeoutPredicateTest.java
rename to nb-apis/adapters-api/src/test/java/io/nosqlbench/adapters/api/scheduling/TimeoutPredicateTest.java
diff --git a/adapters-api/src/test/java/io/nosqlbench/adapters/api/templating/ParsedOpTest.java b/nb-apis/adapters-api/src/test/java/io/nosqlbench/adapters/api/templating/ParsedOpTest.java
similarity index 100%
rename from adapters-api/src/test/java/io/nosqlbench/adapters/api/templating/ParsedOpTest.java
rename to nb-apis/adapters-api/src/test/java/io/nosqlbench/adapters/api/templating/ParsedOpTest.java
diff --git a/adapters-api/src/test/java/io/nosqlbench/adapters/api/templating/StrInterpolatorTest.java b/nb-apis/adapters-api/src/test/java/io/nosqlbench/adapters/api/templating/StrInterpolatorTest.java
similarity index 100%
rename from adapters-api/src/test/java/io/nosqlbench/adapters/api/templating/StrInterpolatorTest.java
rename to nb-apis/adapters-api/src/test/java/io/nosqlbench/adapters/api/templating/StrInterpolatorTest.java
diff --git a/adapters-api/src/test/resources/activities/invalid_prop.yaml b/nb-apis/adapters-api/src/test/resources/activities/invalid_prop.yaml
similarity index 100%
rename from adapters-api/src/test/resources/activities/invalid_prop.yaml
rename to nb-apis/adapters-api/src/test/resources/activities/invalid_prop.yaml
diff --git a/adapters-api/src/test/resources/activities/template_vars.yaml b/nb-apis/adapters-api/src/test/resources/activities/template_vars.yaml
similarity index 100%
rename from adapters-api/src/test/resources/activities/template_vars.yaml
rename to nb-apis/adapters-api/src/test/resources/activities/template_vars.yaml
diff --git a/adapters-api/src/test/resources/testdocs/badyamlfile.yaml b/nb-apis/adapters-api/src/test/resources/testdocs/badyamlfile.yaml
similarity index 100%
rename from adapters-api/src/test/resources/testdocs/badyamlfile.yaml
rename to nb-apis/adapters-api/src/test/resources/testdocs/badyamlfile.yaml
diff --git a/adapters-api/src/test/resources/testdocs/bindings.yaml b/nb-apis/adapters-api/src/test/resources/testdocs/bindings.yaml
similarity index 100%
rename from adapters-api/src/test/resources/testdocs/bindings.yaml
rename to nb-apis/adapters-api/src/test/resources/testdocs/bindings.yaml
diff --git a/adapters-api/src/test/resources/testdocs/docs_blocks_ops.yaml b/nb-apis/adapters-api/src/test/resources/testdocs/docs_blocks_ops.yaml
similarity index 100%
rename from adapters-api/src/test/resources/testdocs/docs_blocks_ops.yaml
rename to nb-apis/adapters-api/src/test/resources/testdocs/docs_blocks_ops.yaml
diff --git a/adapters-api/src/test/resources/testdocs/escaped_ops.yaml b/nb-apis/adapters-api/src/test/resources/testdocs/escaped_ops.yaml
similarity index 100%
rename from adapters-api/src/test/resources/testdocs/escaped_ops.yaml
rename to nb-apis/adapters-api/src/test/resources/testdocs/escaped_ops.yaml
diff --git a/adapters-api/src/test/resources/testdocs/op_details.yaml b/nb-apis/adapters-api/src/test/resources/testdocs/op_details.yaml
similarity index 100%
rename from adapters-api/src/test/resources/testdocs/op_details.yaml
rename to nb-apis/adapters-api/src/test/resources/testdocs/op_details.yaml
diff --git a/adapters-api/src/test/resources/testdocs/op_variants.yaml b/nb-apis/adapters-api/src/test/resources/testdocs/op_variants.yaml
similarity index 100%
rename from adapters-api/src/test/resources/testdocs/op_variants.yaml
rename to nb-apis/adapters-api/src/test/resources/testdocs/op_variants.yaml
diff --git a/adapters-api/src/test/resources/testdocs/rawblock.yaml b/nb-apis/adapters-api/src/test/resources/testdocs/rawblock.yaml
similarity index 100%
rename from adapters-api/src/test/resources/testdocs/rawblock.yaml
rename to nb-apis/adapters-api/src/test/resources/testdocs/rawblock.yaml
diff --git a/nb-api/nb-scripts/link-jar-name.sh b/nb-apis/nb-api/nb-scripts/link-jar-name.sh
similarity index 100%
rename from nb-api/nb-scripts/link-jar-name.sh
rename to nb-apis/nb-api/nb-scripts/link-jar-name.sh
diff --git a/nb-api/pom.xml b/nb-apis/nb-api/pom.xml
similarity index 99%
rename from nb-api/pom.xml
rename to nb-apis/nb-api/pom.xml
index 126b0bcd04..0ff1159c76 100644
--- a/nb-api/pom.xml
+++ b/nb-apis/nb-api/pom.xml
@@ -21,7 +21,7 @@
mvn-defaults
io.nosqlbench
${revision}
- ../mvn-defaults
+ ../../mvn-defaults
nb-api
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/addins/s3/s3urlhandler/S3ClientCache.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/addins/s3/s3urlhandler/S3ClientCache.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/addins/s3/s3urlhandler/S3ClientCache.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/addins/s3/s3urlhandler/S3ClientCache.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/addins/s3/s3urlhandler/S3UrlConnection.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/addins/s3/s3urlhandler/S3UrlConnection.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/addins/s3/s3urlhandler/S3UrlConnection.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/addins/s3/s3urlhandler/S3UrlConnection.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/addins/s3/s3urlhandler/S3UrlFields.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/addins/s3/s3urlhandler/S3UrlFields.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/addins/s3/s3urlhandler/S3UrlFields.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/addins/s3/s3urlhandler/S3UrlFields.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/addins/s3/s3urlhandler/S3UrlStreamHandler.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/addins/s3/s3urlhandler/S3UrlStreamHandler.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/addins/s3/s3urlhandler/S3UrlStreamHandler.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/addins/s3/s3urlhandler/S3UrlStreamHandler.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/addins/s3/s3urlhandler/S3UrlStreamHandlerProvider.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/addins/s3/s3urlhandler/S3UrlStreamHandlerProvider.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/addins/s3/s3urlhandler/S3UrlStreamHandlerProvider.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/addins/s3/s3urlhandler/S3UrlStreamHandlerProvider.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Annotation.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Annotation.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Annotation.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Annotation.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/AnnotationBuilder.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/AnnotationBuilder.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/annotations/AnnotationBuilder.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/AnnotationBuilder.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/AnnotationBuilderFacets.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/AnnotationBuilderFacets.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/annotations/AnnotationBuilderFacets.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/AnnotationBuilderFacets.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Annotator.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Annotator.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Annotator.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Annotator.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Layer.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Layer.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Layer.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Layer.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/MutableAnnotation.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/MutableAnnotation.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/annotations/MutableAnnotation.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/MutableAnnotation.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Temporal.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Temporal.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Temporal.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/Temporal.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/package-info.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/package-info.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/annotations/package-info.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/annotations/package-info.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/apps/BundledApp.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/apps/BundledApp.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/apps/BundledApp.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/apps/BundledApp.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/apps/BundledAppDocs.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/apps/BundledAppDocs.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/apps/BundledAppDocs.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/apps/BundledAppDocs.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBBaseComponent.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBBaseComponent.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBBaseComponent.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBBaseComponent.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBBaseComponentMetrics.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBBaseComponentMetrics.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBBaseComponentMetrics.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBBaseComponentMetrics.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponent.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponent.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponent.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponent.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponentErrorHandler.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponentErrorHandler.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponentErrorHandler.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponentErrorHandler.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponentEvents.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponentEvents.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponentEvents.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponentEvents.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponentExecutionScope.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponentExecutionScope.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponentExecutionScope.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponentExecutionScope.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponentFinder.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponentFinder.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponentFinder.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponentFinder.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponentFormats.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponentFormats.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponentFormats.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponentFormats.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponentLoader.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponentLoader.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponentLoader.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponentLoader.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponentMetrics.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponentMetrics.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponentMetrics.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponentMetrics.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponentProps.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponentProps.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponentProps.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponentProps.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponentServices.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponentServices.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponentServices.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponentServices.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponentTimeline.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponentTimeline.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponentTimeline.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponentTimeline.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponentTraversal.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponentTraversal.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponentTraversal.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBComponentTraversal.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBCreators.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBCreators.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBCreators.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBCreators.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBFinders.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBFinders.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBFinders.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBFinders.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBInvokableState.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBInvokableState.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBInvokableState.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBInvokableState.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBMetricsBuffer.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBMetricsBuffer.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBMetricsBuffer.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBMetricsBuffer.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBNamedElement.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBNamedElement.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBNamedElement.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBNamedElement.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBParentComponentInjection.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBParentComponentInjection.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBParentComponentInjection.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/NBParentComponentInjection.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/PeriodicTaskComponent.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/PeriodicTaskComponent.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/components/core/PeriodicTaskComponent.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/PeriodicTaskComponent.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/UnstartedPeriodicTaskComponent.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/UnstartedPeriodicTaskComponent.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/components/core/UnstartedPeriodicTaskComponent.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/core/UnstartedPeriodicTaskComponent.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/components/decorators/NBProviderSearch.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/decorators/NBProviderSearch.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/components/decorators/NBProviderSearch.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/decorators/NBProviderSearch.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/components/decorators/NBTokenWords.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/decorators/NBTokenWords.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/components/decorators/NBTokenWords.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/decorators/NBTokenWords.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/components/docs/component-eventing.puml b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/docs/component-eventing.puml
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/components/docs/component-eventing.puml
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/docs/component-eventing.puml
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/components/docs/component-idea1.puml b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/docs/component-idea1.puml
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/components/docs/component-idea1.puml
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/docs/component-idea1.puml
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/components/docs/scenario_boundaries.md b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/docs/scenario_boundaries.md
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/components/docs/scenario_boundaries.md
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/docs/scenario_boundaries.md
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/components/events/ComponentOutOfScope.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/events/ComponentOutOfScope.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/components/events/ComponentOutOfScope.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/events/ComponentOutOfScope.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/components/events/DownEvent.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/events/DownEvent.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/components/events/DownEvent.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/events/DownEvent.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/components/events/NBEvent.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/events/NBEvent.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/components/events/NBEvent.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/events/NBEvent.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/components/events/ParamChange.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/events/ParamChange.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/components/events/ParamChange.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/events/ParamChange.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/components/events/SetThreads.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/events/SetThreads.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/components/events/SetThreads.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/events/SetThreads.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/components/events/UpEvent.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/events/UpEvent.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/components/events/UpEvent.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/events/UpEvent.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/components/package-info.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/package-info.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/components/package-info.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/package-info.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/components/status/ComponentPulse.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/status/ComponentPulse.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/components/status/ComponentPulse.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/status/ComponentPulse.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/components/status/HeartbeatRepresenter.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/status/HeartbeatRepresenter.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/components/status/HeartbeatRepresenter.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/status/HeartbeatRepresenter.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/components/status/NBHeartbeatComponent.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/status/NBHeartbeatComponent.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/components/status/NBHeartbeatComponent.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/status/NBHeartbeatComponent.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/components/status/NBStatusComponent.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/status/NBStatusComponent.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/components/status/NBStatusComponent.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/status/NBStatusComponent.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/components/status/Status.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/status/Status.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/components/status/Status.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/components/status/Status.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/LabeledScenarioContext.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/LabeledScenarioContext.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/config/LabeledScenarioContext.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/LabeledScenarioContext.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/fieldreaders/DynamicFieldReader.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/fieldreaders/DynamicFieldReader.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/config/fieldreaders/DynamicFieldReader.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/fieldreaders/DynamicFieldReader.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/fieldreaders/EnvironmentReader.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/fieldreaders/EnvironmentReader.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/config/fieldreaders/EnvironmentReader.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/fieldreaders/EnvironmentReader.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/fieldreaders/StaticFieldReader.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/fieldreaders/StaticFieldReader.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/config/fieldreaders/StaticFieldReader.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/fieldreaders/StaticFieldReader.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/fieldreaders/package-info.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/fieldreaders/package-info.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/config/fieldreaders/package-info.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/fieldreaders/package-info.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/params/ConfigSource.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/params/ConfigSource.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/config/params/ConfigSource.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/params/ConfigSource.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/params/DataSources.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/params/DataSources.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/config/params/DataSources.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/params/DataSources.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/params/Element.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/params/Element.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/config/params/Element.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/params/Element.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/params/ElementData.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/params/ElementData.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/config/params/ElementData.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/params/ElementData.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/params/ElementImpl.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/params/ElementImpl.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/config/params/ElementImpl.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/params/ElementImpl.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/params/IterableNamedParams.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/params/IterableNamedParams.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/config/params/IterableNamedParams.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/params/IterableNamedParams.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/params/JsonBackedConfigElement.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/params/JsonBackedConfigElement.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/config/params/JsonBackedConfigElement.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/params/JsonBackedConfigElement.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/params/JsonConfigSource.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/params/JsonConfigSource.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/config/params/JsonConfigSource.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/params/JsonConfigSource.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/params/ListBackedConfigSource.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/params/ListBackedConfigSource.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/config/params/ListBackedConfigSource.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/params/ListBackedConfigSource.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/params/MapBackedConfigSource.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/params/MapBackedConfigSource.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/config/params/MapBackedConfigSource.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/params/MapBackedConfigSource.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/params/MapBackedElement.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/params/MapBackedElement.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/config/params/MapBackedElement.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/params/MapBackedElement.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/params/NBParams.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/params/NBParams.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/config/params/NBParams.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/params/NBParams.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/params/ParamsParser.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/params/ParamsParser.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/config/params/ParamsParser.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/params/ParamsParser.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/params/ParamsParserSource.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/params/ParamsParserSource.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/config/params/ParamsParserSource.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/params/ParamsParserSource.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/ConfigData.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/ConfigData.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/ConfigData.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/ConfigData.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/ConfigLoader.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/ConfigLoader.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/ConfigLoader.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/ConfigLoader.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/ConfigModel.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/ConfigModel.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/ConfigModel.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/ConfigModel.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/ConfigSuggestions.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/ConfigSuggestions.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/ConfigSuggestions.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/ConfigSuggestions.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBCanConfigure.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBCanConfigure.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBCanConfigure.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBCanConfigure.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBCanReconfigure.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBCanReconfigure.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBCanReconfigure.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBCanReconfigure.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBConfigError.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBConfigError.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBConfigError.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBConfigError.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBConfigModel.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBConfigModel.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBConfigModel.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBConfigModel.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBConfigModelExpander.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBConfigModelExpander.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBConfigModelExpander.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBConfigModelExpander.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBConfigModelProvider.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBConfigModelProvider.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBConfigModelProvider.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBConfigModelProvider.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBConfigReadable.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBConfigReadable.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBConfigReadable.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBConfigReadable.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBConfigSplitter.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBConfigSplitter.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBConfigSplitter.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBConfigSplitter.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBConfigurable.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBConfigurable.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBConfigurable.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBConfigurable.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBConfiguration.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBConfiguration.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBConfiguration.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBConfiguration.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBMapConfigurable.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBMapConfigurable.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBMapConfigurable.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBMapConfigurable.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBReconfigModelProvider.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBReconfigModelProvider.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBReconfigModelProvider.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBReconfigModelProvider.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBReconfigurable.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBReconfigurable.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBReconfigurable.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBReconfigurable.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBTypeConverter.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBTypeConverter.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBTypeConverter.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBTypeConverter.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBTypeConverters.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBTypeConverters.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBTypeConverters.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBTypeConverters.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBTypeSafeConversions.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBTypeSafeConversions.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBTypeSafeConversions.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/NBTypeSafeConversions.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/Param.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/Param.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/Param.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/Param.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/TestComponent.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/TestComponent.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/TestComponent.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/config/standard/TestComponent.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/conversions/ConverterUtils.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/conversions/ConverterUtils.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/conversions/ConverterUtils.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/conversions/ConverterUtils.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/csvoutput/CsvOutputPluginWriter.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/csvoutput/CsvOutputPluginWriter.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/csvoutput/CsvOutputPluginWriter.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/csvoutput/CsvOutputPluginWriter.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/docsapi/BundledMarkdownLoader.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/docsapi/BundledMarkdownLoader.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/docsapi/BundledMarkdownLoader.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/docsapi/BundledMarkdownLoader.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/docsapi/BundledMarkdownManifest.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/docsapi/BundledMarkdownManifest.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/docsapi/BundledMarkdownManifest.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/docsapi/BundledMarkdownManifest.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/docsapi/Docs.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/docsapi/Docs.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/docsapi/Docs.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/docsapi/Docs.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/docsapi/DocsBinder.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/docsapi/DocsBinder.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/docsapi/DocsBinder.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/docsapi/DocsBinder.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/docsapi/DocsNameSpace.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/docsapi/DocsNameSpace.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/docsapi/DocsNameSpace.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/docsapi/DocsNameSpace.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/docsapi/DocsNameSpaceImpl.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/docsapi/DocsNameSpaceImpl.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/docsapi/DocsNameSpaceImpl.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/docsapi/DocsNameSpaceImpl.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/activityapi/core/MetricRegistryService.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/activityapi/core/MetricRegistryService.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/activityapi/core/MetricRegistryService.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/activityapi/core/MetricRegistryService.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/activityimpl/ActivityDef.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/activityimpl/ActivityDef.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/activityimpl/ActivityDef.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/activityimpl/ActivityDef.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/activityimpl/CyclesSpec.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/activityimpl/CyclesSpec.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/activityimpl/CyclesSpec.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/activityimpl/CyclesSpec.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/activityimpl/ParameterMap.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/activityimpl/ParameterMap.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/activityimpl/ParameterMap.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/activityimpl/ParameterMap.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/CapabilityHook.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/CapabilityHook.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/CapabilityHook.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/CapabilityHook.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/ClassicHistoListener.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/ClassicHistoListener.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/ClassicHistoListener.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/ClassicHistoListener.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/ClassicTimerListener.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/ClassicTimerListener.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/ClassicTimerListener.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/ClassicTimerListener.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/ConvenientSnapshot.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/ConvenientSnapshot.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/ConvenientSnapshot.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/ConvenientSnapshot.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/DeltaHdrHistogramReservoir.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/DeltaHdrHistogramReservoir.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/DeltaHdrHistogramReservoir.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/DeltaHdrHistogramReservoir.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/DeltaHistogramSnapshot.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/DeltaHistogramSnapshot.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/DeltaHistogramSnapshot.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/DeltaHistogramSnapshot.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/DeltaSnapshotReader.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/DeltaSnapshotReader.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/DeltaSnapshotReader.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/DeltaSnapshotReader.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/DeltaSnapshotter.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/DeltaSnapshotter.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/DeltaSnapshotter.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/DeltaSnapshotter.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/DoubleSummaryGauge.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/DoubleSummaryGauge.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/DoubleSummaryGauge.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/DoubleSummaryGauge.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/HdrDeltaHistogramAttachment.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/HdrDeltaHistogramAttachment.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/HdrDeltaHistogramAttachment.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/HdrDeltaHistogramAttachment.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/HdrDeltaHistogramProvider.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/HdrDeltaHistogramProvider.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/HdrDeltaHistogramProvider.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/HdrDeltaHistogramProvider.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/HistoIntervalLogger.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/HistoIntervalLogger.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/HistoIntervalLogger.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/HistoIntervalLogger.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/HistoLogChartGenerator.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/HistoLogChartGenerator.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/HistoLogChartGenerator.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/HistoLogChartGenerator.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/HistoStatsCSVWriter.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/HistoStatsCSVWriter.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/HistoStatsCSVWriter.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/HistoStatsCSVWriter.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/HistoStatsLogger.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/HistoStatsLogger.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/HistoStatsLogger.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/HistoStatsLogger.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/HistogramAttachment.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/HistogramAttachment.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/HistogramAttachment.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/HistogramAttachment.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/MetricsCloseable.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/MetricsCloseable.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/MetricsCloseable.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/MetricsCloseable.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/MetricsRegistryMount.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/MetricsRegistryMount.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/MetricsRegistryMount.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/MetricsRegistryMount.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/PeriodicRunnable.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/PeriodicRunnable.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/PeriodicRunnable.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/PeriodicRunnable.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/TimerAttachment.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/TimerAttachment.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/TimerAttachment.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/TimerAttachment.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/MetricCategory.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/MetricCategory.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/MetricCategory.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/MetricCategory.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/NBBaseMetric.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/NBBaseMetric.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/NBBaseMetric.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/NBBaseMetric.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/NBFunctionGauge.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/NBFunctionGauge.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/NBFunctionGauge.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/NBFunctionGauge.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/NBLabeledMetric.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/NBLabeledMetric.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/NBLabeledMetric.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/NBLabeledMetric.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/NBMetric.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/NBMetric.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/NBMetric.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/NBMetric.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/NBMetricCounter.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/NBMetricCounter.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/NBMetricCounter.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/NBMetricCounter.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/NBMetricGauge.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/NBMetricGauge.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/NBMetricGauge.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/NBMetricGauge.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/NBMetricGaugeWrapper.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/NBMetricGaugeWrapper.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/NBMetricGaugeWrapper.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/NBMetricGaugeWrapper.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/NBMetricHistogram.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/NBMetricHistogram.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/NBMetricHistogram.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/NBMetricHistogram.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/NBMetricMeter.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/NBMetricMeter.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/NBMetricMeter.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/NBMetricMeter.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/NBMetricTimer.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/NBMetricTimer.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/NBMetricTimer.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/NBMetricTimer.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/NBVariableGauge.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/NBVariableGauge.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/NBVariableGauge.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/instruments/NBVariableGauge.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/reporters/ConsoleReporter.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/reporters/ConsoleReporter.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/reporters/ConsoleReporter.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/reporters/ConsoleReporter.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/reporters/CsvReporter.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/reporters/CsvReporter.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/reporters/CsvReporter.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/reporters/CsvReporter.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/reporters/Log4JMetricsReporter.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/reporters/Log4JMetricsReporter.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/reporters/Log4JMetricsReporter.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/reporters/Log4JMetricsReporter.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/reporters/MetricInstanceFilter.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/reporters/MetricInstanceFilter.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/reporters/MetricInstanceFilter.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/reporters/MetricInstanceFilter.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/reporters/PromExpositionFormat.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/reporters/PromExpositionFormat.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/reporters/PromExpositionFormat.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/reporters/PromExpositionFormat.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/reporters/PromPushKeyFileReader.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/reporters/PromPushKeyFileReader.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/reporters/PromPushKeyFileReader.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/reporters/PromPushKeyFileReader.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/reporters/PromPushReporterComponent.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/reporters/PromPushReporterComponent.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/reporters/PromPushReporterComponent.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/reporters/PromPushReporterComponent.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/wrappers/RelevancyFunction.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/wrappers/RelevancyFunction.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/wrappers/RelevancyFunction.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/wrappers/RelevancyFunction.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/wrappers/RelevancyMeasures.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/wrappers/RelevancyMeasures.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/wrappers/RelevancyMeasures.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/metrics/wrappers/RelevancyMeasures.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/util/SSLKsFactory.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/util/SSLKsFactory.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/util/SSLKsFactory.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/util/SSLKsFactory.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/util/Tagged.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/util/Tagged.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/util/Tagged.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/util/Tagged.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/engine/util/Unit.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/util/Unit.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/engine/util/Unit.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/engine/util/Unit.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/errors/ActivityInitError.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/errors/ActivityInitError.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/errors/ActivityInitError.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/errors/ActivityInitError.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/errors/BasicError.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/errors/BasicError.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/errors/BasicError.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/errors/BasicError.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/errors/MVELCompilationError.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/errors/MVELCompilationError.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/errors/MVELCompilationError.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/errors/MVELCompilationError.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/errors/OnError.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/errors/OnError.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/errors/OnError.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/errors/OnError.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/errors/OpConfigError.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/errors/OpConfigError.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/errors/OpConfigError.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/errors/OpConfigError.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/errors/ResultMismatchError.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/errors/ResultMismatchError.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/errors/ResultMismatchError.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/errors/ResultMismatchError.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/errors/ResultVerificationError.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/errors/ResultVerificationError.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/errors/ResultVerificationError.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/errors/ResultVerificationError.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/extensions/SandboxPlugin.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/extensions/SandboxPlugin.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/extensions/SandboxPlugin.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/extensions/SandboxPlugin.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/extensions/ScriptingExtensionPluginInfo.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/extensions/ScriptingExtensionPluginInfo.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/extensions/ScriptingExtensionPluginInfo.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/extensions/ScriptingExtensionPluginInfo.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/filtering/FilterPhase.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/filtering/FilterPhase.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/filtering/FilterPhase.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/filtering/FilterPhase.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/filtering/FilteringSieve.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/filtering/FilteringSieve.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/filtering/FilteringSieve.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/filtering/FilteringSieve.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/filtering/TristateFilter.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/filtering/TristateFilter.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/filtering/TristateFilter.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/filtering/TristateFilter.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/histo/HdrHistoLog.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/histo/HdrHistoLog.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/histo/HdrHistoLog.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/histo/HdrHistoLog.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/histo/HistoStats.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/histo/HistoStats.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/histo/HistoStats.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/histo/HistoStats.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/http/HttpPlugin.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/http/HttpPlugin.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/http/HttpPlugin.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/http/HttpPlugin.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/labels/MapLabels.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/labels/MapLabels.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/labels/MapLabels.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/labels/MapLabels.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/labels/MutableLabels.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/labels/MutableLabels.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/labels/MutableLabels.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/labels/MutableLabels.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/labels/NBLabelSpec.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/labels/NBLabelSpec.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/labels/NBLabelSpec.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/labels/NBLabelSpec.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/labels/NBLabelUtils.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/labels/NBLabelUtils.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/labels/NBLabelUtils.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/labels/NBLabelUtils.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/labels/NBLabeledElement.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/labels/NBLabeledElement.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/labels/NBLabeledElement.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/labels/NBLabeledElement.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/labels/NBLabels.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/labels/NBLabels.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/labels/NBLabels.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/labels/NBLabels.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/labels/NBLabelsFilter.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/labels/NBLabelsFilter.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/labels/NBLabelsFilter.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/labels/NBLabelsFilter.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/labels/NBLabelsResult.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/labels/NBLabelsResult.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/labels/NBLabelsResult.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/labels/NBLabelsResult.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/labels/NBLabelsValidator.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/labels/NBLabelsValidator.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/labels/NBLabelsValidator.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/labels/NBLabelsValidator.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/labels/labeling_standards.md b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/labels/labeling_standards.md
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/labels/labeling_standards.md
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/labels/labeling_standards.md
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/labels/labels.md b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/labels/labels.md
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/labels/labels.md
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/labels/labels.md
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/lifecycle/Shutdownable.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/lifecycle/Shutdownable.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/lifecycle/Shutdownable.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/lifecycle/Shutdownable.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/loaders/BundledExtensionsLoader.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/loaders/BundledExtensionsLoader.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/loaders/BundledExtensionsLoader.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/loaders/BundledExtensionsLoader.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/logging/NBLogLevel.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/logging/NBLogLevel.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/logging/NBLogLevel.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/logging/NBLogLevel.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/DocsForTestingOnly.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/DocsForTestingOnly.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/markdown/DocsForTestingOnly.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/DocsForTestingOnly.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/FlexParser.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/FlexParser.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/markdown/FlexParser.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/FlexParser.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/aggregator/CompositeMarkdownInfo.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/aggregator/CompositeMarkdownInfo.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/markdown/aggregator/CompositeMarkdownInfo.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/aggregator/CompositeMarkdownInfo.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/aggregator/ListSplitterWhyDoesJavaNotDoThisAlready.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/aggregator/ListSplitterWhyDoesJavaNotDoThisAlready.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/markdown/aggregator/ListSplitterWhyDoesJavaNotDoThisAlready.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/aggregator/ListSplitterWhyDoesJavaNotDoThisAlready.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/aggregator/MDGraph.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/aggregator/MDGraph.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/markdown/aggregator/MDGraph.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/aggregator/MDGraph.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/aggregator/MarkdownDocs.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/aggregator/MarkdownDocs.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/markdown/aggregator/MarkdownDocs.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/aggregator/MarkdownDocs.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/aggregator/MutableFrontMatter.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/aggregator/MutableFrontMatter.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/markdown/aggregator/MutableFrontMatter.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/aggregator/MutableFrontMatter.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/aggregator/MutableMarkdown.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/aggregator/MutableMarkdown.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/markdown/aggregator/MutableMarkdown.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/aggregator/MutableMarkdown.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/aggregator/ParsedFrontMatter.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/aggregator/ParsedFrontMatter.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/markdown/aggregator/ParsedFrontMatter.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/aggregator/ParsedFrontMatter.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/aggregator/ParsedMarkdown.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/aggregator/ParsedMarkdown.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/markdown/aggregator/ParsedMarkdown.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/aggregator/ParsedMarkdown.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/exporter/MarkdownExporter.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/exporter/MarkdownExporter.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/markdown/exporter/MarkdownExporter.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/exporter/MarkdownExporter.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/package-info.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/package-info.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/markdown/package-info.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/package-info.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/providers/DocsRootDirectory.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/providers/DocsRootDirectory.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/markdown/providers/DocsRootDirectory.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/providers/DocsRootDirectory.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/providers/RawMarkdownSource.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/providers/RawMarkdownSource.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/markdown/providers/RawMarkdownSource.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/providers/RawMarkdownSource.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/providers/RawMarkdownSources.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/providers/RawMarkdownSources.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/markdown/providers/RawMarkdownSources.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/providers/RawMarkdownSources.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/types/BasicFrontMatterInfo.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/types/BasicFrontMatterInfo.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/markdown/types/BasicFrontMatterInfo.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/types/BasicFrontMatterInfo.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/types/Diagnostics.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/types/Diagnostics.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/markdown/types/Diagnostics.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/types/Diagnostics.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/types/DocScope.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/types/DocScope.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/markdown/types/DocScope.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/types/DocScope.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/types/FrontMatterInfo.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/types/FrontMatterInfo.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/markdown/types/FrontMatterInfo.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/types/FrontMatterInfo.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/types/HasDiagnostics.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/types/HasDiagnostics.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/markdown/types/HasDiagnostics.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/types/HasDiagnostics.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/types/MarkdownInfo.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/types/MarkdownInfo.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/markdown/types/MarkdownInfo.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/markdown/types/MarkdownInfo.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/metadata/Indexed.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/metadata/Indexed.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/metadata/Indexed.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/metadata/Indexed.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/metadata/ScenarioMetadata.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/metadata/ScenarioMetadata.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/metadata/ScenarioMetadata.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/metadata/ScenarioMetadata.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/metadata/SessionNamer.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/metadata/SessionNamer.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/metadata/SessionNamer.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/metadata/SessionNamer.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/metadata/SystemId.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/metadata/SystemId.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/metadata/SystemId.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/metadata/SystemId.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/nbio/Content.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/nbio/Content.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/nbio/Content.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/nbio/Content.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/nbio/ContentResolver.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/nbio/ContentResolver.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/nbio/ContentResolver.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/nbio/ContentResolver.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/nbio/FileAccess.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/nbio/FileAccess.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/nbio/FileAccess.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/nbio/FileAccess.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/nbio/NBIO.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/nbio/NBIO.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/nbio/NBIO.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/nbio/NBIO.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/nbio/NBIORelativizer.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/nbio/NBIORelativizer.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/nbio/NBIORelativizer.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/nbio/NBIORelativizer.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/nbio/NBIOWalker.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/nbio/NBIOWalker.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/nbio/NBIOWalker.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/nbio/NBIOWalker.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/nbio/NBPathsAPI.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/nbio/NBPathsAPI.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/nbio/NBPathsAPI.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/nbio/NBPathsAPI.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/nbio/PathContent.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/nbio/PathContent.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/nbio/PathContent.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/nbio/PathContent.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/nbio/PathFinder.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/nbio/PathFinder.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/nbio/PathFinder.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/nbio/PathFinder.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/nbio/ResolverForClasspath.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/nbio/ResolverForClasspath.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/nbio/ResolverForClasspath.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/nbio/ResolverForClasspath.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/nbio/ResolverForFilesystem.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/nbio/ResolverForFilesystem.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/nbio/ResolverForFilesystem.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/nbio/ResolverForFilesystem.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/nbio/ResolverForURL.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/nbio/ResolverForURL.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/nbio/ResolverForURL.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/nbio/ResolverForURL.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/nbio/URIResolver.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/nbio/URIResolver.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/nbio/URIResolver.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/nbio/URIResolver.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/nbio/URIResolvers.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/nbio/URIResolvers.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/nbio/URIResolvers.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/nbio/URIResolvers.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/nbio/URLContent.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/nbio/URLContent.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/nbio/URLContent.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/nbio/URLContent.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/optimizers/BobyqaOptimizerInstance.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/optimizers/BobyqaOptimizerInstance.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/optimizers/BobyqaOptimizerInstance.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/optimizers/BobyqaOptimizerInstance.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/optimizers/MVLogger.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/optimizers/MVLogger.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/optimizers/MVLogger.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/optimizers/MVLogger.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/optimizers/MVParams.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/optimizers/MVParams.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/optimizers/MVParams.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/optimizers/MVParams.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/optimizers/MVResult.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/optimizers/MVResult.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/optimizers/MVResult.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/optimizers/MVResult.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/optimizers/PolyglotMultivariateObjectScript.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/optimizers/PolyglotMultivariateObjectScript.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/optimizers/PolyglotMultivariateObjectScript.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/optimizers/PolyglotMultivariateObjectScript.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/s3uploader/S3Uploader.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/s3uploader/S3Uploader.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/s3uploader/S3Uploader.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/s3uploader/S3Uploader.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/shutdown/NBShutdownHook.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/shutdown/NBShutdownHook.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/shutdown/NBShutdownHook.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/shutdown/NBShutdownHook.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/shutdown/ShutdownRunnableFunction.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/shutdown/ShutdownRunnableFunction.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/shutdown/ShutdownRunnableFunction.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/shutdown/ShutdownRunnableFunction.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/spi/SimpleServiceLoader.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/spi/SimpleServiceLoader.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/spi/SimpleServiceLoader.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/spi/SimpleServiceLoader.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/system/NBEnvironment.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/system/NBEnvironment.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/system/NBEnvironment.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/system/NBEnvironment.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/system/NBStatePath.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/system/NBStatePath.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/system/NBStatePath.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/system/NBStatePath.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/tagging/TagFilter.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/tagging/TagFilter.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/tagging/TagFilter.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/tagging/TagFilter.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/testutils/Bounds.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/testutils/Bounds.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/testutils/Bounds.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/testutils/Bounds.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/testutils/Perf.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/testutils/Perf.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/testutils/Perf.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/testutils/Perf.java
diff --git a/nb-api/src/main/java/io/nosqlbench/nb/api/testutils/Result.java b/nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/testutils/Result.java
similarity index 100%
rename from nb-api/src/main/java/io/nosqlbench/nb/api/testutils/Result.java
rename to nb-apis/nb-api/src/main/java/io/nosqlbench/nb/api/testutils/Result.java
diff --git a/nb-api/src/main/log4j2.xml b/nb-apis/nb-api/src/main/log4j2.xml
similarity index 100%
rename from nb-api/src/main/log4j2.xml
rename to nb-apis/nb-api/src/main/log4j2.xml
diff --git a/docsys/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/nb-apis/nb-api/src/main/resources/META-INF/services/javax.annotation.processing.Processor
similarity index 100%
rename from docsys/src/main/resources/META-INF/services/javax.annotation.processing.Processor
rename to nb-apis/nb-api/src/main/resources/META-INF/services/javax.annotation.processing.Processor
diff --git a/nb-api/src/main/resources/docs-for-testing-logical/srcmain-topics-a/srcmain-entry1-1.md b/nb-apis/nb-api/src/main/resources/docs-for-testing-logical/srcmain-topics-a/srcmain-entry1-1.md
similarity index 100%
rename from nb-api/src/main/resources/docs-for-testing-logical/srcmain-topics-a/srcmain-entry1-1.md
rename to nb-apis/nb-api/src/main/resources/docs-for-testing-logical/srcmain-topics-a/srcmain-entry1-1.md
diff --git a/nb-api/src/main/resources/docs-for-testing-logical/srcmain-topics-b/srcmain-topic2-1/srcmain-entry-2-1-L.md b/nb-apis/nb-api/src/main/resources/docs-for-testing-logical/srcmain-topics-b/srcmain-topic2-1/srcmain-entry-2-1-L.md
similarity index 100%
rename from nb-api/src/main/resources/docs-for-testing-logical/srcmain-topics-b/srcmain-topic2-1/srcmain-entry-2-1-L.md
rename to nb-apis/nb-api/src/main/resources/docs-for-testing-logical/srcmain-topics-b/srcmain-topic2-1/srcmain-entry-2-1-L.md
diff --git a/nb-api/src/main/resources/docs-for-testing-raw/srcmain-topics-a/srcmain-entry1-1.md b/nb-apis/nb-api/src/main/resources/docs-for-testing-raw/srcmain-topics-a/srcmain-entry1-1.md
similarity index 100%
rename from nb-api/src/main/resources/docs-for-testing-raw/srcmain-topics-a/srcmain-entry1-1.md
rename to nb-apis/nb-api/src/main/resources/docs-for-testing-raw/srcmain-topics-a/srcmain-entry1-1.md
diff --git a/nb-api/src/main/resources/docs-for-testing-raw/srcmain-topics-b/srcmain-topic2-1/srcmain-entry-2-1-L.md b/nb-apis/nb-api/src/main/resources/docs-for-testing-raw/srcmain-topics-b/srcmain-topic2-1/srcmain-entry-2-1-L.md
similarity index 100%
rename from nb-api/src/main/resources/docs-for-testing-raw/srcmain-topics-b/srcmain-topic2-1/srcmain-entry-2-1-L.md
rename to nb-apis/nb-api/src/main/resources/docs-for-testing-raw/srcmain-topics-b/srcmain-topic2-1/srcmain-entry-2-1-L.md
diff --git a/nb-api/src/test/java/io/nosqlbench/engine/api/activityimpl/motor/ParamsParserTest.java b/nb-apis/nb-api/src/test/java/io/nosqlbench/engine/api/activityimpl/motor/ParamsParserTest.java
similarity index 100%
rename from nb-api/src/test/java/io/nosqlbench/engine/api/activityimpl/motor/ParamsParserTest.java
rename to nb-apis/nb-api/src/test/java/io/nosqlbench/engine/api/activityimpl/motor/ParamsParserTest.java
diff --git a/nb-api/src/test/java/io/nosqlbench/nb/addins/s3/s3urlhandler/S3UrlStreamHandlerTest.java b/nb-apis/nb-api/src/test/java/io/nosqlbench/nb/addins/s3/s3urlhandler/S3UrlStreamHandlerTest.java
similarity index 100%
rename from nb-api/src/test/java/io/nosqlbench/nb/addins/s3/s3urlhandler/S3UrlStreamHandlerTest.java
rename to nb-apis/nb-api/src/test/java/io/nosqlbench/nb/addins/s3/s3urlhandler/S3UrlStreamHandlerTest.java
diff --git a/nb-api/src/test/java/io/nosqlbench/nb/addins/s3/s3utils/S3UploaderDemo.java b/nb-apis/nb-api/src/test/java/io/nosqlbench/nb/addins/s3/s3utils/S3UploaderDemo.java
similarity index 100%
rename from nb-api/src/test/java/io/nosqlbench/nb/addins/s3/s3utils/S3UploaderDemo.java
rename to nb-apis/nb-api/src/test/java/io/nosqlbench/nb/addins/s3/s3utils/S3UploaderDemo.java
diff --git a/nb-api/src/test/java/io/nosqlbench/nb/addins/s3/s3utils/S3UploaderTest.java b/nb-apis/nb-api/src/test/java/io/nosqlbench/nb/addins/s3/s3utils/S3UploaderTest.java
similarity index 100%
rename from nb-api/src/test/java/io/nosqlbench/nb/addins/s3/s3utils/S3UploaderTest.java
rename to nb-apis/nb-api/src/test/java/io/nosqlbench/nb/addins/s3/s3utils/S3UploaderTest.java
diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/NBEnvironmentTest.java b/nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/NBEnvironmentTest.java
similarity index 100%
rename from nb-api/src/test/java/io/nosqlbench/nb/api/NBEnvironmentTest.java
rename to nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/NBEnvironmentTest.java
diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/SystemIdTest.java b/nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/SystemIdTest.java
similarity index 100%
rename from nb-api/src/test/java/io/nosqlbench/nb/api/SystemIdTest.java
rename to nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/SystemIdTest.java
diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/annotations/AnnotationBuilderTest.java b/nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/annotations/AnnotationBuilderTest.java
similarity index 100%
rename from nb-api/src/test/java/io/nosqlbench/nb/api/annotations/AnnotationBuilderTest.java
rename to nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/annotations/AnnotationBuilderTest.java
diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/components/core/AttachedMetricsSummaryReporterTest.java b/nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/components/core/AttachedMetricsSummaryReporterTest.java
similarity index 100%
rename from nb-api/src/test/java/io/nosqlbench/nb/api/components/core/AttachedMetricsSummaryReporterTest.java
rename to nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/components/core/AttachedMetricsSummaryReporterTest.java
diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/components/core/NBBaseComponentMetricsTest.java b/nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/components/core/NBBaseComponentMetricsTest.java
similarity index 100%
rename from nb-api/src/test/java/io/nosqlbench/nb/api/components/core/NBBaseComponentMetricsTest.java
rename to nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/components/core/NBBaseComponentMetricsTest.java
diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/components/core/NBComponentFormatsTest.java b/nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/components/core/NBComponentFormatsTest.java
similarity index 100%
rename from nb-api/src/test/java/io/nosqlbench/nb/api/components/core/NBComponentFormatsTest.java
rename to nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/components/core/NBComponentFormatsTest.java
diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/components/core/NBComponentLifecycleTest.java b/nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/components/core/NBComponentLifecycleTest.java
similarity index 100%
rename from nb-api/src/test/java/io/nosqlbench/nb/api/components/core/NBComponentLifecycleTest.java
rename to nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/components/core/NBComponentLifecycleTest.java
diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/components/core/NBComponentScaffoldingTest.java b/nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/components/core/NBComponentScaffoldingTest.java
similarity index 100%
rename from nb-api/src/test/java/io/nosqlbench/nb/api/components/core/NBComponentScaffoldingTest.java
rename to nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/components/core/NBComponentScaffoldingTest.java
diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/components/core/NBComponentServicesTest.java b/nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/components/core/NBComponentServicesTest.java
similarity index 100%
rename from nb-api/src/test/java/io/nosqlbench/nb/api/components/core/NBComponentServicesTest.java
rename to nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/components/core/NBComponentServicesTest.java
diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/components/core/NBComponentTraversalTest.java b/nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/components/core/NBComponentTraversalTest.java
similarity index 100%
rename from nb-api/src/test/java/io/nosqlbench/nb/api/components/core/NBComponentTraversalTest.java
rename to nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/components/core/NBComponentTraversalTest.java
diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/components/core/NBMetricsQueryTest.java b/nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/components/core/NBMetricsQueryTest.java
similarity index 100%
rename from nb-api/src/test/java/io/nosqlbench/nb/api/components/core/NBMetricsQueryTest.java
rename to nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/components/core/NBMetricsQueryTest.java
diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/config/ConfigLoaderTest.java b/nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/config/ConfigLoaderTest.java
similarity index 100%
rename from nb-api/src/test/java/io/nosqlbench/nb/api/config/ConfigLoaderTest.java
rename to nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/config/ConfigLoaderTest.java
diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/config/ConfigModelTest.java b/nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/config/ConfigModelTest.java
similarity index 100%
rename from nb-api/src/test/java/io/nosqlbench/nb/api/config/ConfigModelTest.java
rename to nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/config/ConfigModelTest.java
diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/config/params/NBParamsTest.java b/nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/config/params/NBParamsTest.java
similarity index 100%
rename from nb-api/src/test/java/io/nosqlbench/nb/api/config/params/NBParamsTest.java
rename to nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/config/params/NBParamsTest.java
diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/config/standard/ConfigElementTest.java b/nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/config/standard/ConfigElementTest.java
similarity index 100%
rename from nb-api/src/test/java/io/nosqlbench/nb/api/config/standard/ConfigElementTest.java
rename to nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/config/standard/ConfigElementTest.java
diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/config/standard/NBConfigSplitterTest.java b/nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/config/standard/NBConfigSplitterTest.java
similarity index 100%
rename from nb-api/src/test/java/io/nosqlbench/nb/api/config/standard/NBConfigSplitterTest.java
rename to nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/config/standard/NBConfigSplitterTest.java
diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/config/standard/NBTypeConverterTest.java b/nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/config/standard/NBTypeConverterTest.java
similarity index 100%
rename from nb-api/src/test/java/io/nosqlbench/nb/api/config/standard/NBTypeConverterTest.java
rename to nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/config/standard/NBTypeConverterTest.java
diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/config/standard/TestComponentViewTest.java b/nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/config/standard/TestComponentViewTest.java
similarity index 100%
rename from nb-api/src/test/java/io/nosqlbench/nb/api/config/standard/TestComponentViewTest.java
rename to nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/config/standard/TestComponentViewTest.java
diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/engine/metrics/reporters/PromExpositionFormatTest.java b/nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/engine/metrics/reporters/PromExpositionFormatTest.java
similarity index 100%
rename from nb-api/src/test/java/io/nosqlbench/nb/api/engine/metrics/reporters/PromExpositionFormatTest.java
rename to nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/engine/metrics/reporters/PromExpositionFormatTest.java
diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/filtering/FilteringSieveTest.java b/nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/filtering/FilteringSieveTest.java
similarity index 100%
rename from nb-api/src/test/java/io/nosqlbench/nb/api/filtering/FilteringSieveTest.java
rename to nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/filtering/FilteringSieveTest.java
diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/labels/MapLabelsTest.java b/nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/labels/MapLabelsTest.java
similarity index 100%
rename from nb-api/src/test/java/io/nosqlbench/nb/api/labels/MapLabelsTest.java
rename to nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/labels/MapLabelsTest.java
diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/labels/NBLabeledElementTest.java b/nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/labels/NBLabeledElementTest.java
similarity index 100%
rename from nb-api/src/test/java/io/nosqlbench/nb/api/labels/NBLabeledElementTest.java
rename to nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/labels/NBLabeledElementTest.java
diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/labels/NBLabelsFilterTest.java b/nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/labels/NBLabelsFilterTest.java
similarity index 100%
rename from nb-api/src/test/java/io/nosqlbench/nb/api/labels/NBLabelsFilterTest.java
rename to nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/labels/NBLabelsFilterTest.java
diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/labels/NBLabelsRenderingTest.java b/nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/labels/NBLabelsRenderingTest.java
similarity index 100%
rename from nb-api/src/test/java/io/nosqlbench/nb/api/labels/NBLabelsRenderingTest.java
rename to nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/labels/NBLabelsRenderingTest.java
diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/labels/NBLabelsValidatorTest.java b/nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/labels/NBLabelsValidatorTest.java
similarity index 100%
rename from nb-api/src/test/java/io/nosqlbench/nb/api/labels/NBLabelsValidatorTest.java
rename to nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/labels/NBLabelsValidatorTest.java
diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/markdown/aggregator/MarkdownDocsTest.java b/nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/markdown/aggregator/MarkdownDocsTest.java
similarity index 100%
rename from nb-api/src/test/java/io/nosqlbench/nb/api/markdown/aggregator/MarkdownDocsTest.java
rename to nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/markdown/aggregator/MarkdownDocsTest.java
diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/nbio/NBIOTest.java b/nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/nbio/NBIOTest.java
similarity index 100%
rename from nb-api/src/test/java/io/nosqlbench/nb/api/nbio/NBIOTest.java
rename to nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/nbio/NBIOTest.java
diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/pathutil/ResolverForURLTest.java b/nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/pathutil/ResolverForURLTest.java
similarity index 100%
rename from nb-api/src/test/java/io/nosqlbench/nb/api/pathutil/ResolverForURLTest.java
rename to nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/pathutil/ResolverForURLTest.java
diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/tagging/TagFilterTest.java b/nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/tagging/TagFilterTest.java
similarity index 100%
rename from nb-api/src/test/java/io/nosqlbench/nb/api/tagging/TagFilterTest.java
rename to nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/tagging/TagFilterTest.java
diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/testutils/BoundsTest.java b/nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/testutils/BoundsTest.java
similarity index 100%
rename from nb-api/src/test/java/io/nosqlbench/nb/api/testutils/BoundsTest.java
rename to nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/testutils/BoundsTest.java
diff --git a/nb-api/src/test/java/io/nosqlbench/nb/api/testutils/PerfTest.java b/nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/testutils/PerfTest.java
similarity index 100%
rename from nb-api/src/test/java/io/nosqlbench/nb/api/testutils/PerfTest.java
rename to nb-apis/nb-api/src/test/java/io/nosqlbench/nb/api/testutils/PerfTest.java
diff --git a/nb-api/src/test/resources/docs-for-testing-only/srctest-topics-a/srctest-entry1-1.md b/nb-apis/nb-api/src/test/resources/docs-for-testing-only/srctest-topics-a/srctest-entry1-1.md
similarity index 100%
rename from nb-api/src/test/resources/docs-for-testing-only/srctest-topics-a/srctest-entry1-1.md
rename to nb-apis/nb-api/src/test/resources/docs-for-testing-only/srctest-topics-a/srctest-entry1-1.md
diff --git a/nb-api/src/test/resources/docs-for-testing-only/srctest-topics-b/intesting-topic2-1/intesting-entry-2-1-L.md b/nb-apis/nb-api/src/test/resources/docs-for-testing-only/srctest-topics-b/intesting-topic2-1/intesting-entry-2-1-L.md
similarity index 100%
rename from nb-api/src/test/resources/docs-for-testing-only/srctest-topics-b/intesting-topic2-1/intesting-entry-2-1-L.md
rename to nb-apis/nb-api/src/test/resources/docs-for-testing-only/srctest-topics-b/intesting-topic2-1/intesting-entry-2-1-L.md
diff --git a/nb-api/src/test/resources/docs-for-testing-only/srctest-topics-b/intesting-topic2-1/md_having_glob.md b/nb-apis/nb-api/src/test/resources/docs-for-testing-only/srctest-topics-b/intesting-topic2-1/md_having_glob.md
similarity index 100%
rename from nb-api/src/test/resources/docs-for-testing-only/srctest-topics-b/intesting-topic2-1/md_having_glob.md
rename to nb-apis/nb-api/src/test/resources/docs-for-testing-only/srctest-topics-b/intesting-topic2-1/md_having_glob.md
diff --git a/nb-api/src/test/resources/docs-for-testing-only/srctest-topics-b/intesting-topic2-1/md_having_globs_and_topics.md b/nb-apis/nb-api/src/test/resources/docs-for-testing-only/srctest-topics-b/intesting-topic2-1/md_having_globs_and_topics.md
similarity index 100%
rename from nb-api/src/test/resources/docs-for-testing-only/srctest-topics-b/intesting-topic2-1/md_having_globs_and_topics.md
rename to nb-apis/nb-api/src/test/resources/docs-for-testing-only/srctest-topics-b/intesting-topic2-1/md_having_globs_and_topics.md
diff --git a/nb-api/src/test/resources/importable-config.json b/nb-apis/nb-api/src/test/resources/importable-config.json
similarity index 100%
rename from nb-api/src/test/resources/importable-config.json
rename to nb-apis/nb-api/src/test/resources/importable-config.json
diff --git a/engine-cli/src/test/resources/log4j2-test.xml b/nb-apis/nb-api/src/test/resources/log4j2-test.xml
similarity index 100%
rename from engine-cli/src/test/resources/log4j2-test.xml
rename to nb-apis/nb-api/src/test/resources/log4j2-test.xml
diff --git a/nb-api/src/test/resources/nesteddir1/alpha-gamma.yaml b/nb-apis/nb-api/src/test/resources/nesteddir1/alpha-gamma.yaml
similarity index 100%
rename from nb-api/src/test/resources/nesteddir1/alpha-gamma.yaml
rename to nb-apis/nb-api/src/test/resources/nesteddir1/alpha-gamma.yaml
diff --git a/nb-api/src/test/resources/nesteddir1/nesteddir2/alpha-gamma.js b/nb-apis/nb-api/src/test/resources/nesteddir1/nesteddir2/alpha-gamma.js
similarity index 100%
rename from nb-api/src/test/resources/nesteddir1/nesteddir2/alpha-gamma.js
rename to nb-apis/nb-api/src/test/resources/nesteddir1/nesteddir2/alpha-gamma.js
diff --git a/nb-api/src/test/resources/nesteddir1/nesteddir2/alpha-gamma.yaml b/nb-apis/nb-api/src/test/resources/nesteddir1/nesteddir2/alpha-gamma.yaml
similarity index 100%
rename from nb-api/src/test/resources/nesteddir1/nesteddir2/alpha-gamma.yaml
rename to nb-apis/nb-api/src/test/resources/nesteddir1/nesteddir2/alpha-gamma.yaml
diff --git a/nb-api/src/test/resources/nesteddir1/nesteddir2/gamma.yaml b/nb-apis/nb-api/src/test/resources/nesteddir1/nesteddir2/gamma.yaml
similarity index 100%
rename from nb-api/src/test/resources/nesteddir1/nesteddir2/gamma.yaml
rename to nb-apis/nb-api/src/test/resources/nesteddir1/nesteddir2/gamma.yaml
diff --git a/nb-api/src/test/resources/nesteddir1/nesteddir2/testcsv12.csv b/nb-apis/nb-api/src/test/resources/nesteddir1/nesteddir2/testcsv12.csv
similarity index 100%
rename from nb-api/src/test/resources/nesteddir1/nesteddir2/testcsv12.csv
rename to nb-apis/nb-api/src/test/resources/nesteddir1/nesteddir2/testcsv12.csv
diff --git a/nb-api/src/test/resources/nesteddir1/nesteddir2/testdata12.txt b/nb-apis/nb-api/src/test/resources/nesteddir1/nesteddir2/testdata12.txt
similarity index 100%
rename from nb-api/src/test/resources/nesteddir1/nesteddir2/testdata12.txt
rename to nb-apis/nb-api/src/test/resources/nesteddir1/nesteddir2/testdata12.txt
diff --git a/nb-api/src/test/resources/nesteddir1/nesteddir2/testworkload1.yml b/nb-apis/nb-api/src/test/resources/nesteddir1/nesteddir2/testworkload1.yml
similarity index 100%
rename from nb-api/src/test/resources/nesteddir1/nesteddir2/testworkload1.yml
rename to nb-apis/nb-api/src/test/resources/nesteddir1/nesteddir2/testworkload1.yml
diff --git a/nb-api/src/test/resources/nesteddir1/nesteddir2/testworkload2.yaml b/nb-apis/nb-api/src/test/resources/nesteddir1/nesteddir2/testworkload2.yaml
similarity index 100%
rename from nb-api/src/test/resources/nesteddir1/nesteddir2/testworkload2.yaml
rename to nb-apis/nb-api/src/test/resources/nesteddir1/nesteddir2/testworkload2.yaml
diff --git a/nb-api/src/test/resources/nesteddir1/testcsv1.csv b/nb-apis/nb-api/src/test/resources/nesteddir1/testcsv1.csv
similarity index 100%
rename from nb-api/src/test/resources/nesteddir1/testcsv1.csv
rename to nb-apis/nb-api/src/test/resources/nesteddir1/testcsv1.csv
diff --git a/nb-api/src/test/resources/testdir1/testcsv3.csv b/nb-apis/nb-api/src/test/resources/testdir1/testcsv3.csv
similarity index 100%
rename from nb-api/src/test/resources/testdir1/testcsv3.csv
rename to nb-apis/nb-api/src/test/resources/testdir1/testcsv3.csv
diff --git a/nb-api/src/test/resources/testsite1/basic1.md b/nb-apis/nb-api/src/test/resources/testsite1/basic1.md
similarity index 100%
rename from nb-api/src/test/resources/testsite1/basic1.md
rename to nb-apis/nb-api/src/test/resources/testsite1/basic1.md
diff --git a/nb-api/src/test/resources/testsite1/basics/section1/topic1.md b/nb-apis/nb-api/src/test/resources/testsite1/basics/section1/topic1.md
similarity index 100%
rename from nb-api/src/test/resources/testsite1/basics/section1/topic1.md
rename to nb-apis/nb-api/src/test/resources/testsite1/basics/section1/topic1.md
diff --git a/nb-api/src/test/resources/testsite1/basics/section2/section2topic1.md b/nb-apis/nb-api/src/test/resources/testsite1/basics/section2/section2topic1.md
similarity index 100%
rename from nb-api/src/test/resources/testsite1/basics/section2/section2topic1.md
rename to nb-apis/nb-api/src/test/resources/testsite1/basics/section2/section2topic1.md
diff --git a/nb-api/src/test/resources/testsite1/favicon.ico b/nb-apis/nb-api/src/test/resources/testsite1/favicon.ico
similarity index 100%
rename from nb-api/src/test/resources/testsite1/favicon.ico
rename to nb-apis/nb-api/src/test/resources/testsite1/favicon.ico
diff --git a/nb-api/src/test/resources/testsite1/simple.html b/nb-apis/nb-api/src/test/resources/testsite1/simple.html
similarity index 100%
rename from nb-api/src/test/resources/testsite1/simple.html
rename to nb-apis/nb-api/src/test/resources/testsite1/simple.html
diff --git a/nb-apis/nb-apis-all/pom.xml b/nb-apis/nb-apis-all/pom.xml
new file mode 100644
index 0000000000..2bb190c5c7
--- /dev/null
+++ b/nb-apis/nb-apis-all/pom.xml
@@ -0,0 +1,46 @@
+
+
+
+ 4.0.0
+
+
+ mvn-defaults
+ io.nosqlbench
+ ${revision}
+ ../../mvn-defaults
+
+
+ nb-apis-all
+ pom
+ ${project.artifactId}
+ https://nosqlbench.io/
+
+
+
+ io.nosqlbench
+ nb-api
+ ${revision}
+
+
+ io.nosqlbench
+ adapters-api
+ ${revision}
+
+
+
diff --git a/nb-apis/pom.xml b/nb-apis/pom.xml
new file mode 100644
index 0000000000..4690b5b659
--- /dev/null
+++ b/nb-apis/pom.xml
@@ -0,0 +1,40 @@
+
+
+
+ 4.0.0
+
+
+ mvn-defaults
+ io.nosqlbench
+ ${revision}
+ ../mvn-defaults
+
+
+ nb-apis
+ pom
+ ${project.artifactId}
+ https://nosqlbench.io/
+
+
+ adapters-api
+ nb-api
+ nb-apis-all
+
+
+
diff --git a/docsys/pom.xml b/nb-docsys/pom.xml
similarity index 97%
rename from docsys/pom.xml
rename to nb-docsys/pom.xml
index 2b597bf7e4..d20760f205 100644
--- a/docsys/pom.xml
+++ b/nb-docsys/pom.xml
@@ -17,10 +17,10 @@
4.0.0
- docsys
+ nb-docsys
jar
- docsys
- http://nosqlbench.io/
+ ${project.artifactId}
+ https://nosqlbench.io/
3.1.5
diff --git a/docsys/src/main/java/io/nosqlbench/docsys/DocsysDefaultAppPath.java b/nb-docsys/src/main/java/io/nosqlbench/docsys/DocsysDefaultAppPath.java
similarity index 100%
rename from docsys/src/main/java/io/nosqlbench/docsys/DocsysDefaultAppPath.java
rename to nb-docsys/src/main/java/io/nosqlbench/docsys/DocsysDefaultAppPath.java
diff --git a/docsys/src/main/java/io/nosqlbench/docsys/api/DocsysDynamicManifest.java b/nb-docsys/src/main/java/io/nosqlbench/docsys/api/DocsysDynamicManifest.java
similarity index 100%
rename from docsys/src/main/java/io/nosqlbench/docsys/api/DocsysDynamicManifest.java
rename to nb-docsys/src/main/java/io/nosqlbench/docsys/api/DocsysDynamicManifest.java
diff --git a/docsys/src/main/java/io/nosqlbench/docsys/api/DocsysStaticManifest.java b/nb-docsys/src/main/java/io/nosqlbench/docsys/api/DocsysStaticManifest.java
similarity index 100%
rename from docsys/src/main/java/io/nosqlbench/docsys/api/DocsysStaticManifest.java
rename to nb-docsys/src/main/java/io/nosqlbench/docsys/api/DocsysStaticManifest.java
diff --git a/docsys/src/main/java/io/nosqlbench/docsys/api/WebServiceObject.java b/nb-docsys/src/main/java/io/nosqlbench/docsys/api/WebServiceObject.java
similarity index 100%
rename from docsys/src/main/java/io/nosqlbench/docsys/api/WebServiceObject.java
rename to nb-docsys/src/main/java/io/nosqlbench/docsys/api/WebServiceObject.java
diff --git a/docsys/src/main/java/io/nosqlbench/docsys/core/DocsysPathLoader.java b/nb-docsys/src/main/java/io/nosqlbench/docsys/core/DocsysPathLoader.java
similarity index 100%
rename from docsys/src/main/java/io/nosqlbench/docsys/core/DocsysPathLoader.java
rename to nb-docsys/src/main/java/io/nosqlbench/docsys/core/DocsysPathLoader.java
diff --git a/docsys/src/main/java/io/nosqlbench/docsys/core/NBWebServer.java b/nb-docsys/src/main/java/io/nosqlbench/docsys/core/NBWebServer.java
similarity index 100%
rename from docsys/src/main/java/io/nosqlbench/docsys/core/NBWebServer.java
rename to nb-docsys/src/main/java/io/nosqlbench/docsys/core/NBWebServer.java
diff --git a/docsys/src/main/java/io/nosqlbench/docsys/core/NBWebServerApp.java b/nb-docsys/src/main/java/io/nosqlbench/docsys/core/NBWebServerApp.java
similarity index 100%
rename from docsys/src/main/java/io/nosqlbench/docsys/core/NBWebServerApp.java
rename to nb-docsys/src/main/java/io/nosqlbench/docsys/core/NBWebServerApp.java
diff --git a/docsys/src/main/java/io/nosqlbench/docsys/core/PathWalker.java b/nb-docsys/src/main/java/io/nosqlbench/docsys/core/PathWalker.java
similarity index 100%
rename from docsys/src/main/java/io/nosqlbench/docsys/core/PathWalker.java
rename to nb-docsys/src/main/java/io/nosqlbench/docsys/core/PathWalker.java
diff --git a/docsys/src/main/java/io/nosqlbench/docsys/handlers/EndpointsHandler.java b/nb-docsys/src/main/java/io/nosqlbench/docsys/handlers/EndpointsHandler.java
similarity index 100%
rename from docsys/src/main/java/io/nosqlbench/docsys/handlers/EndpointsHandler.java
rename to nb-docsys/src/main/java/io/nosqlbench/docsys/handlers/EndpointsHandler.java
diff --git a/docsys/src/main/java/io/nosqlbench/docsys/handlers/FavIconHandler.java b/nb-docsys/src/main/java/io/nosqlbench/docsys/handlers/FavIconHandler.java
similarity index 100%
rename from docsys/src/main/java/io/nosqlbench/docsys/handlers/FavIconHandler.java
rename to nb-docsys/src/main/java/io/nosqlbench/docsys/handlers/FavIconHandler.java
diff --git a/nb-api/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/nb-docsys/src/main/resources/META-INF/services/javax.annotation.processing.Processor
similarity index 100%
rename from nb-api/src/main/resources/META-INF/services/javax.annotation.processing.Processor
rename to nb-docsys/src/main/resources/META-INF/services/javax.annotation.processing.Processor
diff --git a/docsys/src/test/java/io/nosqlbench/docsys/core/TestServlet1.java b/nb-docsys/src/test/java/io/nosqlbench/docsys/core/TestServlet1.java
similarity index 100%
rename from docsys/src/test/java/io/nosqlbench/docsys/core/TestServlet1.java
rename to nb-docsys/src/test/java/io/nosqlbench/docsys/core/TestServlet1.java
diff --git a/nb-engine/nb-engine-all/pom.xml b/nb-engine/nb-engine-all/pom.xml
new file mode 100644
index 0000000000..1d175b2b03
--- /dev/null
+++ b/nb-engine/nb-engine-all/pom.xml
@@ -0,0 +1,100 @@
+
+
+
+ 4.0.0
+
+
+ mvn-defaults
+ io.nosqlbench
+ ${revision}
+ ../../mvn-defaults
+
+
+ nb-engine-all
+ jar
+ ${project.artifactId}
+ https://nosqlbench.io/
+
+
+
+ io.nosqlbench
+ nb-engine-cli
+ ${revision}
+
+
+
+ io.nosqlbench
+ nb-engine-clients
+ ${revision}
+
+
+
+ io.nosqlbench
+ nb-engine-core
+ ${revision}
+
+
+
+ io.nosqlbench
+ nb-engine-extensions
+ ${revision}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ src/main/resources
+
+ META_INF/services/**
+ META-INF/functions
+ data/**
+ docs-for-virtdata/**
+ docs/**
+
+
+
+
+
+
+
diff --git a/engine-cli/bin/eb b/nb-engine/nb-engine-cli/bin/eb
similarity index 100%
rename from engine-cli/bin/eb
rename to nb-engine/nb-engine-cli/bin/eb
diff --git a/engine-cli/bin/run-eb b/nb-engine/nb-engine-cli/bin/run-eb
similarity index 100%
rename from engine-cli/bin/run-eb
rename to nb-engine/nb-engine-cli/bin/run-eb
diff --git a/engine-cli/bin/sanitycheck.js b/nb-engine/nb-engine-cli/bin/sanitycheck.js
similarity index 100%
rename from engine-cli/bin/sanitycheck.js
rename to nb-engine/nb-engine-cli/bin/sanitycheck.js
diff --git a/engine-cli/pom.xml b/nb-engine/nb-engine-cli/pom.xml
similarity index 93%
rename from engine-cli/pom.xml
rename to nb-engine/nb-engine-cli/pom.xml
index eab3874060..c3a5904e56 100644
--- a/engine-cli/pom.xml
+++ b/nb-engine/nb-engine-cli/pom.xml
@@ -21,10 +21,10 @@
mvn-defaults
io.nosqlbench
${revision}
- ../mvn-defaults
+ ../../mvn-defaults
- engine-cli
+ nb-engine-cli
jar
${project.artifactId}
CLI for nosqlbench
@@ -38,7 +38,7 @@
io.nosqlbench
- engine-core
+ nb-engine-core
${revision}
diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java b/nb-engine/nb-engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
similarity index 100%
rename from engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
rename to nb-engine/nb-engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIArgsFile.java b/nb-engine/nb-engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIArgsFile.java
similarity index 100%
rename from engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIArgsFile.java
rename to nb-engine/nb-engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIArgsFile.java
diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java b/nb-engine/nb-engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java
similarity index 100%
rename from engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java
rename to nb-engine/nb-engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIOptions.java
diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIScenarios.java b/nb-engine/nb-engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIScenarios.java
similarity index 100%
rename from engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIScenarios.java
rename to nb-engine/nb-engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIScenarios.java
diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIScripts.java b/nb-engine/nb-engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIScripts.java
similarity index 100%
rename from engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIScripts.java
rename to nb-engine/nb-engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLIScripts.java
diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/VersionInfo.java b/nb-engine/nb-engine-cli/src/main/java/io/nosqlbench/engine/cli/VersionInfo.java
similarity index 100%
rename from engine-cli/src/main/java/io/nosqlbench/engine/cli/VersionInfo.java
rename to nb-engine/nb-engine-cli/src/main/java/io/nosqlbench/engine/cli/VersionInfo.java
diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/atfiles/NBAtFile.java b/nb-engine/nb-engine-cli/src/main/java/io/nosqlbench/engine/cli/atfiles/NBAtFile.java
similarity index 100%
rename from engine-cli/src/main/java/io/nosqlbench/engine/cli/atfiles/NBAtFile.java
rename to nb-engine/nb-engine-cli/src/main/java/io/nosqlbench/engine/cli/atfiles/NBAtFile.java
diff --git a/engine-cli/src/main/java/io/nosqlbench/engine/cli/atfiles/NBAtFileFormats.java b/nb-engine/nb-engine-cli/src/main/java/io/nosqlbench/engine/cli/atfiles/NBAtFileFormats.java
similarity index 100%
rename from engine-cli/src/main/java/io/nosqlbench/engine/cli/atfiles/NBAtFileFormats.java
rename to nb-engine/nb-engine-cli/src/main/java/io/nosqlbench/engine/cli/atfiles/NBAtFileFormats.java
diff --git a/engine-cli/src/main/resources/argsfile.md b/nb-engine/nb-engine-cli/src/main/resources/argsfile.md
similarity index 100%
rename from engine-cli/src/main/resources/argsfile.md
rename to nb-engine/nb-engine-cli/src/main/resources/argsfile.md
diff --git a/engine-cli/src/main/resources/basic.md b/nb-engine/nb-engine-cli/src/main/resources/basic.md
similarity index 100%
rename from engine-cli/src/main/resources/basic.md
rename to nb-engine/nb-engine-cli/src/main/resources/basic.md
diff --git a/engine-cli/src/main/resources/cli-scripting.md b/nb-engine/nb-engine-cli/src/main/resources/cli-scripting.md
similarity index 100%
rename from engine-cli/src/main/resources/cli-scripting.md
rename to nb-engine/nb-engine-cli/src/main/resources/cli-scripting.md
diff --git a/engine-cli/src/main/resources/commandline.md b/nb-engine/nb-engine-cli/src/main/resources/commandline.md
similarity index 100%
rename from engine-cli/src/main/resources/commandline.md
rename to nb-engine/nb-engine-cli/src/main/resources/commandline.md
diff --git a/engine-cli/src/main/resources/docker-metrics.md b/nb-engine/nb-engine-cli/src/main/resources/docker-metrics.md
similarity index 100%
rename from engine-cli/src/main/resources/docker-metrics.md
rename to nb-engine/nb-engine-cli/src/main/resources/docker-metrics.md
diff --git a/engine-cli/src/main/resources/error-handlers.md b/nb-engine/nb-engine-cli/src/main/resources/error-handlers.md
similarity index 100%
rename from engine-cli/src/main/resources/error-handlers.md
rename to nb-engine/nb-engine-cli/src/main/resources/error-handlers.md
diff --git a/engine-cli/src/main/resources/findmax.md b/nb-engine/nb-engine-cli/src/main/resources/findmax.md
similarity index 100%
rename from engine-cli/src/main/resources/findmax.md
rename to nb-engine/nb-engine-cli/src/main/resources/findmax.md
diff --git a/engine-cli/src/main/resources/log4j2.xml b/nb-engine/nb-engine-cli/src/main/resources/log4j2.xml
similarity index 100%
rename from engine-cli/src/main/resources/log4j2.xml
rename to nb-engine/nb-engine-cli/src/main/resources/log4j2.xml
diff --git a/engine-cli/src/main/resources/scripts/auto/fm.js b/nb-engine/nb-engine-cli/src/main/resources/scripts/auto/fm.js
similarity index 100%
rename from engine-cli/src/main/resources/scripts/auto/fm.js
rename to nb-engine/nb-engine-cli/src/main/resources/scripts/auto/fm.js
diff --git a/engine-cli/src/main/resources/statedir.md b/nb-engine/nb-engine-cli/src/main/resources/statedir.md
similarity index 100%
rename from engine-cli/src/main/resources/statedir.md
rename to nb-engine/nb-engine-cli/src/main/resources/statedir.md
diff --git a/engine-cli/src/main/resources/threads.md b/nb-engine/nb-engine-cli/src/main/resources/threads.md
similarity index 100%
rename from engine-cli/src/main/resources/threads.md
rename to nb-engine/nb-engine-cli/src/main/resources/threads.md
diff --git a/engine-cli/src/main/resources/topics.md b/nb-engine/nb-engine-cli/src/main/resources/topics.md
similarity index 100%
rename from engine-cli/src/main/resources/topics.md
rename to nb-engine/nb-engine-cli/src/main/resources/topics.md
diff --git a/engine-cli/src/test/java/io/nosqlbench/engine/cli/BasicScriptBufferTest.java b/nb-engine/nb-engine-cli/src/test/java/io/nosqlbench/engine/cli/BasicScriptBufferTest.java
similarity index 100%
rename from engine-cli/src/test/java/io/nosqlbench/engine/cli/BasicScriptBufferTest.java
rename to nb-engine/nb-engine-cli/src/test/java/io/nosqlbench/engine/cli/BasicScriptBufferTest.java
diff --git a/engine-cli/src/test/java/io/nosqlbench/engine/cli/CmdTest.java b/nb-engine/nb-engine-cli/src/test/java/io/nosqlbench/engine/cli/CmdTest.java
similarity index 100%
rename from engine-cli/src/test/java/io/nosqlbench/engine/cli/CmdTest.java
rename to nb-engine/nb-engine-cli/src/test/java/io/nosqlbench/engine/cli/CmdTest.java
diff --git a/engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIArgsFileTest.java b/nb-engine/nb-engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIArgsFileTest.java
similarity index 100%
rename from engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIArgsFileTest.java
rename to nb-engine/nb-engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIArgsFileTest.java
diff --git a/engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIScenarioPreprocessorTemplateVarTest.java b/nb-engine/nb-engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIScenarioPreprocessorTemplateVarTest.java
similarity index 100%
rename from engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIScenarioPreprocessorTemplateVarTest.java
rename to nb-engine/nb-engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIScenarioPreprocessorTemplateVarTest.java
diff --git a/engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIScenarioPreprocessorTest.java b/nb-engine/nb-engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIScenarioPreprocessorTest.java
similarity index 100%
rename from engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIScenarioPreprocessorTest.java
rename to nb-engine/nb-engine-cli/src/test/java/io/nosqlbench/engine/cli/NBCLIScenarioPreprocessorTest.java
diff --git a/engine-cli/src/test/java/io/nosqlbench/engine/cli/SessionNamerTest.java b/nb-engine/nb-engine-cli/src/test/java/io/nosqlbench/engine/cli/SessionNamerTest.java
similarity index 100%
rename from engine-cli/src/test/java/io/nosqlbench/engine/cli/SessionNamerTest.java
rename to nb-engine/nb-engine-cli/src/test/java/io/nosqlbench/engine/cli/SessionNamerTest.java
diff --git a/engine-cli/src/test/java/io/nosqlbench/engine/cli/TestNBCLIOptions.java b/nb-engine/nb-engine-cli/src/test/java/io/nosqlbench/engine/cli/TestNBCLIOptions.java
similarity index 100%
rename from engine-cli/src/test/java/io/nosqlbench/engine/cli/TestNBCLIOptions.java
rename to nb-engine/nb-engine-cli/src/test/java/io/nosqlbench/engine/cli/TestNBCLIOptions.java
diff --git a/engine-cli/src/test/java/io/nosqlbench/engine/cli/atfiles/NBAtFileTest.java b/nb-engine/nb-engine-cli/src/test/java/io/nosqlbench/engine/cli/atfiles/NBAtFileTest.java
similarity index 100%
rename from engine-cli/src/test/java/io/nosqlbench/engine/cli/atfiles/NBAtFileTest.java
rename to nb-engine/nb-engine-cli/src/test/java/io/nosqlbench/engine/cli/atfiles/NBAtFileTest.java
diff --git a/engine-cli/src/test/resources/activities/scenario_formats_test.yaml b/nb-engine/nb-engine-cli/src/test/resources/activities/scenario_formats_test.yaml
similarity index 100%
rename from engine-cli/src/test/resources/activities/scenario_formats_test.yaml
rename to nb-engine/nb-engine-cli/src/test/resources/activities/scenario_formats_test.yaml
diff --git a/engine-cli/src/test/resources/activities/scenario_test.yaml b/nb-engine/nb-engine-cli/src/test/resources/activities/scenario_test.yaml
similarity index 100%
rename from engine-cli/src/test/resources/activities/scenario_test.yaml
rename to nb-engine/nb-engine-cli/src/test/resources/activities/scenario_test.yaml
diff --git a/engine-cli/src/test/resources/argsfiles/alphagamma.cli b/nb-engine/nb-engine-cli/src/test/resources/argsfiles/alphagamma.cli
similarity index 100%
rename from engine-cli/src/test/resources/argsfiles/alphagamma.cli
rename to nb-engine/nb-engine-cli/src/test/resources/argsfiles/alphagamma.cli
diff --git a/engine-cli/src/test/resources/argsfiles/home_env.cli b/nb-engine/nb-engine-cli/src/test/resources/argsfiles/home_env.cli
similarity index 100%
rename from engine-cli/src/test/resources/argsfiles/home_env.cli
rename to nb-engine/nb-engine-cli/src/test/resources/argsfiles/home_env.cli
diff --git a/engine-cli/src/test/resources/atfiles/global_opts.yaml b/nb-engine/nb-engine-cli/src/test/resources/atfiles/global_opts.yaml
similarity index 100%
rename from engine-cli/src/test/resources/atfiles/global_opts.yaml
rename to nb-engine/nb-engine-cli/src/test/resources/atfiles/global_opts.yaml
diff --git a/engine-cli/src/test/resources/atfiles/mixed_structures.yaml b/nb-engine/nb-engine-cli/src/test/resources/atfiles/mixed_structures.yaml
similarity index 100%
rename from engine-cli/src/test/resources/atfiles/mixed_structures.yaml
rename to nb-engine/nb-engine-cli/src/test/resources/atfiles/mixed_structures.yaml
diff --git a/engine-cli/src/test/resources/atfiles/relativized.yaml b/nb-engine/nb-engine-cli/src/test/resources/atfiles/relativized.yaml
similarity index 100%
rename from engine-cli/src/test/resources/atfiles/relativized.yaml
rename to nb-engine/nb-engine-cli/src/test/resources/atfiles/relativized.yaml
diff --git a/engine-cli/src/test/resources/atfiles/simple_list.yaml b/nb-engine/nb-engine-cli/src/test/resources/atfiles/simple_list.yaml
similarity index 100%
rename from engine-cli/src/test/resources/atfiles/simple_list.yaml
rename to nb-engine/nb-engine-cli/src/test/resources/atfiles/simple_list.yaml
diff --git a/engine-cli/src/test/resources/atfiles/simple_map.yaml b/nb-engine/nb-engine-cli/src/test/resources/atfiles/simple_map.yaml
similarity index 100%
rename from engine-cli/src/test/resources/atfiles/simple_map.yaml
rename to nb-engine/nb-engine-cli/src/test/resources/atfiles/simple_map.yaml
diff --git a/engine-cli/src/test/resources/example-help.md b/nb-engine/nb-engine-cli/src/test/resources/example-help.md
similarity index 100%
rename from engine-cli/src/test/resources/example-help.md
rename to nb-engine/nb-engine-cli/src/test/resources/example-help.md
diff --git a/engine-core/src/test/resources/log4j2-test.xml b/nb-engine/nb-engine-cli/src/test/resources/log4j2-test.xml
similarity index 100%
rename from engine-core/src/test/resources/log4j2-test.xml
rename to nb-engine/nb-engine-cli/src/test/resources/log4j2-test.xml
diff --git a/engine-cli/src/test/resources/scripts/auto/acommand.js b/nb-engine/nb-engine-cli/src/test/resources/scripts/auto/acommand.js
similarity index 100%
rename from engine-cli/src/test/resources/scripts/auto/acommand.js
rename to nb-engine/nb-engine-cli/src/test/resources/scripts/auto/acommand.js
diff --git a/engine-cli/src/test/resources/scripts/script_to_interpolate.js b/nb-engine/nb-engine-cli/src/test/resources/scripts/script_to_interpolate.js
similarity index 100%
rename from engine-cli/src/test/resources/scripts/script_to_interpolate.js
rename to nb-engine/nb-engine-cli/src/test/resources/scripts/script_to_interpolate.js
diff --git a/engine-cli/src/test/resources/scripts/testscripts/printparam.js b/nb-engine/nb-engine-cli/src/test/resources/scripts/testscripts/printparam.js
similarity index 100%
rename from engine-cli/src/test/resources/scripts/testscripts/printparam.js
rename to nb-engine/nb-engine-cli/src/test/resources/scripts/testscripts/printparam.js
diff --git a/engine-cli/src/test/resources/scripts/testscripts/printscript.js b/nb-engine/nb-engine-cli/src/test/resources/scripts/testscripts/printscript.js
similarity index 100%
rename from engine-cli/src/test/resources/scripts/testscripts/printscript.js
rename to nb-engine/nb-engine-cli/src/test/resources/scripts/testscripts/printscript.js
diff --git a/engine-clients/pom.xml b/nb-engine/nb-engine-clients/pom.xml
similarity index 94%
rename from engine-clients/pom.xml
rename to nb-engine/nb-engine-clients/pom.xml
index da424f3d8e..fef22e99c2 100644
--- a/engine-clients/pom.xml
+++ b/nb-engine/nb-engine-clients/pom.xml
@@ -22,10 +22,10 @@
mvn-defaults
io.nosqlbench
${revision}
- ../mvn-defaults
+ ../../mvn-defaults
- engine-clients
+ nb-engine-clients
jar
${project.artifactId}
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/ApiToken.java b/nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/ApiToken.java
similarity index 100%
rename from engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/ApiToken.java
rename to nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/ApiToken.java
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/By.java b/nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/By.java
similarity index 100%
rename from engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/By.java
rename to nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/By.java
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GRangeResult.java b/nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GRangeResult.java
similarity index 100%
rename from engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GRangeResult.java
rename to nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GRangeResult.java
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GStitcher.java b/nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GStitcher.java
similarity index 100%
rename from engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GStitcher.java
rename to nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GStitcher.java
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GTimeUnit.java b/nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GTimeUnit.java
similarity index 100%
rename from engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GTimeUnit.java
rename to nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GTimeUnit.java
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaClient.java b/nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaClient.java
similarity index 100%
rename from engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaClient.java
rename to nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaClient.java
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaClientConfig.java b/nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaClientConfig.java
similarity index 100%
rename from engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaClientConfig.java
rename to nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaClientConfig.java
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaKeyFileReader.java b/nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaKeyFileReader.java
similarity index 100%
rename from engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaKeyFileReader.java
rename to nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaKeyFileReader.java
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaTokenAuthenticator.java b/nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaTokenAuthenticator.java
similarity index 100%
rename from engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaTokenAuthenticator.java
rename to nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/GrafanaTokenAuthenticator.java
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/analyzer/GQueryResult.java b/nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/analyzer/GQueryResult.java
similarity index 100%
rename from engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/analyzer/GQueryResult.java
rename to nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/analyzer/GQueryResult.java
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/analyzer/GrafanaRegionAnalyzer.java b/nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/analyzer/GrafanaRegionAnalyzer.java
similarity index 100%
rename from engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/analyzer/GrafanaRegionAnalyzer.java
rename to nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/analyzer/GrafanaRegionAnalyzer.java
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/analyzer/test.json b/nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/analyzer/test.json
similarity index 100%
rename from engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/analyzer/test.json
rename to nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/analyzer/test.json
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/annotator/GrafanaMetricsAnnotator.java b/nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/annotator/GrafanaMetricsAnnotator.java
similarity index 100%
rename from engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/annotator/GrafanaMetricsAnnotator.java
rename to nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/annotator/GrafanaMetricsAnnotator.java
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/authorizers/RawSocketInjector.java b/nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/authorizers/RawSocketInjector.java
similarity index 100%
rename from engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/authorizers/RawSocketInjector.java
rename to nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/authorizers/RawSocketInjector.java
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/ApiTokenRequest.java b/nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/ApiTokenRequest.java
similarity index 100%
rename from engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/ApiTokenRequest.java
rename to nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/ApiTokenRequest.java
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/CreateSnapshotRequest.java b/nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/CreateSnapshotRequest.java
similarity index 100%
rename from engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/CreateSnapshotRequest.java
rename to nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/CreateSnapshotRequest.java
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GAnnotation.java b/nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GAnnotation.java
similarity index 100%
rename from engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GAnnotation.java
rename to nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GAnnotation.java
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GDashboard.java b/nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GDashboard.java
similarity index 100%
rename from engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GDashboard.java
rename to nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GDashboard.java
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GDashboardInfo.java b/nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GDashboardInfo.java
similarity index 100%
rename from engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GDashboardInfo.java
rename to nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GDashboardInfo.java
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GDashboardResponse.java b/nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GDashboardResponse.java
similarity index 100%
rename from engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GDashboardResponse.java
rename to nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GDashboardResponse.java
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GDataSource.java b/nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GDataSource.java
similarity index 100%
rename from engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GDataSource.java
rename to nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GDataSource.java
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GMeta.java b/nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GMeta.java
similarity index 100%
rename from engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GMeta.java
rename to nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GMeta.java
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GPanelDef.java b/nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GPanelDef.java
similarity index 100%
rename from engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GPanelDef.java
rename to nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GPanelDef.java
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GSnapshot.java b/nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GSnapshot.java
similarity index 100%
rename from engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GSnapshot.java
rename to nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GSnapshot.java
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GSnapshotInfo.java b/nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GSnapshotInfo.java
similarity index 100%
rename from engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GSnapshotInfo.java
rename to nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GSnapshotInfo.java
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GTemplate.java b/nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GTemplate.java
similarity index 100%
rename from engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GTemplate.java
rename to nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GTemplate.java
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GTemplating.java b/nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GTemplating.java
similarity index 100%
rename from engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GTemplating.java
rename to nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/GTemplating.java
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/dashboard.json b/nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/dashboard.json
similarity index 100%
rename from engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/dashboard.json
rename to nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/dashboard.json
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/dashboard2.json b/nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/dashboard2.json
similarity index 100%
rename from engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/dashboard2.json
rename to nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/grafana/transfer/dashboard2.json
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/prometheus/PMatrixData.java b/nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/prometheus/PMatrixData.java
similarity index 100%
rename from engine-clients/src/main/java/io/nosqlbench/engine/clients/prometheus/PMatrixData.java
rename to nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/prometheus/PMatrixData.java
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/prometheus/PMatrixElem.java b/nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/prometheus/PMatrixElem.java
similarity index 100%
rename from engine-clients/src/main/java/io/nosqlbench/engine/clients/prometheus/PMatrixElem.java
rename to nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/prometheus/PMatrixElem.java
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/prometheus/PMetric.java b/nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/prometheus/PMetric.java
similarity index 100%
rename from engine-clients/src/main/java/io/nosqlbench/engine/clients/prometheus/PMetric.java
rename to nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/prometheus/PMetric.java
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/prometheus/PValue.java b/nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/prometheus/PValue.java
similarity index 100%
rename from engine-clients/src/main/java/io/nosqlbench/engine/clients/prometheus/PValue.java
rename to nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/prometheus/PValue.java
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/prometheus/PValues.java b/nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/prometheus/PValues.java
similarity index 100%
rename from engine-clients/src/main/java/io/nosqlbench/engine/clients/prometheus/PValues.java
rename to nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/prometheus/PValues.java
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/prometheus/PromQueryResult.java b/nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/prometheus/PromQueryResult.java
similarity index 100%
rename from engine-clients/src/main/java/io/nosqlbench/engine/clients/prometheus/PromQueryResult.java
rename to nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/prometheus/PromQueryResult.java
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/prometheus/PromSeriesDataResult.java b/nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/prometheus/PromSeriesDataResult.java
similarity index 100%
rename from engine-clients/src/main/java/io/nosqlbench/engine/clients/prometheus/PromSeriesDataResult.java
rename to nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/prometheus/PromSeriesDataResult.java
diff --git a/engine-clients/src/main/java/io/nosqlbench/engine/clients/prometheus/PromSeriesLookupResult.java b/nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/prometheus/PromSeriesLookupResult.java
similarity index 100%
rename from engine-clients/src/main/java/io/nosqlbench/engine/clients/prometheus/PromSeriesLookupResult.java
rename to nb-engine/nb-engine-clients/src/main/java/io/nosqlbench/engine/clients/prometheus/PromSeriesLookupResult.java
diff --git a/engine-clients/src/test/java/io/nosqlbench/engine/clients/grafana/GTimeUnitTest.java b/nb-engine/nb-engine-clients/src/test/java/io/nosqlbench/engine/clients/grafana/GTimeUnitTest.java
similarity index 100%
rename from engine-clients/src/test/java/io/nosqlbench/engine/clients/grafana/GTimeUnitTest.java
rename to nb-engine/nb-engine-clients/src/test/java/io/nosqlbench/engine/clients/grafana/GTimeUnitTest.java
diff --git a/engine-clients/src/test/java/io/nosqlbench/engine/clients/grafana/GrafanaClientTest.java b/nb-engine/nb-engine-clients/src/test/java/io/nosqlbench/engine/clients/grafana/GrafanaClientTest.java
similarity index 100%
rename from engine-clients/src/test/java/io/nosqlbench/engine/clients/grafana/GrafanaClientTest.java
rename to nb-engine/nb-engine-clients/src/test/java/io/nosqlbench/engine/clients/grafana/GrafanaClientTest.java
diff --git a/engine-clients/src/test/java/io/nosqlbench/engine/clients/grafana/analyzer/GrafanaRegionAnalyzerTest.java b/nb-engine/nb-engine-clients/src/test/java/io/nosqlbench/engine/clients/grafana/analyzer/GrafanaRegionAnalyzerTest.java
similarity index 100%
rename from engine-clients/src/test/java/io/nosqlbench/engine/clients/grafana/analyzer/GrafanaRegionAnalyzerTest.java
rename to nb-engine/nb-engine-clients/src/test/java/io/nosqlbench/engine/clients/grafana/analyzer/GrafanaRegionAnalyzerTest.java
diff --git a/engine-clients/src/test/java/io/nosqlbench/engine/clients/grafana/annotator/GrafanaMetricsAnnotatorTest.java b/nb-engine/nb-engine-clients/src/test/java/io/nosqlbench/engine/clients/grafana/annotator/GrafanaMetricsAnnotatorTest.java
similarity index 100%
rename from engine-clients/src/test/java/io/nosqlbench/engine/clients/grafana/annotator/GrafanaMetricsAnnotatorTest.java
rename to nb-engine/nb-engine-clients/src/test/java/io/nosqlbench/engine/clients/grafana/annotator/GrafanaMetricsAnnotatorTest.java
diff --git a/engine-clients/src/test/java/io/nosqlbench/engine/clients/prometheus/PMatrixElemTest.java b/nb-engine/nb-engine-clients/src/test/java/io/nosqlbench/engine/clients/prometheus/PMatrixElemTest.java
similarity index 100%
rename from engine-clients/src/test/java/io/nosqlbench/engine/clients/prometheus/PMatrixElemTest.java
rename to nb-engine/nb-engine-clients/src/test/java/io/nosqlbench/engine/clients/prometheus/PMatrixElemTest.java
diff --git a/engine-clients/src/test/java/io/nosqlbench/engine/clients/prometheus/test.json b/nb-engine/nb-engine-clients/src/test/java/io/nosqlbench/engine/clients/prometheus/test.json
similarity index 100%
rename from engine-clients/src/test/java/io/nosqlbench/engine/clients/prometheus/test.json
rename to nb-engine/nb-engine-clients/src/test/java/io/nosqlbench/engine/clients/prometheus/test.json
diff --git a/engine-clients/src/test/resources/examples/db.json b/nb-engine/nb-engine-clients/src/test/resources/examples/db.json
similarity index 100%
rename from engine-clients/src/test/resources/examples/db.json
rename to nb-engine/nb-engine-clients/src/test/resources/examples/db.json
diff --git a/engine-core/pom.xml b/nb-engine/nb-engine-core/pom.xml
similarity index 97%
rename from engine-core/pom.xml
rename to nb-engine/nb-engine-core/pom.xml
index e1bf8a73c6..1db09de7bb 100644
--- a/engine-core/pom.xml
+++ b/nb-engine/nb-engine-core/pom.xml
@@ -22,10 +22,10 @@
mvn-defaults
io.nosqlbench
${revision}
- ../mvn-defaults
+ ../../mvn-defaults
- engine-core
+ nb-engine-core
jar
${project.artifactId}
@@ -95,7 +95,7 @@
io.nosqlbench
- virtdata-userlibs
+ nb-virtdata-all
${revision}
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/Action.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/Action.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/Action.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/Action.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActionDispenser.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActionDispenser.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActionDispenser.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActionDispenser.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActivitiesAware.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActivitiesAware.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActivitiesAware.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActivitiesAware.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/Activity.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/Activity.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/Activity.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/Activity.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActivityControlsListener.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActivityControlsListener.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActivityControlsListener.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActivityControlsListener.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActivityDefObserver.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActivityDefObserver.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActivityDefObserver.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActivityDefObserver.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActivityInstrumentation.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActivityInstrumentation.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActivityInstrumentation.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActivityInstrumentation.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActivityType.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActivityType.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActivityType.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ActivityType.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/AsyncAction.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/AsyncAction.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/AsyncAction.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/AsyncAction.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/BaseAsyncAction.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/BaseAsyncAction.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/BaseAsyncAction.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/BaseAsyncAction.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ComponentActivityInstrumentation.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ComponentActivityInstrumentation.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ComponentActivityInstrumentation.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ComponentActivityInstrumentation.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/Motor.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/Motor.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/Motor.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/Motor.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/MotorDispenser.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/MotorDispenser.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/MotorDispenser.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/MotorDispenser.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/RunState.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/RunState.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/RunState.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/RunState.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/Startable.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/Startable.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/Startable.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/Startable.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/Stoppable.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/Stoppable.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/Stoppable.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/Stoppable.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/SyncAction.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/SyncAction.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/SyncAction.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/SyncAction.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/longIntervalSupplier.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/longIntervalSupplier.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/longIntervalSupplier.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/longIntervalSupplier.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/OpTracker.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/OpTracker.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/OpTracker.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/OpTracker.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/OpTrackerImpl.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/OpTrackerImpl.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/OpTrackerImpl.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/OpTrackerImpl.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/opfacets/CompletedOp.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/opfacets/CompletedOp.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/opfacets/CompletedOp.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/opfacets/CompletedOp.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/opfacets/EventedOpImpl.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/opfacets/EventedOpImpl.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/opfacets/EventedOpImpl.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/opfacets/EventedOpImpl.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/opfacets/FailedOp.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/opfacets/FailedOp.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/opfacets/FailedOp.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/opfacets/FailedOp.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/opfacets/OpEvents.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/opfacets/OpEvents.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/opfacets/OpEvents.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/opfacets/OpEvents.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/opfacets/OpFacets.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/opfacets/OpFacets.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/opfacets/OpFacets.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/opfacets/OpFacets.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/opfacets/OpImpl.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/opfacets/OpImpl.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/opfacets/OpImpl.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/opfacets/OpImpl.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/opfacets/Payload.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/opfacets/Payload.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/opfacets/Payload.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/opfacets/Payload.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/opfacets/SkippedOp.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/opfacets/SkippedOp.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/opfacets/SkippedOp.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/opfacets/SkippedOp.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/opfacets/StartedOp.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/opfacets/StartedOp.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/opfacets/StartedOp.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/opfacets/StartedOp.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/opfacets/SucceededOp.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/opfacets/SucceededOp.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/opfacets/SucceededOp.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/opfacets/SucceededOp.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/opfacets/TrackedOp.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/opfacets/TrackedOp.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/opfacets/TrackedOp.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/opfacets/TrackedOp.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/ActiveMeter.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/ActiveMeter.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/ActiveMeter.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/ActiveMeter.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/ActivityMetricProgressMeter.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/ActivityMetricProgressMeter.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/ActivityMetricProgressMeter.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/ActivityMetricProgressMeter.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/CompletedMeter.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/CompletedMeter.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/CompletedMeter.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/CompletedMeter.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/CycleMeter.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/CycleMeter.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/CycleMeter.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/CycleMeter.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/InputProgressMeter.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/InputProgressMeter.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/InputProgressMeter.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/InputProgressMeter.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/MetricProgressMeter.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/MetricProgressMeter.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/MetricProgressMeter.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/MetricProgressMeter.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/ProgressCapable.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/ProgressCapable.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/ProgressCapable.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/ProgressCapable.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/ProgressDisplay.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/ProgressDisplay.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/ProgressDisplay.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/ProgressDisplay.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/ProgressMeterDisplay.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/ProgressMeterDisplay.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/ProgressMeterDisplay.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/ProgressMeterDisplay.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/ProgressSummary.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/ProgressSummary.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/ProgressSummary.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/ProgressSummary.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/RemainingMeter.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/RemainingMeter.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/RemainingMeter.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/RemainingMeter.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/StateCapable.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/StateCapable.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/StateCapable.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/core/progress/StateCapable.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/Buffer.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/Buffer.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/Buffer.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/Buffer.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/CycleResultSegmentsReadable.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/CycleResultSegmentsReadable.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/CycleResultSegmentsReadable.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/CycleResultSegmentsReadable.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/CycleSorting.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/CycleSorting.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/CycleSorting.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/CycleSorting.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/op_output/StrideOutputConsumer.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/op_output/StrideOutputConsumer.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/op_output/StrideOutputConsumer.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/op_output/StrideOutputConsumer.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/op_output/StrideOutputSegment.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/op_output/StrideOutputSegment.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/op_output/StrideOutputSegment.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/op_output/StrideOutputSegment.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/op_output/StrideOutputSegmentImpl.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/op_output/StrideOutputSegmentImpl.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/op_output/StrideOutputSegmentImpl.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/op_output/StrideOutputSegmentImpl.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleArray.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleArray.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleArray.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleArray.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleMutable.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleMutable.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleMutable.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleMutable.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleReadable.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleReadable.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleReadable.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleReadable.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleResult.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleResult.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleResult.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleResult.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleResultArray.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleResultArray.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleResultArray.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleResultArray.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleResultSegmentBuffer.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleResultSegmentBuffer.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleResultSegmentBuffer.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleResultSegmentBuffer.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleResultStrider.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleResultStrider.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleResultStrider.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleResultStrider.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleResultsIntervalSegment.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleResultsIntervalSegment.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleResultsIntervalSegment.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleResultsIntervalSegment.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleResultsSegment.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleResultsSegment.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleResultsSegment.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleResultsSegment.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleResultsSegmentReadable.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleResultsSegmentReadable.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleResultsSegmentReadable.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleResultsSegmentReadable.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleSegment.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleSegment.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleSegment.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleSegment.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleSegmentBuffer.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleSegmentBuffer.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleSegmentBuffer.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleSegmentBuffer.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/MutableCycleResult.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/MutableCycleResult.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/MutableCycleResult.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/MutableCycleResult.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/ResultReadable.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/ResultReadable.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/ResultReadable.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/ResultReadable.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/SegmentedResultInput.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/SegmentedResultInput.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/SegmentedResultInput.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/SegmentedResultInput.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results_rle/CycleResultsRLEBufferReadable.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results_rle/CycleResultsRLEBufferReadable.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results_rle/CycleResultsRLEBufferReadable.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results_rle/CycleResultsRLEBufferReadable.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results_rle/CycleResultsRLEBufferTarget.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results_rle/CycleResultsRLEBufferTarget.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results_rle/CycleResultsRLEBufferTarget.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results_rle/CycleResultsRLEBufferTarget.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results_rle/CycleSpanResults.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results_rle/CycleSpanResults.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results_rle/CycleSpanResults.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results_rle/CycleSpanResults.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/CoreResultValueFilter.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/CoreResultValueFilter.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/CoreResultValueFilter.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/CoreResultValueFilter.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/ExperimentalResultFilterType.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/ExperimentalResultFilterType.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/ExperimentalResultFilterType.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/ExperimentalResultFilterType.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/IncludeCodesTypeExperimental.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/IncludeCodesTypeExperimental.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/IncludeCodesTypeExperimental.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/IncludeCodesTypeExperimental.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/InputFilterDispenser.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/InputFilterDispenser.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/InputFilterDispenser.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/InputFilterDispenser.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/InputMapper.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/InputMapper.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/InputMapper.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/InputMapper.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/IntPredicateDispenser.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/IntPredicateDispenser.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/IntPredicateDispenser.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/IntPredicateDispenser.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/ResultFilterDispenser.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/ResultFilterDispenser.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/ResultFilterDispenser.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/ResultFilterDispenser.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/ResultValueFilterType.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/ResultValueFilterType.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/ResultValueFilterType.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/ResultValueFilterType.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/tristate/CycleResultPredicate.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/tristate/CycleResultPredicate.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/tristate/CycleResultPredicate.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/tristate/CycleResultPredicate.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/tristate/CycleResultTristateFilter.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/tristate/CycleResultTristateFilter.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/tristate/CycleResultTristateFilter.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/tristate/CycleResultTristateFilter.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/tristate/EnumReadableMappingFilter.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/tristate/EnumReadableMappingFilter.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/tristate/EnumReadableMappingFilter.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/tristate/EnumReadableMappingFilter.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/tristate/ResultFilterPhase.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/tristate/ResultFilterPhase.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/tristate/ResultFilterPhase.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/tristate/ResultFilterPhase.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/tristate/ResultFilteringSieve.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/tristate/ResultFilteringSieve.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/tristate/ResultFilteringSieve.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/tristate/ResultFilteringSieve.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/tristate/ResultMappingArrayFilter.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/tristate/ResultMappingArrayFilter.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/tristate/ResultMappingArrayFilter.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/tristate/ResultMappingArrayFilter.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/inputs/cyclelog/CanFilterResultValue.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/inputs/cyclelog/CanFilterResultValue.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/inputs/cyclelog/CanFilterResultValue.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/inputs/cyclelog/CanFilterResultValue.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/inputs/cyclelog/CycleLogInput.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/inputs/cyclelog/CycleLogInput.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/inputs/cyclelog/CycleLogInput.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/inputs/cyclelog/CycleLogInput.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/inputs/cyclelog/CycleLogInputType.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/inputs/cyclelog/CycleLogInputType.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/inputs/cyclelog/CycleLogInputType.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/inputs/cyclelog/CycleLogInputType.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/CanSortCycles.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/CanSortCycles.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/CanSortCycles.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/CanSortCycles.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/ReorderingConcurrentResultBuffer.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/ReorderingConcurrentResultBuffer.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/ReorderingConcurrentResultBuffer.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/ReorderingConcurrentResultBuffer.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/cyclelog/CycleLogDumperUtility.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/cyclelog/CycleLogDumperUtility.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/cyclelog/CycleLogDumperUtility.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/cyclelog/CycleLogDumperUtility.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/cyclelog/CycleLogImporterUtility.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/cyclelog/CycleLogImporterUtility.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/cyclelog/CycleLogImporterUtility.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/cyclelog/CycleLogImporterUtility.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/cyclelog/CycleLogOutput.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/cyclelog/CycleLogOutput.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/cyclelog/CycleLogOutput.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/cyclelog/CycleLogOutput.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/cyclelog/CycleLogOutputType.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/cyclelog/CycleLogOutputType.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/cyclelog/CycleLogOutputType.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/cyclelog/CycleLogOutputType.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/logger/LoggingMarkerDispenser.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/logger/LoggingMarkerDispenser.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/logger/LoggingMarkerDispenser.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/logger/LoggingMarkerDispenser.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/logger/LoggingOutput.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/logger/LoggingOutput.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/logger/LoggingOutput.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/cyclelog/outputs/logger/LoggingOutput.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/CycleErrorHandler.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/CycleErrorHandler.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/CycleErrorHandler.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/CycleErrorHandler.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/CycleErrorHandlers.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/CycleErrorHandlers.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/CycleErrorHandlers.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/CycleErrorHandlers.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/ErrorMetrics.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/ErrorMetrics.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/ErrorMetrics.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/ErrorMetrics.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/HashedErrorHandler.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/HashedErrorHandler.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/HashedErrorHandler.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/HashedErrorHandler.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/ErrorDetail.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/ErrorDetail.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/ErrorDetail.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/ErrorDetail.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/ErrorHandler.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/ErrorHandler.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/ErrorHandler.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/ErrorHandler.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/NBErrorHandler.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/NBErrorHandler.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/NBErrorHandler.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/NBErrorHandler.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/ResultCode.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/ResultCode.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/ResultCode.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/ResultCode.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/CountErrorHandler.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/CountErrorHandler.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/CountErrorHandler.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/CountErrorHandler.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/CounterErrorHandler.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/CounterErrorHandler.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/CounterErrorHandler.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/CounterErrorHandler.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/ErrorErrorHandler.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/ErrorErrorHandler.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/ErrorErrorHandler.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/ErrorErrorHandler.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/ExpectedResultVerificationErrorHandler.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/ExpectedResultVerificationErrorHandler.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/ExpectedResultVerificationErrorHandler.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/ExpectedResultVerificationErrorHandler.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/HistogramErrorHandler.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/HistogramErrorHandler.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/HistogramErrorHandler.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/HistogramErrorHandler.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/IgnoreErrorHandler.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/IgnoreErrorHandler.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/IgnoreErrorHandler.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/IgnoreErrorHandler.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/MeterErrorHandler.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/MeterErrorHandler.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/MeterErrorHandler.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/MeterErrorHandler.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/RetryErrorHandler.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/RetryErrorHandler.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/RetryErrorHandler.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/RetryErrorHandler.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/StopErrorHandler.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/StopErrorHandler.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/StopErrorHandler.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/StopErrorHandler.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/TimerErrorHandler.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/TimerErrorHandler.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/TimerErrorHandler.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/TimerErrorHandler.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/WarnErrorHandler.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/WarnErrorHandler.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/WarnErrorHandler.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/handlers/WarnErrorHandler.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/input/Input.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/input/Input.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/input/Input.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/input/Input.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/input/InputDispenser.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/input/InputDispenser.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/input/InputDispenser.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/input/InputDispenser.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/input/InputType.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/input/InputType.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/input/InputType.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/input/InputType.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/input/StrideAware.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/input/StrideAware.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/input/StrideAware.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/input/StrideAware.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/output/Output.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/output/Output.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/output/Output.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/output/Output.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/output/OutputDispenser.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/output/OutputDispenser.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/output/OutputDispenser.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/output/OutputDispenser.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/output/OutputType.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/output/OutputType.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/output/OutputType.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/output/OutputType.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/planning/BucketSequencer.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/planning/BucketSequencer.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/planning/BucketSequencer.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/planning/BucketSequencer.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/planning/ConcatSequencer.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/planning/ConcatSequencer.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/planning/ConcatSequencer.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/planning/ConcatSequencer.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/planning/ElementSequencer.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/planning/ElementSequencer.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/planning/ElementSequencer.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/planning/ElementSequencer.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/planning/IntervalSequencer.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/planning/IntervalSequencer.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/planning/IntervalSequencer.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/planning/IntervalSequencer.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/planning/OpSequence.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/planning/OpSequence.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/planning/OpSequence.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/planning/OpSequence.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/planning/OpSource.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/planning/OpSource.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/planning/OpSource.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/planning/OpSource.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/planning/Sequence.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/planning/Sequence.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/planning/Sequence.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/planning/Sequence.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/planning/SequencePlanner.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/planning/SequencePlanner.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/planning/SequencePlanner.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/planning/SequencePlanner.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/planning/SequencerType.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/planning/SequencerType.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/planning/SequencerType.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/planning/SequencerType.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/simrate/CycleRateSpec.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/simrate/CycleRateSpec.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/simrate/CycleRateSpec.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/simrate/CycleRateSpec.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/simrate/RateLimiter.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/simrate/RateLimiter.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/simrate/RateLimiter.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/simrate/RateLimiter.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/simrate/RateLimiters.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/simrate/RateLimiters.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/simrate/RateLimiters.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/simrate/RateLimiters.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/simrate/SimRate.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/simrate/SimRate.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/simrate/SimRate.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/simrate/SimRate.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/simrate/SimRateSpec.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/simrate/SimRateSpec.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/simrate/SimRateSpec.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/simrate/SimRateSpec.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/simrate/SimThreads.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/simrate/SimThreads.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/simrate/SimThreads.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/simrate/SimThreads.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/simrate/StrideRateSpec.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/simrate/StrideRateSpec.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/simrate/StrideRateSpec.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/simrate/StrideRateSpec.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/sysperf/SysBenchMethodNanoTime.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/sysperf/SysBenchMethodNanoTime.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/sysperf/SysBenchMethodNanoTime.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/sysperf/SysBenchMethodNanoTime.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/sysperf/SysBenchMethodParkNanos.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/sysperf/SysBenchMethodParkNanos.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/sysperf/SysBenchMethodParkNanos.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/sysperf/SysBenchMethodParkNanos.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/sysperf/SysBenchMethodThreadSleep.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/sysperf/SysBenchMethodThreadSleep.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/sysperf/SysBenchMethodThreadSleep.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/sysperf/SysBenchMethodThreadSleep.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/sysperf/SysPerf.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/sysperf/SysPerf.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/sysperf/SysPerf.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/sysperf/SysPerf.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/sysperf/SysPerfBaseliner.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/sysperf/SysPerfBaseliner.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/sysperf/SysPerfBaseliner.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/sysperf/SysPerfBaseliner.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/sysperf/SysPerfData.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/sysperf/SysPerfData.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/sysperf/SysPerfData.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityapi/sysperf/SysPerfData.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/ActivityDispenser.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/ActivityDispenser.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/ActivityDispenser.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/ActivityDispenser.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/ActivityInitializationError.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/ActivityInitializationError.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/ActivityInitializationError.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/ActivityInitializationError.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/CoreServices.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/CoreServices.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/CoreServices.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/CoreServices.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/CpuInfo.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/CpuInfo.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/CpuInfo.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/CpuInfo.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/FilteringInputDispenser.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/FilteringInputDispenser.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/FilteringInputDispenser.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/FilteringInputDispenser.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/FilteringOutputDispenser.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/FilteringOutputDispenser.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/FilteringOutputDispenser.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/FilteringOutputDispenser.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/MotorState.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/MotorState.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/MotorState.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/MotorState.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/ProgressAndStateMeter.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/ProgressAndStateMeter.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/ProgressAndStateMeter.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/ProgressAndStateMeter.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/SimpleActivity.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/SimpleActivity.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/SimpleActivity.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/SimpleActivity.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/action/CoreAction.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/action/CoreAction.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/action/CoreAction.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/action/CoreAction.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/action/CoreActionDispenser.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/action/CoreActionDispenser.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/action/CoreActionDispenser.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/action/CoreActionDispenser.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/input/AtomicInput.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/input/AtomicInput.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/input/AtomicInput.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/input/AtomicInput.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/input/CoreInputDispenser.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/input/CoreInputDispenser.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/input/CoreInputDispenser.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/input/CoreInputDispenser.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/input/CycleArrayBuffer.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/input/CycleArrayBuffer.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/input/CycleArrayBuffer.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/input/CycleArrayBuffer.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/input/InputInterval.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/input/InputInterval.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/input/InputInterval.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/input/InputInterval.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/input/TargetRateInputType.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/input/TargetRateInputType.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/input/TargetRateInputType.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/input/TargetRateInputType.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/marker/ByteTrackerExtent.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/marker/ByteTrackerExtent.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/marker/ByteTrackerExtent.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/marker/ByteTrackerExtent.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/marker/ContiguousOutputChunker.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/marker/ContiguousOutputChunker.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/marker/ContiguousOutputChunker.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/marker/ContiguousOutputChunker.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/marker/OldCoreTracker.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/marker/OldCoreTracker.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/marker/OldCoreTracker.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/marker/OldCoreTracker.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/marker/longheap/LongTreeTracker.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/marker/longheap/LongTreeTracker.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/marker/longheap/LongTreeTracker.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/marker/longheap/LongTreeTracker.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/marker/longheap/LongTreeTrackerAtomic.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/marker/longheap/LongTreeTrackerAtomic.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/marker/longheap/LongTreeTrackerAtomic.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/marker/longheap/LongTreeTrackerAtomic.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/marker/longheap/TreeTracker1024.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/marker/longheap/TreeTracker1024.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/marker/longheap/TreeTracker1024.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/marker/longheap/TreeTracker1024.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/CoreMotor.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/CoreMotor.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/CoreMotor.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/CoreMotor.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/CoreMotorDispenser.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/CoreMotorDispenser.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/CoreMotorDispenser.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/CoreMotorDispenser.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/RunStateImage.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/RunStateImage.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/RunStateImage.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/RunStateImage.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/RunStateTally.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/RunStateTally.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/RunStateTally.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/RunStateTally.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/StrideTracker.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/StrideTracker.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/StrideTracker.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/motor/StrideTracker.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/ActivityDefAware.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/ActivityDefAware.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/ActivityDefAware.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/ActivityDefAware.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/NBInvokerType.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/NBInvokerType.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/NBInvokerType.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/NBInvokerType.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActionDispenser.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActionDispenser.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActionDispenser.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActionDispenser.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActivity.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActivity.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActivity.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActivity.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActivityType.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActivityType.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActivityType.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/StandardActivityType.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/actions/StandardAction.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/actions/StandardAction.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/actions/StandardAction.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/activityimpl/uniform/actions/StandardAction.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/clireader/CLI.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/clireader/CLI.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/clireader/CLI.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/clireader/CLI.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/clireader/dsl/CLIFacets.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/clireader/dsl/CLIFacets.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/clireader/dsl/CLIFacets.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/clireader/dsl/CLIFacets.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/clireader/package-info.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/clireader/package-info.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/clireader/package-info.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/clireader/package-info.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionCountMetrics.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionCountMetrics.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionCountMetrics.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionCountMetrics.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionExpectedResultVerificationMetrics.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionExpectedResultVerificationMetrics.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionExpectedResultVerificationMetrics.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionExpectedResultVerificationMetrics.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionHistoMetrics.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionHistoMetrics.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionHistoMetrics.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionHistoMetrics.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionMeterMetrics.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionMeterMetrics.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionMeterMetrics.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionMeterMetrics.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionTimerMetrics.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionTimerMetrics.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionTimerMetrics.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/metrics/ExceptionTimerMetrics.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/metrics/HistoLogger.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/metrics/HistoLogger.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/metrics/HistoLogger.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/metrics/HistoLogger.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/metrics/IndicatorMode.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/metrics/IndicatorMode.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/metrics/IndicatorMode.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/metrics/IndicatorMode.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/scenarios/NBCLIScenarioPreprocessor.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/scenarios/NBCLIScenarioPreprocessor.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/scenarios/NBCLIScenarioPreprocessor.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/scenarios/NBCLIScenarioPreprocessor.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/scenarios/SCNamedParam.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/scenarios/SCNamedParam.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/scenarios/SCNamedParam.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/scenarios/SCNamedParam.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/scenarios/WorkloadDesc.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/scenarios/WorkloadDesc.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/scenarios/WorkloadDesc.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/scenarios/WorkloadDesc.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/scoping/ScopedSupplier.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/scoping/ScopedSupplier.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/scoping/ScopedSupplier.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/scoping/ScopedSupplier.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/scripting/ExprEvaluator.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/scripting/ExprEvaluator.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/scripting/ExprEvaluator.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/scripting/ExprEvaluator.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/scripting/GraalJsEvaluator.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/scripting/GraalJsEvaluator.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/scripting/GraalJsEvaluator.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/scripting/GraalJsEvaluator.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/util/Colors.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/util/Colors.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/util/Colors.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/util/Colors.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/util/ConfigTuples.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/util/ConfigTuples.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/util/ConfigTuples.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/util/ConfigTuples.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/api/util/SimpleConfig.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/util/SimpleConfig.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/api/util/SimpleConfig.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/api/util/SimpleConfig.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/cli/NBJavaNativeResolver.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/cli/NBJavaNativeResolver.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/cli/NBJavaNativeResolver.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/cli/NBJavaNativeResolver.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/cmdstream/BasicScriptBuffer.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/cmdstream/BasicScriptBuffer.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/cmdstream/BasicScriptBuffer.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/cmdstream/BasicScriptBuffer.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/cmdstream/Cmd.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/cmdstream/Cmd.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/cmdstream/Cmd.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/cmdstream/Cmd.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/cmdstream/CmdArg.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/cmdstream/CmdArg.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/cmdstream/CmdArg.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/cmdstream/CmdArg.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/cmdstream/CmdParam.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/cmdstream/CmdParam.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/cmdstream/CmdParam.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/cmdstream/CmdParam.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/cmdstream/CmdType.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/cmdstream/CmdType.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/cmdstream/CmdType.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/cmdstream/CmdType.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/cmdstream/NBJavaCommandLoader.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/cmdstream/NBJavaCommandLoader.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/cmdstream/NBJavaCommandLoader.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/cmdstream/NBJavaCommandLoader.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/cmdstream/PathCanonicalizer.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/cmdstream/PathCanonicalizer.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/cmdstream/PathCanonicalizer.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/cmdstream/PathCanonicalizer.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/cmdstream/ScriptBuffer.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/cmdstream/ScriptBuffer.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/cmdstream/ScriptBuffer.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/cmdstream/ScriptBuffer.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/cmdstream/commands.md b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/cmdstream/commands.md
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/cmdstream/commands.md
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/cmdstream/commands.md
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/annotation/Annotators.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/annotation/Annotators.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/annotation/Annotators.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/annotation/Annotators.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/clientload/ClientSystemMetricChecker.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/clientload/ClientSystemMetricChecker.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/clientload/ClientSystemMetricChecker.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/clientload/ClientSystemMetricChecker.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/clientload/DiskStatsReader.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/clientload/DiskStatsReader.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/clientload/DiskStatsReader.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/clientload/DiskStatsReader.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/clientload/LinuxSystemFileReader.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/clientload/LinuxSystemFileReader.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/clientload/LinuxSystemFileReader.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/clientload/LinuxSystemFileReader.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/clientload/LoadAvgReader.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/clientload/LoadAvgReader.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/clientload/LoadAvgReader.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/clientload/LoadAvgReader.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/clientload/MemInfoReader.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/clientload/MemInfoReader.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/clientload/MemInfoReader.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/clientload/MemInfoReader.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/clientload/NetDevReader.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/clientload/NetDevReader.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/clientload/NetDevReader.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/clientload/NetDevReader.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/clientload/StatReader.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/clientload/StatReader.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/clientload/StatReader.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/clientload/StatReader.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/fortesting/BlockingSegmentInput.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/fortesting/BlockingSegmentInput.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/fortesting/BlockingSegmentInput.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/fortesting/BlockingSegmentInput.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/fortesting/CycleValueSupplier.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/fortesting/CycleValueSupplier.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/fortesting/CycleValueSupplier.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/fortesting/CycleValueSupplier.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ExecutionMetricsResult.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ExecutionMetricsResult.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ExecutionMetricsResult.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ExecutionMetricsResult.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ExecutionResult.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ExecutionResult.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ExecutionResult.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/ExecutionResult.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/IndexedThreadFactory.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/IndexedThreadFactory.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/IndexedThreadFactory.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/IndexedThreadFactory.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivitiesExceptionHandler.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivitiesExceptionHandler.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivitiesExceptionHandler.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivitiesExceptionHandler.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivitiesProgressIndicator.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivitiesProgressIndicator.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivitiesProgressIndicator.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivitiesProgressIndicator.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityExceptionHandler.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityExceptionHandler.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityExceptionHandler.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityExceptionHandler.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityExecutor.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityExecutor.java
similarity index 99%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityExecutor.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityExecutor.java
index dd7725617a..16c93b88dd 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityExecutor.java
+++ b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityExecutor.java
@@ -16,6 +16,7 @@
package io.nosqlbench.engine.core.lifecycle.activity;
import com.codahale.metrics.Gauge;
+import io.nosqlbench.engine.core.lifecycle.IndexedThreadFactory;
import io.nosqlbench.nb.api.engine.metrics.instruments.MetricCategory;
import io.nosqlbench.nb.api.engine.metrics.instruments.NBMetricGauge;
import io.nosqlbench.nb.api.labels.NBLabeledElement;
@@ -33,7 +34,7 @@
import io.nosqlbench.engine.api.activityimpl.motor.RunStateTally;
import io.nosqlbench.engine.core.annotation.Annotators;
import io.nosqlbench.engine.core.lifecycle.ExecutionResult;
-import io.nosqlbench.virtdata.userlibs.apps.valuechecker.IndexedThreadFactory;
+//import io.nosqlbench.virtdata.userlibs.apps.valuechecker.IndexedThreadFactory;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityExecutorShutdownHook.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityExecutorShutdownHook.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityExecutorShutdownHook.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityExecutorShutdownHook.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityLoader.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityLoader.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityLoader.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityLoader.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityRuntimeInfo.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityRuntimeInfo.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityRuntimeInfo.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityRuntimeInfo.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityTypeLoader.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityTypeLoader.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityTypeLoader.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/activity/ActivityTypeLoader.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/CMD_await.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/CMD_await.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/CMD_await.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/CMD_await.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/CMD_example.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/CMD_example.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/CMD_example.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/CMD_example.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/CMD_forceStop.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/CMD_forceStop.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/CMD_forceStop.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/CMD_forceStop.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/CMD_run.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/CMD_run.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/CMD_run.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/CMD_run.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/CMD_start.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/CMD_start.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/CMD_start.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/CMD_start.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/CMD_stop.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/CMD_stop.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/CMD_stop.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/CMD_stop.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/CMD_wait.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/CMD_wait.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/CMD_wait.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/CMD_wait.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/INFO_await.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/INFO_await.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/INFO_await.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/INFO_await.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/INFO_example.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/INFO_example.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/INFO_example.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/INFO_example.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/INFO_forceStop.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/INFO_forceStop.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/INFO_forceStop.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/INFO_forceStop.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/INFO_run.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/INFO_run.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/INFO_run.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/INFO_run.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/INFO_start.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/INFO_start.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/INFO_start.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/INFO_start.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/INFO_stop.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/INFO_stop.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/INFO_stop.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/INFO_stop.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/INFO_wait.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/INFO_wait.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/INFO_wait.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/INFO_wait.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/fortesting/CMD_error.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/fortesting/CMD_error.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/fortesting/CMD_error.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/fortesting/CMD_error.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/fortesting/CMD_ok.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/fortesting/CMD_ok.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/fortesting/CMD_ok.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/fortesting/CMD_ok.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/fortesting/INFO_error.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/fortesting/INFO_error.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/fortesting/INFO_error.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/fortesting/INFO_error.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/fortesting/INFO_ok.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/fortesting/INFO_ok.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/fortesting/INFO_ok.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/commands/fortesting/INFO_ok.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/process/NBCLIErrorHandler.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/process/NBCLIErrorHandler.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/process/NBCLIErrorHandler.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/process/NBCLIErrorHandler.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/process/ShutdownManager.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/process/ShutdownManager.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/process/ShutdownManager.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/process/ShutdownManager.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/ActivityBindings.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/ActivityBindings.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/ActivityBindings.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/ActivityBindings.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/ContainerActivitiesController.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/ContainerActivitiesController.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/ContainerActivitiesController.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/ContainerActivitiesController.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/ContainerBuilderFacets.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/ContainerBuilderFacets.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/ContainerBuilderFacets.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/ContainerBuilderFacets.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/DiagReader.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/DiagReader.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/DiagReader.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/DiagReader.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/DiagWriter.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/DiagWriter.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/DiagWriter.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/DiagWriter.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/FanWriter.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/FanWriter.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/FanWriter.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/FanWriter.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/InterjectingCharArrayWriter.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/InterjectingCharArrayWriter.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/InterjectingCharArrayWriter.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/InterjectingCharArrayWriter.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/InvokableResult.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/InvokableResult.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/InvokableResult.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/InvokableResult.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/NBBufferedContainer.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/NBBufferedContainer.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/NBBufferedContainer.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/NBBufferedContainer.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/NBCommandParams.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/NBCommandParams.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/NBCommandParams.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/NBCommandParams.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/NBContainer.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/NBContainer.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/NBContainer.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/NBContainer.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/NBScenarioContainerBuilder.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/NBScenarioContainerBuilder.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/NBScenarioContainerBuilder.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/NBScenarioContainerBuilder.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/ScriptEnvBuffer.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/ScriptEnvBuffer.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/ScriptEnvBuffer.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/container/ScriptEnvBuffer.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/ContextShutdownHook.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/ContextShutdownHook.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/ContextShutdownHook.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/ContextShutdownHook.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/NBBaseCommand.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/NBBaseCommand.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/NBBaseCommand.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/NBBaseCommand.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/NBCommandInfo.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/NBCommandInfo.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/NBCommandInfo.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/NBCommandInfo.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/NBCommandResult.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/NBCommandResult.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/NBCommandResult.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/NBCommandResult.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/NBInvokableCommand.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/NBInvokableCommand.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/NBInvokableCommand.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/NBInvokableCommand.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/ScenarioSummary.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/ScenarioSummary.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/ScenarioSummary.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/execution/ScenarioSummary.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/BufferedScriptCtx.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/BufferedScriptCtx.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/BufferedScriptCtx.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/BufferedScriptCtx.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/NBScriptedCommand.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/NBScriptedCommand.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/NBScriptedCommand.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/NBScriptedCommand.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/ScenarioScriptShell.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/ScenarioScriptShell.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/ScenarioScriptShell.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/ScenarioScriptShell.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/ScriptExecutionError.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/ScriptExecutionError.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/ScriptExecutionError.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/ScriptExecutionError.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/bindings/PolyglotMetricRegistryBindings.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/bindings/PolyglotMetricRegistryBindings.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/bindings/PolyglotMetricRegistryBindings.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/bindings/PolyglotMetricRegistryBindings.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/bindings/PolyglotScenarioController.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/bindings/PolyglotScenarioController.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/bindings/PolyglotScenarioController.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/bindings/PolyglotScenarioController.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/bindings/ReadOnlyBindings.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/bindings/ReadOnlyBindings.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/bindings/ReadOnlyBindings.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/bindings/ReadOnlyBindings.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/bindings/ReadOnlyBindingsException.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/bindings/ReadOnlyBindingsException.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/bindings/ReadOnlyBindingsException.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/bindings/ReadOnlyBindingsException.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/graaljs_engine_options.json b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/graaljs_engine_options.json
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/graaljs_engine_options.json
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/script/graaljs_engine_options.json
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/CmdParamsBuffer.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/CmdParamsBuffer.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/CmdParamsBuffer.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/CmdParamsBuffer.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/CmdParser.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/CmdParser.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/CmdParser.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/CmdParser.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBAutoScriptResolver.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBAutoScriptResolver.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBAutoScriptResolver.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBAutoScriptResolver.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBCommandAssembly.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBCommandAssembly.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBCommandAssembly.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBCommandAssembly.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBCommandInvoker.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBCommandInvoker.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBCommandInvoker.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBCommandInvoker.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBCoreInvokableResolver.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBCoreInvokableResolver.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBCoreInvokableResolver.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBCoreInvokableResolver.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBInvokableResolver.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBInvokableResolver.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBInvokableResolver.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBInvokableResolver.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBScriptCommandResolver.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBScriptCommandResolver.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBScriptCommandResolver.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBScriptCommandResolver.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBSession.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBSession.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBSession.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBSession.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBSessionSafetyMetrics.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBSessionSafetyMetrics.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBSessionSafetyMetrics.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/NBSessionSafetyMetrics.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/ResultCollector.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/ResultCollector.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/ResultCollector.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/ResultCollector.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/ResultContext.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/ResultContext.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/ResultContext.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/ResultContext.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/UnresolvedCommand.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/UnresolvedCommand.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/UnresolvedCommand.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/session/UnresolvedCommand.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/logging/NBLoggerConfig.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/logging/NBLoggerConfig.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/logging/NBLoggerConfig.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/logging/NBLoggerConfig.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/metadata/MarkdownFinder.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/metadata/MarkdownFinder.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/metadata/MarkdownFinder.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/metadata/MarkdownFinder.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/LoggingAnnotator.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/metrics/LoggingAnnotator.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/metrics/LoggingAnnotator.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/metrics/LoggingAnnotator.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/MetricMap.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/metrics/MetricMap.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/metrics/MetricMap.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/metrics/MetricMap.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/NBMetricsRegistry.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/metrics/NBMetricsRegistry.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/metrics/NBMetricsRegistry.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/metrics/NBMetricsRegistry.java
diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/metrics/NBMetricsSummary.java b/nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/metrics/NBMetricsSummary.java
similarity index 100%
rename from engine-core/src/main/java/io/nosqlbench/engine/core/metrics/NBMetricsSummary.java
rename to nb-engine/nb-engine-core/src/main/java/io/nosqlbench/engine/core/metrics/NBMetricsSummary.java
diff --git a/engine-core/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/nb-engine/nb-engine-core/src/main/resources/META-INF/services/javax.annotation.processing.Processor
similarity index 100%
rename from engine-core/src/main/resources/META-INF/services/javax.annotation.processing.Processor
rename to nb-engine/nb-engine-core/src/main/resources/META-INF/services/javax.annotation.processing.Processor
diff --git a/engine-core/src/main/resources/log4j2.xml b/nb-engine/nb-engine-core/src/main/resources/log4j2.xml
similarity index 100%
rename from engine-core/src/main/resources/log4j2.xml
rename to nb-engine/nb-engine-core/src/main/resources/log4j2.xml
diff --git a/engine-core/src/main/resources/metrics.yaml b/nb-engine/nb-engine-core/src/main/resources/metrics.yaml
similarity index 100%
rename from engine-core/src/main/resources/metrics.yaml
rename to nb-engine/nb-engine-core/src/main/resources/metrics.yaml
diff --git a/engine-core/src/main/resources/version.properties b/nb-engine/nb-engine-core/src/main/resources/version.properties
similarity index 100%
rename from engine-core/src/main/resources/version.properties
rename to nb-engine/nb-engine-core/src/main/resources/version.properties
diff --git a/engine-core/src/test/java/io/nosqlbench/TestMetricsRegistry.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/TestMetricsRegistry.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/TestMetricsRegistry.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/TestMetricsRegistry.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/ParameterMapTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/ParameterMapTest.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/ParameterMapTest.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/ParameterMapTest.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/OpTrackerImplTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/OpTrackerImplTest.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/OpTrackerImplTest.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/core/ops/fluent/OpTrackerImplTest.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/CycleResultsArraySegmentReadableTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/CycleResultsArraySegmentReadableTest.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/CycleResultsArraySegmentReadableTest.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/CycleResultsArraySegmentReadableTest.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/CycleResultsRLEBufferReadableTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/CycleResultsRLEBufferReadableTest.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/CycleResultsRLEBufferReadableTest.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/CycleResultsRLEBufferReadableTest.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/CycleResultsRLEBufferTargetTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/CycleResultsRLEBufferTargetTest.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/CycleResultsRLEBufferTargetTest.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/CycleResultsRLEBufferTargetTest.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleResultArraySegmentBufferTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleResultArraySegmentBufferTest.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleResultArraySegmentBufferTest.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/buffers/results/CycleResultArraySegmentBufferTest.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/tristate/EnumReadableMappingFilterTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/tristate/EnumReadableMappingFilterTest.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/tristate/EnumReadableMappingFilterTest.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/filters/tristate/EnumReadableMappingFilterTest.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/inputs/cyclelog/CycleLogInputTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/inputs/cyclelog/CycleLogInputTest.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/inputs/cyclelog/CycleLogInputTest.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/inputs/cyclelog/CycleLogInputTest.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/tristate/CoreResultFilterTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/tristate/CoreResultFilterTest.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/tristate/CoreResultFilterTest.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/tristate/CoreResultFilterTest.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/tristate/ResultFilteringSieveTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/tristate/ResultFilteringSieveTest.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/tristate/ResultFilteringSieveTest.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/cyclelog/tristate/ResultFilteringSieveTest.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/errorhandling/HashedErrorHandlerTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/errorhandling/HashedErrorHandlerTest.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/errorhandling/HashedErrorHandlerTest.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/errorhandling/HashedErrorHandlerTest.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/NBErrorHandlerTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/NBErrorHandlerTest.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/NBErrorHandlerTest.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/errorhandling/modular/NBErrorHandlerTest.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/planning/BucketSequencerTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/planning/BucketSequencerTest.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/planning/BucketSequencerTest.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/planning/BucketSequencerTest.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/planning/ConcatSequencerTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/planning/ConcatSequencerTest.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/planning/ConcatSequencerTest.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/planning/ConcatSequencerTest.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/planning/IntervalSequencerTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/planning/IntervalSequencerTest.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/planning/IntervalSequencerTest.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/planning/IntervalSequencerTest.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/SimRateSpecTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/SimRateSpecTest.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/SimRateSpecTest.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/ratelimits/SimRateSpecTest.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/sysperf/SysPerfBaselinerTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/sysperf/SysPerfBaselinerTest.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/sysperf/SysPerfBaselinerTest.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/sysperf/SysPerfBaselinerTest.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/sysperf/SysPerfTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/sysperf/SysPerfTest.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/sysperf/SysPerfTest.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityapi/sysperf/SysPerfTest.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/ActivityDefTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/ActivityDefTest.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/ActivityDefTest.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/ActivityDefTest.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/CpuInfoTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/CpuInfoTest.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/CpuInfoTest.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/CpuInfoTest.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/input/AtomicInputTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/input/AtomicInputTest.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/input/AtomicInputTest.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/input/AtomicInputTest.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/input/CycleArrayBufferTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/input/CycleArrayBufferTest.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/input/CycleArrayBufferTest.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/input/CycleArrayBufferTest.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/input/CycleArrayTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/input/CycleArrayTest.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/input/CycleArrayTest.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/input/CycleArrayTest.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/input/InputIntervalTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/input/InputIntervalTest.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/input/InputIntervalTest.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/input/InputIntervalTest.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/input/LinkedInputTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/input/LinkedInputTest.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/input/LinkedInputTest.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/input/LinkedInputTest.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/marker/ByteTrackerExtentTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/marker/ByteTrackerExtentTest.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/marker/ByteTrackerExtentTest.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/marker/ByteTrackerExtentTest.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/marker/CoreOutputAtticTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/marker/CoreOutputAtticTest.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/marker/CoreOutputAtticTest.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/marker/CoreOutputAtticTest.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/marker/CoreOutputTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/marker/CoreOutputTest.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/marker/CoreOutputTest.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/marker/CoreOutputTest.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/motor/RunStateImageTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/motor/RunStateImageTest.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/motor/RunStateImageTest.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/motor/RunStateImageTest.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/motor/RunStateTallyTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/motor/RunStateTallyTest.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/motor/RunStateTallyTest.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/motor/RunStateTallyTest.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/tracking/LongTreeTrackerTest2.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/tracking/LongTreeTrackerTest2.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/tracking/LongTreeTrackerTest2.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/tracking/LongTreeTrackerTest2.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/tracking/TreeTracker1024Test.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/tracking/TreeTracker1024Test.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/tracking/TreeTracker1024Test.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/activityimpl/tracking/TreeTracker1024Test.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/api/clireader/CLITest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/clireader/CLITest.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/api/clireader/CLITest.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/clireader/CLITest.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/api/metrics/DeltaHdrHistogramReservoirTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/metrics/DeltaHdrHistogramReservoirTest.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/api/metrics/DeltaHdrHistogramReservoirTest.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/metrics/DeltaHdrHistogramReservoirTest.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/api/metrics/HistoIntervalLoggerTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/metrics/HistoIntervalLoggerTest.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/api/metrics/HistoIntervalLoggerTest.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/metrics/HistoIntervalLoggerTest.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/api/metrics/NBMetricHistogramTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/metrics/NBMetricHistogramTest.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/api/metrics/NBMetricHistogramTest.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/metrics/NBMetricHistogramTest.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/api/metrics/TestHistoTypes.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/metrics/TestHistoTypes.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/api/metrics/TestHistoTypes.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/metrics/TestHistoTypes.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/api/scripting/GraalJsEvaluatorTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/scripting/GraalJsEvaluatorTest.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/api/scripting/GraalJsEvaluatorTest.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/scripting/GraalJsEvaluatorTest.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/api/util/SSLKsFactoryTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/util/SSLKsFactoryTest.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/api/util/SSLKsFactoryTest.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/util/SSLKsFactoryTest.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/api/util/SimpleConfigTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/util/SimpleConfigTest.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/api/util/SimpleConfigTest.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/util/SimpleConfigTest.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/api/util/UnitParserTests.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/util/UnitParserTests.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/api/util/UnitParserTests.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/api/util/UnitParserTests.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/core/ActivityExecutorTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/core/ActivityExecutorTest.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/core/ActivityExecutorTest.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/core/ActivityExecutorTest.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/core/CoreMotorTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/core/CoreMotorTest.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/core/CoreMotorTest.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/core/CoreMotorTest.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/core/NBBaseCommandTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/core/NBBaseCommandTest.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/core/NBBaseCommandTest.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/core/NBBaseCommandTest.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/core/lifecycle/session/CmdParserTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/core/lifecycle/session/CmdParserTest.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/core/lifecycle/session/CmdParserTest.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/core/lifecycle/session/CmdParserTest.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/core/lifecycle/session/NBSessionTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/core/lifecycle/session/NBSessionTest.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/core/lifecycle/session/NBSessionTest.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/core/lifecycle/session/NBSessionTest.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/core/metrics/MetricMapTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/core/metrics/MetricMapTest.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/core/metrics/MetricMapTest.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/core/metrics/MetricMapTest.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/core/metrics/NBMetricsSummaryTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/core/metrics/NBMetricsSummaryTest.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/core/metrics/NBMetricsSummaryTest.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/core/metrics/NBMetricsSummaryTest.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/core/script/NBBaseCommandParamsTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/core/script/NBBaseCommandParamsTest.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/core/script/NBBaseCommandParamsTest.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/core/script/NBBaseCommandParamsTest.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/sandbox/SimRateSanityTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/sandbox/SimRateSanityTest.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/sandbox/SimRateSanityTest.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/sandbox/SimRateSanityTest.java
diff --git a/engine-core/src/test/java/io/nosqlbench/engine/sandbox/SimRateTest.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/sandbox/SimRateTest.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/engine/sandbox/SimRateTest.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/engine/sandbox/SimRateTest.java
diff --git a/engine-core/src/test/java/io/nosqlbench/nb/AggregateTests.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/nb/AggregateTests.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/nb/AggregateTests.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/nb/AggregateTests.java
diff --git a/engine-core/src/test/java/io/nosqlbench/util/NBMock.java b/nb-engine/nb-engine-core/src/test/java/io/nosqlbench/util/NBMock.java
similarity index 100%
rename from engine-core/src/test/java/io/nosqlbench/util/NBMock.java
rename to nb-engine/nb-engine-core/src/test/java/io/nosqlbench/util/NBMock.java
diff --git a/engine-core/src/test/resources/activities/nested/testfile.txt b/nb-engine/nb-engine-core/src/test/resources/activities/nested/testfile.txt
similarity index 100%
rename from engine-core/src/test/resources/activities/nested/testfile.txt
rename to nb-engine/nb-engine-core/src/test/resources/activities/nested/testfile.txt
diff --git a/nb-api/src/test/resources/log4j2-test.xml b/nb-engine/nb-engine-core/src/test/resources/log4j2-test.xml
similarity index 100%
rename from nb-api/src/test/resources/log4j2-test.xml
rename to nb-engine/nb-engine-core/src/test/resources/log4j2-test.xml
diff --git a/engine-core/src/test/resources/scripts/futuresanitycheck.js b/nb-engine/nb-engine-core/src/test/resources/scripts/futuresanitycheck.js
similarity index 100%
rename from engine-core/src/test/resources/scripts/futuresanitycheck.js
rename to nb-engine/nb-engine-core/src/test/resources/scripts/futuresanitycheck.js
diff --git a/engine-core/src/test/resources/ssl/cacert.crt b/nb-engine/nb-engine-core/src/test/resources/ssl/cacert.crt
similarity index 100%
rename from engine-core/src/test/resources/ssl/cacert.crt
rename to nb-engine/nb-engine-core/src/test/resources/ssl/cacert.crt
diff --git a/engine-core/src/test/resources/ssl/client.key b/nb-engine/nb-engine-core/src/test/resources/ssl/client.key
similarity index 100%
rename from engine-core/src/test/resources/ssl/client.key
rename to nb-engine/nb-engine-core/src/test/resources/ssl/client.key
diff --git a/engine-core/src/test/resources/ssl/client.p12 b/nb-engine/nb-engine-core/src/test/resources/ssl/client.p12
similarity index 100%
rename from engine-core/src/test/resources/ssl/client.p12
rename to nb-engine/nb-engine-core/src/test/resources/ssl/client.p12
diff --git a/engine-core/src/test/resources/ssl/client_cert.pem b/nb-engine/nb-engine-core/src/test/resources/ssl/client_cert.pem
similarity index 100%
rename from engine-core/src/test/resources/ssl/client_cert.pem
rename to nb-engine/nb-engine-core/src/test/resources/ssl/client_cert.pem
diff --git a/engine-core/src/test/resources/ssl/client_diff_password.p12 b/nb-engine/nb-engine-core/src/test/resources/ssl/client_diff_password.p12
similarity index 100%
rename from engine-core/src/test/resources/ssl/client_diff_password.p12
rename to nb-engine/nb-engine-core/src/test/resources/ssl/client_diff_password.p12
diff --git a/engine-core/src/test/resources/ssl/server_truststore.p12 b/nb-engine/nb-engine-core/src/test/resources/ssl/server_truststore.p12
similarity index 100%
rename from engine-core/src/test/resources/ssl/server_truststore.p12
rename to nb-engine/nb-engine-core/src/test/resources/ssl/server_truststore.p12
diff --git a/engine-core/src/test/resources/testdocs/blocksonly.yaml b/nb-engine/nb-engine-core/src/test/resources/testdocs/blocksonly.yaml
similarity index 100%
rename from engine-core/src/test/resources/testdocs/blocksonly.yaml
rename to nb-engine/nb-engine-core/src/test/resources/testdocs/blocksonly.yaml
diff --git a/engine-core/src/test/resources/testdocs/invalid_both.yaml b/nb-engine/nb-engine-core/src/test/resources/testdocs/invalid_both.yaml
similarity index 100%
rename from engine-core/src/test/resources/testdocs/invalid_both.yaml
rename to nb-engine/nb-engine-core/src/test/resources/testdocs/invalid_both.yaml
diff --git a/engine-core/src/test/resources/testdocs/nested1/identity.yaml b/nb-engine/nb-engine-core/src/test/resources/testdocs/nested1/identity.yaml
similarity index 100%
rename from engine-core/src/test/resources/testdocs/nested1/identity.yaml
rename to nb-engine/nb-engine-core/src/test/resources/testdocs/nested1/identity.yaml
diff --git a/engine-core/src/test/resources/testdocs/sketch.yaml b/nb-engine/nb-engine-core/src/test/resources/testdocs/sketch.yaml
similarity index 100%
rename from engine-core/src/test/resources/testdocs/sketch.yaml
rename to nb-engine/nb-engine-core/src/test/resources/testdocs/sketch.yaml
diff --git a/engine-extensions/pom.xml b/nb-engine/nb-engine-extensions/pom.xml
similarity index 91%
rename from engine-extensions/pom.xml
rename to nb-engine/nb-engine-extensions/pom.xml
index d323da2c85..142c5c1a7e 100644
--- a/engine-extensions/pom.xml
+++ b/nb-engine/nb-engine-extensions/pom.xml
@@ -21,10 +21,10 @@
mvn-defaults
io.nosqlbench
${revision}
- ../mvn-defaults
+ ../../mvn-defaults
- engine-extensions
+ nb-engine-extensions
jar
${project.artifactId}
Scripting extensions for nosqlbench.
@@ -37,7 +37,7 @@
io.nosqlbench
- engine-core
+ nb-engine-core
${revision}
diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/ComputeFunctionPluginInfo.java b/nb-engine/nb-engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/ComputeFunctionPluginInfo.java
similarity index 100%
rename from engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/ComputeFunctionPluginInfo.java
rename to nb-engine/nb-engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/ComputeFunctionPluginInfo.java
diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/ComputeFunctions.java b/nb-engine/nb-engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/ComputeFunctions.java
similarity index 100%
rename from engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/ComputeFunctions.java
rename to nb-engine/nb-engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/ComputeFunctions.java
diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/Intersections.java b/nb-engine/nb-engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/Intersections.java
similarity index 100%
rename from engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/Intersections.java
rename to nb-engine/nb-engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/Intersections.java
diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/RelevancyFunctions.java b/nb-engine/nb-engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/RelevancyFunctions.java
similarity index 100%
rename from engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/RelevancyFunctions.java
rename to nb-engine/nb-engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/RelevancyFunctions.java
diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/AveragePrecision.java b/nb-engine/nb-engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/AveragePrecision.java
similarity index 100%
rename from engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/AveragePrecision.java
rename to nb-engine/nb-engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/AveragePrecision.java
diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/BaseRelevancyFunction.java b/nb-engine/nb-engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/BaseRelevancyFunction.java
similarity index 100%
rename from engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/BaseRelevancyFunction.java
rename to nb-engine/nb-engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/BaseRelevancyFunction.java
diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/F1.java b/nb-engine/nb-engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/F1.java
similarity index 100%
rename from engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/F1.java
rename to nb-engine/nb-engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/F1.java
diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/Precision.java b/nb-engine/nb-engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/Precision.java
similarity index 100%
rename from engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/Precision.java
rename to nb-engine/nb-engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/Precision.java
diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/Recall.java b/nb-engine/nb-engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/Recall.java
similarity index 100%
rename from engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/Recall.java
rename to nb-engine/nb-engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/Recall.java
diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/ReciprocalRank.java b/nb-engine/nb-engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/ReciprocalRank.java
similarity index 100%
rename from engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/ReciprocalRank.java
rename to nb-engine/nb-engine-extensions/src/main/java/io/nosqlbench/engine/extensions/computefunctions/relavency/ReciprocalRank.java
diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/example/ExamplePlugin.java b/nb-engine/nb-engine-extensions/src/main/java/io/nosqlbench/engine/extensions/example/ExamplePlugin.java
similarity index 100%
rename from engine-extensions/src/main/java/io/nosqlbench/engine/extensions/example/ExamplePlugin.java
rename to nb-engine/nb-engine-extensions/src/main/java/io/nosqlbench/engine/extensions/example/ExamplePlugin.java
diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/example/ExamplePluginData.java b/nb-engine/nb-engine-extensions/src/main/java/io/nosqlbench/engine/extensions/example/ExamplePluginData.java
similarity index 100%
rename from engine-extensions/src/main/java/io/nosqlbench/engine/extensions/example/ExamplePluginData.java
rename to nb-engine/nb-engine-extensions/src/main/java/io/nosqlbench/engine/extensions/example/ExamplePluginData.java
diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/example/example.md b/nb-engine/nb-engine-extensions/src/main/java/io/nosqlbench/engine/extensions/example/example.md
similarity index 100%
rename from engine-extensions/src/main/java/io/nosqlbench/engine/extensions/example/example.md
rename to nb-engine/nb-engine-extensions/src/main/java/io/nosqlbench/engine/extensions/example/example.md
diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/globalvars/GlobalVarsScriptingExtensionPluginData.java b/nb-engine/nb-engine-extensions/src/main/java/io/nosqlbench/engine/extensions/globalvars/GlobalVarsScriptingExtensionPluginData.java
similarity index 100%
rename from engine-extensions/src/main/java/io/nosqlbench/engine/extensions/globalvars/GlobalVarsScriptingExtensionPluginData.java
rename to nb-engine/nb-engine-extensions/src/main/java/io/nosqlbench/engine/extensions/globalvars/GlobalVarsScriptingExtensionPluginData.java
diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/globalvars/globalvars.md b/nb-engine/nb-engine-extensions/src/main/java/io/nosqlbench/engine/extensions/globalvars/globalvars.md
similarity index 100%
rename from engine-extensions/src/main/java/io/nosqlbench/engine/extensions/globalvars/globalvars.md
rename to nb-engine/nb-engine-extensions/src/main/java/io/nosqlbench/engine/extensions/globalvars/globalvars.md
diff --git a/engine-extensions/src/main/java/io/nosqlbench/engine/extensions/scriptingmetrics/ScriptingGauge.java b/nb-engine/nb-engine-extensions/src/main/java/io/nosqlbench/engine/extensions/scriptingmetrics/ScriptingGauge.java
similarity index 100%
rename from engine-extensions/src/main/java/io/nosqlbench/engine/extensions/scriptingmetrics/ScriptingGauge.java
rename to nb-engine/nb-engine-extensions/src/main/java/io/nosqlbench/engine/extensions/scriptingmetrics/ScriptingGauge.java
diff --git a/engine-extensions/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/nb-engine/nb-engine-extensions/src/main/resources/META-INF/services/javax.annotation.processing.Processor
similarity index 100%
rename from engine-extensions/src/main/resources/META-INF/services/javax.annotation.processing.Processor
rename to nb-engine/nb-engine-extensions/src/main/resources/META-INF/services/javax.annotation.processing.Processor
diff --git a/engine-extensions/src/test/java/io/nosqlbench/engine/extensions/computefunctions/ComputeFunctionsIntTest.java b/nb-engine/nb-engine-extensions/src/test/java/io/nosqlbench/engine/extensions/computefunctions/ComputeFunctionsIntTest.java
similarity index 100%
rename from engine-extensions/src/test/java/io/nosqlbench/engine/extensions/computefunctions/ComputeFunctionsIntTest.java
rename to nb-engine/nb-engine-extensions/src/test/java/io/nosqlbench/engine/extensions/computefunctions/ComputeFunctionsIntTest.java
diff --git a/engine-extensions/src/test/java/io/nosqlbench/engine/extensions/computefunctions/ComputeFunctionsLongTest.java b/nb-engine/nb-engine-extensions/src/test/java/io/nosqlbench/engine/extensions/computefunctions/ComputeFunctionsLongTest.java
similarity index 100%
rename from engine-extensions/src/test/java/io/nosqlbench/engine/extensions/computefunctions/ComputeFunctionsLongTest.java
rename to nb-engine/nb-engine-extensions/src/test/java/io/nosqlbench/engine/extensions/computefunctions/ComputeFunctionsLongTest.java
diff --git a/engine-extensions/src/test/java/io/nosqlbench/engine/extensions/csvoutput/CsvOutputPluginWriterTest.java b/nb-engine/nb-engine-extensions/src/test/java/io/nosqlbench/engine/extensions/csvoutput/CsvOutputPluginWriterTest.java
similarity index 100%
rename from engine-extensions/src/test/java/io/nosqlbench/engine/extensions/csvoutput/CsvOutputPluginWriterTest.java
rename to nb-engine/nb-engine-extensions/src/test/java/io/nosqlbench/engine/extensions/csvoutput/CsvOutputPluginWriterTest.java
diff --git a/engine-extensions/src/test/java/io/nosqlbench/optimizers/TestOptimoExperiments.java b/nb-engine/nb-engine-extensions/src/test/java/io/nosqlbench/optimizers/TestOptimoExperiments.java
similarity index 100%
rename from engine-extensions/src/test/java/io/nosqlbench/optimizers/TestOptimoExperiments.java
rename to nb-engine/nb-engine-extensions/src/test/java/io/nosqlbench/optimizers/TestOptimoExperiments.java
diff --git a/engine-extensions/src/test/java/io/nosqlbench/optimizers/TestOptimoExperiments2.java b/nb-engine/nb-engine-extensions/src/test/java/io/nosqlbench/optimizers/TestOptimoExperiments2.java
similarity index 100%
rename from engine-extensions/src/test/java/io/nosqlbench/optimizers/TestOptimoExperiments2.java
rename to nb-engine/nb-engine-extensions/src/test/java/io/nosqlbench/optimizers/TestOptimoExperiments2.java
diff --git a/nb-engine/pom.xml b/nb-engine/pom.xml
new file mode 100644
index 0000000000..c0b4ec1c6d
--- /dev/null
+++ b/nb-engine/pom.xml
@@ -0,0 +1,83 @@
+
+
+
+ 4.0.0
+
+
+ mvn-defaults
+ io.nosqlbench
+ ${revision}
+ ../mvn-defaults
+
+
+ nb-engine
+ pom
+ ${project.artifactId}
+ https://nosqlbench.io/
+
+
+ nb-engine-all
+ nb-engine-core
+ nb-engine-clients
+ nb-engine-cli
+ nb-engine-extensions
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ src/main/resources
+
+ META_INF/services/**
+ META-INF/functions
+ data/**
+ docs-for-virtdata/**
+ docs/**
+
+
+
+
+
+
+
diff --git a/virtdata-userlibs/pom.xml b/nb-virtdata/nb-virtdata-all/pom.xml
similarity index 73%
rename from virtdata-userlibs/pom.xml
rename to nb-virtdata/nb-virtdata-all/pom.xml
index 52b1d8a2e2..4ad822ba99 100644
--- a/virtdata-userlibs/pom.xml
+++ b/nb-virtdata/nb-virtdata-all/pom.xml
@@ -21,13 +21,13 @@
mvn-defaults
io.nosqlbench
${revision}
- ../mvn-defaults
+ ../../mvn-defaults
- virtdata-userlibs
+ nb-virtdata-all
jar
- virtdata-userlibs
- http://nosqlbench.io/
+ ${project.artifactId}
+ https://nosqlbench.io/
@@ -81,7 +81,7 @@
io.nosqlbench
- docsys
+ nb-docsys
${revision}
compile
@@ -89,30 +89,6 @@
-
-
- org.apache.maven.plugins
- maven-failsafe-plugin
-
-
-
- integration-test
- verify
-
-
-
-
-
- ${project.basedir}/target/virtdata-userlibs-${project.version}.jar
-
-
-
- **/*Integrated*Test*.java
-
-
-
-
-
src/main/resources
diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/VirtDataMainApp.java b/nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/VirtDataMainApp.java
similarity index 100%
rename from virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/VirtDataMainApp.java
rename to nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/VirtDataMainApp.java
diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/VirtDataService.java b/nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/VirtDataService.java
similarity index 100%
rename from virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/VirtDataService.java
rename to nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/VirtDataService.java
diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/diagnoseapp/VirtDataDiagnoseApp.java b/nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/diagnoseapp/VirtDataDiagnoseApp.java
similarity index 100%
rename from virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/diagnoseapp/VirtDataDiagnoseApp.java
rename to nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/diagnoseapp/VirtDataDiagnoseApp.java
diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/AutoDocsJson.java b/nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/AutoDocsJson.java
similarity index 100%
rename from virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/AutoDocsJson.java
rename to nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/AutoDocsJson.java
diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/AutoDocsWebService.java b/nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/AutoDocsWebService.java
similarity index 100%
rename from virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/AutoDocsWebService.java
rename to nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/AutoDocsWebService.java
diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/DocCtorDataView.java b/nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/DocCtorDataView.java
similarity index 100%
rename from virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/DocCtorDataView.java
rename to nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/DocCtorDataView.java
diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/DocFuncDataView.java b/nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/DocFuncDataView.java
similarity index 100%
rename from virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/DocFuncDataView.java
rename to nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/DocFuncDataView.java
diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/VirtDataGenDocsApp.java b/nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/VirtDataGenDocsApp.java
similarity index 100%
rename from virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/VirtDataGenDocsApp.java
rename to nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/VirtDataGenDocsApp.java
diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/docsinfo.json b/nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/docsinfo.json
similarity index 100%
rename from virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/docsinfo.json
rename to nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/docsinfo.json
diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDoc.java b/nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDoc.java
similarity index 100%
rename from virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDoc.java
rename to nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDoc.java
diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDocCat.java b/nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDocCat.java
similarity index 100%
rename from virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDocCat.java
rename to nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDocCat.java
diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDocCtor.java b/nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDocCtor.java
similarity index 100%
rename from virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDocCtor.java
rename to nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDocCtor.java
diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDocFunc.java b/nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDocFunc.java
similarity index 100%
rename from virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDocFunc.java
rename to nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDocFunc.java
diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDocFuncs.java b/nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDocFuncs.java
similarity index 100%
rename from virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDocFuncs.java
rename to nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/FDocFuncs.java
diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/package-info.java b/nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/package-info.java
similarity index 100%
rename from virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/package-info.java
rename to nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/package-info.java
diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/summarizer/DataSetSummary.java b/nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/summarizer/DataSetSummary.java
similarity index 100%
rename from virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/summarizer/DataSetSummary.java
rename to nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/summarizer/DataSetSummary.java
diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/summarizer/StageManager.java b/nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/summarizer/StageManager.java
similarity index 100%
rename from virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/summarizer/StageManager.java
rename to nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/summarizer/StageManager.java
diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/summarizer/ValueSummarizerApp.java b/nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/summarizer/ValueSummarizerApp.java
similarity index 100%
rename from virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/summarizer/ValueSummarizerApp.java
rename to nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/summarizer/ValueSummarizerApp.java
diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/summarizer/ValuesTask.java b/nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/summarizer/ValuesTask.java
similarity index 100%
rename from virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/summarizer/ValuesTask.java
rename to nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/summarizer/ValuesTask.java
diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuechecker/IndexedThreadFactory.java b/nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuechecker/IndexedThreadFactory.java
similarity index 100%
rename from virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuechecker/IndexedThreadFactory.java
rename to nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuechecker/IndexedThreadFactory.java
diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuechecker/LongHistogram.java b/nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuechecker/LongHistogram.java
similarity index 100%
rename from virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuechecker/LongHistogram.java
rename to nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuechecker/LongHistogram.java
diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuechecker/PostProcessor.java b/nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuechecker/PostProcessor.java
similarity index 100%
rename from virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuechecker/PostProcessor.java
rename to nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuechecker/PostProcessor.java
diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuechecker/RunData.java b/nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuechecker/RunData.java
similarity index 100%
rename from virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuechecker/RunData.java
rename to nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuechecker/RunData.java
diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuechecker/ValuesCheckerCoordinator.java b/nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuechecker/ValuesCheckerCoordinator.java
similarity index 100%
rename from virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuechecker/ValuesCheckerCoordinator.java
rename to nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuechecker/ValuesCheckerCoordinator.java
diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuechecker/ValuesCheckerExceptionHandler.java b/nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuechecker/ValuesCheckerExceptionHandler.java
similarity index 100%
rename from virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuechecker/ValuesCheckerExceptionHandler.java
rename to nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuechecker/ValuesCheckerExceptionHandler.java
diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuechecker/ValuesCheckerRunnable.java b/nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuechecker/ValuesCheckerRunnable.java
similarity index 100%
rename from virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuechecker/ValuesCheckerRunnable.java
rename to nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuechecker/ValuesCheckerRunnable.java
diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuechecker/VirtDataCheckPerfApp.java b/nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuechecker/VirtDataCheckPerfApp.java
similarity index 100%
rename from virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuechecker/VirtDataCheckPerfApp.java
rename to nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/apps/valuechecker/VirtDataCheckPerfApp.java
diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/docinfo/VirtdataMarkdownManifest.java b/nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/docinfo/VirtdataMarkdownManifest.java
similarity index 100%
rename from virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/docinfo/VirtdataMarkdownManifest.java
rename to nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/docinfo/VirtdataMarkdownManifest.java
diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/streams/ByteBufferStreams.java b/nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/streams/ByteBufferStreams.java
similarity index 100%
rename from virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/streams/ByteBufferStreams.java
rename to nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/streams/ByteBufferStreams.java
diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/streams/VirtDataStreams.java b/nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/streams/VirtDataStreams.java
similarity index 100%
rename from virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/streams/VirtDataStreams.java
rename to nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/streams/VirtDataStreams.java
diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/streams/fillers/ByteBufferFillable.java b/nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/streams/fillers/ByteBufferFillable.java
similarity index 100%
rename from virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/streams/fillers/ByteBufferFillable.java
rename to nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/streams/fillers/ByteBufferFillable.java
diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/streams/fillers/ByteBufferSource.java b/nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/streams/fillers/ByteBufferSource.java
similarity index 100%
rename from virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/streams/fillers/ByteBufferSource.java
rename to nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/streams/fillers/ByteBufferSource.java
diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/streams/fillers/ChunkedByteBuffer.java b/nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/streams/fillers/ChunkedByteBuffer.java
similarity index 100%
rename from virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/streams/fillers/ChunkedByteBuffer.java
rename to nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/streams/fillers/ChunkedByteBuffer.java
diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/streams/fillers/Fillable.java b/nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/streams/fillers/Fillable.java
similarity index 100%
rename from virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/streams/fillers/Fillable.java
rename to nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/streams/fillers/Fillable.java
diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/streams/fillers/IterableFiller.java b/nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/streams/fillers/IterableFiller.java
similarity index 100%
rename from virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/streams/fillers/IterableFiller.java
rename to nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/streams/fillers/IterableFiller.java
diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/streams/fillers/LongFunctionIterable.java b/nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/streams/fillers/LongFunctionIterable.java
similarity index 100%
rename from virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/streams/fillers/LongFunctionIterable.java
rename to nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/streams/fillers/LongFunctionIterable.java
diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/streams/package-info.java b/nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/streams/package-info.java
similarity index 100%
rename from virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/streams/package-info.java
rename to nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/streams/package-info.java
diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/streams/pojos/ByteBufferObject.java b/nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/streams/pojos/ByteBufferObject.java
similarity index 100%
rename from virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/streams/pojos/ByteBufferObject.java
rename to nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/streams/pojos/ByteBufferObject.java
diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/testing/ARandomPOJO.java b/nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/testing/ARandomPOJO.java
similarity index 100%
rename from virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/testing/ARandomPOJO.java
rename to nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/testing/ARandomPOJO.java
diff --git a/virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/testing/LongToLongPOJO.java b/nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/testing/LongToLongPOJO.java
similarity index 100%
rename from virtdata-userlibs/src/main/java/io/nosqlbench/virtdata/userlibs/testing/LongToLongPOJO.java
rename to nb-virtdata/nb-virtdata-all/src/main/java/io/nosqlbench/virtdata/userlibs/testing/LongToLongPOJO.java
diff --git a/virtdata-lib-basics/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/nb-virtdata/nb-virtdata-all/src/main/resources/META-INF/services/javax.annotation.processing.Processor
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/META-INF/services/javax.annotation.processing.Processor
rename to nb-virtdata/nb-virtdata-all/src/main/resources/META-INF/services/javax.annotation.processing.Processor
diff --git a/virtdata-userlibs/src/main/resources/docs-for-virtdata/bindings/concepts.md b/nb-virtdata/nb-virtdata-all/src/main/resources/docs-for-virtdata/bindings/concepts.md
similarity index 100%
rename from virtdata-userlibs/src/main/resources/docs-for-virtdata/bindings/concepts.md
rename to nb-virtdata/nb-virtdata-all/src/main/resources/docs-for-virtdata/bindings/concepts.md
diff --git a/virtdata-userlibs/src/main/resources/docs-for-virtdata/bindings/funcref_collections.md b/nb-virtdata/nb-virtdata-all/src/main/resources/docs-for-virtdata/bindings/funcref_collections.md
similarity index 100%
rename from virtdata-userlibs/src/main/resources/docs-for-virtdata/bindings/funcref_collections.md
rename to nb-virtdata/nb-virtdata-all/src/main/resources/docs-for-virtdata/bindings/funcref_collections.md
diff --git a/virtdata-userlibs/src/main/resources/docs-for-virtdata/bindings/funcref_conversion.md b/nb-virtdata/nb-virtdata-all/src/main/resources/docs-for-virtdata/bindings/funcref_conversion.md
similarity index 100%
rename from virtdata-userlibs/src/main/resources/docs-for-virtdata/bindings/funcref_conversion.md
rename to nb-virtdata/nb-virtdata-all/src/main/resources/docs-for-virtdata/bindings/funcref_conversion.md
diff --git a/virtdata-userlibs/src/main/resources/docs-for-virtdata/bindings/funcref_datetime.md b/nb-virtdata/nb-virtdata-all/src/main/resources/docs-for-virtdata/bindings/funcref_datetime.md
similarity index 100%
rename from virtdata-userlibs/src/main/resources/docs-for-virtdata/bindings/funcref_datetime.md
rename to nb-virtdata/nb-virtdata-all/src/main/resources/docs-for-virtdata/bindings/funcref_datetime.md
diff --git a/virtdata-userlibs/src/main/resources/docs-for-virtdata/bindings/funcref_diagnostics.md b/nb-virtdata/nb-virtdata-all/src/main/resources/docs-for-virtdata/bindings/funcref_diagnostics.md
similarity index 100%
rename from virtdata-userlibs/src/main/resources/docs-for-virtdata/bindings/funcref_diagnostics.md
rename to nb-virtdata/nb-virtdata-all/src/main/resources/docs-for-virtdata/bindings/funcref_diagnostics.md
diff --git a/virtdata-userlibs/src/main/resources/docs-for-virtdata/bindings/funcref_distributions.md b/nb-virtdata/nb-virtdata-all/src/main/resources/docs-for-virtdata/bindings/funcref_distributions.md
similarity index 100%
rename from virtdata-userlibs/src/main/resources/docs-for-virtdata/bindings/funcref_distributions.md
rename to nb-virtdata/nb-virtdata-all/src/main/resources/docs-for-virtdata/bindings/funcref_distributions.md
diff --git a/virtdata-userlibs/src/main/resources/docs-for-virtdata/bindings/funcref_functional.md b/nb-virtdata/nb-virtdata-all/src/main/resources/docs-for-virtdata/bindings/funcref_functional.md
similarity index 100%
rename from virtdata-userlibs/src/main/resources/docs-for-virtdata/bindings/funcref_functional.md
rename to nb-virtdata/nb-virtdata-all/src/main/resources/docs-for-virtdata/bindings/funcref_functional.md
diff --git a/virtdata-userlibs/src/main/resources/docs-for-virtdata/bindings/funcref_general.md b/nb-virtdata/nb-virtdata-all/src/main/resources/docs-for-virtdata/bindings/funcref_general.md
similarity index 100%
rename from virtdata-userlibs/src/main/resources/docs-for-virtdata/bindings/funcref_general.md
rename to nb-virtdata/nb-virtdata-all/src/main/resources/docs-for-virtdata/bindings/funcref_general.md
diff --git a/virtdata-userlibs/src/main/resources/docs-for-virtdata/bindings/funcref_nulls.md b/nb-virtdata/nb-virtdata-all/src/main/resources/docs-for-virtdata/bindings/funcref_nulls.md
similarity index 100%
rename from virtdata-userlibs/src/main/resources/docs-for-virtdata/bindings/funcref_nulls.md
rename to nb-virtdata/nb-virtdata-all/src/main/resources/docs-for-virtdata/bindings/funcref_nulls.md
diff --git a/virtdata-userlibs/src/main/resources/docs-for-virtdata/bindings/funcref_premade.md b/nb-virtdata/nb-virtdata-all/src/main/resources/docs-for-virtdata/bindings/funcref_premade.md
similarity index 100%
rename from virtdata-userlibs/src/main/resources/docs-for-virtdata/bindings/funcref_premade.md
rename to nb-virtdata/nb-virtdata-all/src/main/resources/docs-for-virtdata/bindings/funcref_premade.md
diff --git a/virtdata-userlibs/src/main/resources/docs-for-virtdata/bindings/funcref_state.md b/nb-virtdata/nb-virtdata-all/src/main/resources/docs-for-virtdata/bindings/funcref_state.md
similarity index 100%
rename from virtdata-userlibs/src/main/resources/docs-for-virtdata/bindings/funcref_state.md
rename to nb-virtdata/nb-virtdata-all/src/main/resources/docs-for-virtdata/bindings/funcref_state.md
diff --git a/virtdata-userlibs/src/main/resources/docs-for-virtdata/bindings/index.md b/nb-virtdata/nb-virtdata-all/src/main/resources/docs-for-virtdata/bindings/index.md
similarity index 100%
rename from virtdata-userlibs/src/main/resources/docs-for-virtdata/bindings/index.md
rename to nb-virtdata/nb-virtdata-all/src/main/resources/docs-for-virtdata/bindings/index.md
diff --git a/virtdata-userlibs/src/main/resources/docs-for-virtdata/bindings/using_bindings.md b/nb-virtdata/nb-virtdata-all/src/main/resources/docs-for-virtdata/bindings/using_bindings.md
similarity index 100%
rename from virtdata-userlibs/src/main/resources/docs-for-virtdata/bindings/using_bindings.md
rename to nb-virtdata/nb-virtdata-all/src/main/resources/docs-for-virtdata/bindings/using_bindings.md
diff --git a/virtdata-userlibs/src/main/resources/docs/category_blurbs/funcref_collections.md b/nb-virtdata/nb-virtdata-all/src/main/resources/docs/category_blurbs/funcref_collections.md
similarity index 100%
rename from virtdata-userlibs/src/main/resources/docs/category_blurbs/funcref_collections.md
rename to nb-virtdata/nb-virtdata-all/src/main/resources/docs/category_blurbs/funcref_collections.md
diff --git a/virtdata-userlibs/src/main/resources/docs/category_blurbs/funcref_conversion.md b/nb-virtdata/nb-virtdata-all/src/main/resources/docs/category_blurbs/funcref_conversion.md
similarity index 100%
rename from virtdata-userlibs/src/main/resources/docs/category_blurbs/funcref_conversion.md
rename to nb-virtdata/nb-virtdata-all/src/main/resources/docs/category_blurbs/funcref_conversion.md
diff --git a/virtdata-userlibs/src/main/resources/docs/category_blurbs/funcref_datetime.md b/nb-virtdata/nb-virtdata-all/src/main/resources/docs/category_blurbs/funcref_datetime.md
similarity index 100%
rename from virtdata-userlibs/src/main/resources/docs/category_blurbs/funcref_datetime.md
rename to nb-virtdata/nb-virtdata-all/src/main/resources/docs/category_blurbs/funcref_datetime.md
diff --git a/virtdata-userlibs/src/main/resources/docs/category_blurbs/funcref_diagnostics.md b/nb-virtdata/nb-virtdata-all/src/main/resources/docs/category_blurbs/funcref_diagnostics.md
similarity index 100%
rename from virtdata-userlibs/src/main/resources/docs/category_blurbs/funcref_diagnostics.md
rename to nb-virtdata/nb-virtdata-all/src/main/resources/docs/category_blurbs/funcref_diagnostics.md
diff --git a/virtdata-userlibs/src/main/resources/docs/category_blurbs/funcref_distributions.md b/nb-virtdata/nb-virtdata-all/src/main/resources/docs/category_blurbs/funcref_distributions.md
similarity index 100%
rename from virtdata-userlibs/src/main/resources/docs/category_blurbs/funcref_distributions.md
rename to nb-virtdata/nb-virtdata-all/src/main/resources/docs/category_blurbs/funcref_distributions.md
diff --git a/virtdata-userlibs/src/main/resources/docs/category_blurbs/funcref_functional.md b/nb-virtdata/nb-virtdata-all/src/main/resources/docs/category_blurbs/funcref_functional.md
similarity index 100%
rename from virtdata-userlibs/src/main/resources/docs/category_blurbs/funcref_functional.md
rename to nb-virtdata/nb-virtdata-all/src/main/resources/docs/category_blurbs/funcref_functional.md
diff --git a/virtdata-userlibs/src/main/resources/docs/category_blurbs/funcref_general.md b/nb-virtdata/nb-virtdata-all/src/main/resources/docs/category_blurbs/funcref_general.md
similarity index 100%
rename from virtdata-userlibs/src/main/resources/docs/category_blurbs/funcref_general.md
rename to nb-virtdata/nb-virtdata-all/src/main/resources/docs/category_blurbs/funcref_general.md
diff --git a/virtdata-userlibs/src/main/resources/docs/category_blurbs/funcref_nulls.md b/nb-virtdata/nb-virtdata-all/src/main/resources/docs/category_blurbs/funcref_nulls.md
similarity index 100%
rename from virtdata-userlibs/src/main/resources/docs/category_blurbs/funcref_nulls.md
rename to nb-virtdata/nb-virtdata-all/src/main/resources/docs/category_blurbs/funcref_nulls.md
diff --git a/virtdata-userlibs/src/main/resources/docs/category_blurbs/funcref_premade.md b/nb-virtdata/nb-virtdata-all/src/main/resources/docs/category_blurbs/funcref_premade.md
similarity index 100%
rename from virtdata-userlibs/src/main/resources/docs/category_blurbs/funcref_premade.md
rename to nb-virtdata/nb-virtdata-all/src/main/resources/docs/category_blurbs/funcref_premade.md
diff --git a/virtdata-userlibs/src/main/resources/docs/category_blurbs/funcref_state.md b/nb-virtdata/nb-virtdata-all/src/main/resources/docs/category_blurbs/funcref_state.md
similarity index 100%
rename from virtdata-userlibs/src/main/resources/docs/category_blurbs/funcref_state.md
rename to nb-virtdata/nb-virtdata-all/src/main/resources/docs/category_blurbs/funcref_state.md
diff --git a/virtdata-userlibs/src/main/resources/docs/valueschecker.md b/nb-virtdata/nb-virtdata-all/src/main/resources/docs/valueschecker.md
similarity index 100%
rename from virtdata-userlibs/src/main/resources/docs/valueschecker.md
rename to nb-virtdata/nb-virtdata-all/src/main/resources/docs/valueschecker.md
diff --git a/nbr-examples/src/main/resources/log4j2.xml b/nb-virtdata/nb-virtdata-all/src/main/resources/log4j2.xml
similarity index 100%
rename from nbr-examples/src/main/resources/log4j2.xml
rename to nb-virtdata/nb-virtdata-all/src/main/resources/log4j2.xml
diff --git a/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/core/VirtDataDocsIntegratedTest.java b/nb-virtdata/nb-virtdata-all/src/test/java/io/nosqlbench/virtdata/core/VirtDataDocsIntegratedTest.java
similarity index 100%
rename from virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/core/VirtDataDocsIntegratedTest.java
rename to nb-virtdata/nb-virtdata-all/src/test/java/io/nosqlbench/virtdata/core/VirtDataDocsIntegratedTest.java
diff --git a/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/FDocFuncsTest.java b/nb-virtdata/nb-virtdata-all/src/test/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/FDocFuncsTest.java
similarity index 100%
rename from virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/FDocFuncsTest.java
rename to nb-virtdata/nb-virtdata-all/src/test/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/FDocFuncsTest.java
diff --git a/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/ExampleDocFunc1.java b/nb-virtdata/nb-virtdata-all/src/test/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/ExampleDocFunc1.java
similarity index 100%
rename from virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/ExampleDocFunc1.java
rename to nb-virtdata/nb-virtdata-all/src/test/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/ExampleDocFunc1.java
diff --git a/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/ExampleDocFunc2.java b/nb-virtdata/nb-virtdata-all/src/test/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/ExampleDocFunc2.java
similarity index 100%
rename from virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/ExampleDocFunc2.java
rename to nb-virtdata/nb-virtdata-all/src/test/java/io/nosqlbench/virtdata/userlibs/apps/docsapp/fdocs/ExampleDocFunc2.java
diff --git a/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/userlibs/streams/fillers/ChunkedByteBufferTest.java b/nb-virtdata/nb-virtdata-all/src/test/java/io/nosqlbench/virtdata/userlibs/streams/fillers/ChunkedByteBufferTest.java
similarity index 100%
rename from virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/userlibs/streams/fillers/ChunkedByteBufferTest.java
rename to nb-virtdata/nb-virtdata-all/src/test/java/io/nosqlbench/virtdata/userlibs/streams/fillers/ChunkedByteBufferTest.java
diff --git a/virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/userlibs/streams/pojos/ByteBufferFillableTest.java b/nb-virtdata/nb-virtdata-all/src/test/java/io/nosqlbench/virtdata/userlibs/streams/pojos/ByteBufferFillableTest.java
similarity index 100%
rename from virtdata-userlibs/src/test/java/io/nosqlbench/virtdata/userlibs/streams/pojos/ByteBufferFillableTest.java
rename to nb-virtdata/nb-virtdata-all/src/test/java/io/nosqlbench/virtdata/userlibs/streams/pojos/ByteBufferFillableTest.java
diff --git a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedAliasMethodTests.java b/nb-virtdata/nb-virtdata-all/src/test/java/io/virtdata/IntegratedAliasMethodTests.java
similarity index 100%
rename from virtdata-userlibs/src/test/java/io/virtdata/IntegratedAliasMethodTests.java
rename to nb-virtdata/nb-virtdata-all/src/test/java/io/virtdata/IntegratedAliasMethodTests.java
diff --git a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedBindingsTest.java b/nb-virtdata/nb-virtdata-all/src/test/java/io/virtdata/IntegratedBindingsTest.java
similarity index 100%
rename from virtdata-userlibs/src/test/java/io/virtdata/IntegratedBindingsTest.java
rename to nb-virtdata/nb-virtdata-all/src/test/java/io/virtdata/IntegratedBindingsTest.java
diff --git a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedComposerLibraryTest.java b/nb-virtdata/nb-virtdata-all/src/test/java/io/virtdata/IntegratedComposerLibraryTest.java
similarity index 100%
rename from virtdata-userlibs/src/test/java/io/virtdata/IntegratedComposerLibraryTest.java
rename to nb-virtdata/nb-virtdata-all/src/test/java/io/virtdata/IntegratedComposerLibraryTest.java
diff --git a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedComposerLogicTest.java b/nb-virtdata/nb-virtdata-all/src/test/java/io/virtdata/IntegratedComposerLogicTest.java
similarity index 100%
rename from virtdata-userlibs/src/test/java/io/virtdata/IntegratedComposerLogicTest.java
rename to nb-virtdata/nb-virtdata-all/src/test/java/io/virtdata/IntegratedComposerLogicTest.java
diff --git a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedCurvesTest.java b/nb-virtdata/nb-virtdata-all/src/test/java/io/virtdata/IntegratedCurvesTest.java
similarity index 100%
rename from virtdata-userlibs/src/test/java/io/virtdata/IntegratedCurvesTest.java
rename to nb-virtdata/nb-virtdata-all/src/test/java/io/virtdata/IntegratedCurvesTest.java
diff --git a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedRealerTests.java b/nb-virtdata/nb-virtdata-all/src/test/java/io/virtdata/IntegratedRealerTests.java
similarity index 100%
rename from virtdata-userlibs/src/test/java/io/virtdata/IntegratedRealerTests.java
rename to nb-virtdata/nb-virtdata-all/src/test/java/io/virtdata/IntegratedRealerTests.java
diff --git a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedStringBindingsTest.java b/nb-virtdata/nb-virtdata-all/src/test/java/io/virtdata/IntegratedStringBindingsTest.java
similarity index 100%
rename from virtdata-userlibs/src/test/java/io/virtdata/IntegratedStringBindingsTest.java
rename to nb-virtdata/nb-virtdata-all/src/test/java/io/virtdata/IntegratedStringBindingsTest.java
diff --git a/virtdata-userlibs/src/test/java/io/virtdata/IntegratedTemporalExamplesTest.java b/nb-virtdata/nb-virtdata-all/src/test/java/io/virtdata/IntegratedTemporalExamplesTest.java
similarity index 100%
rename from virtdata-userlibs/src/test/java/io/virtdata/IntegratedTemporalExamplesTest.java
rename to nb-virtdata/nb-virtdata-all/src/test/java/io/virtdata/IntegratedTemporalExamplesTest.java
diff --git a/nbr-examples/src/test/resources/log4j2-test.xml b/nb-virtdata/nb-virtdata-all/src/test/resources/log4j2-test.xml
similarity index 100%
rename from nbr-examples/src/test/resources/log4j2-test.xml
rename to nb-virtdata/nb-virtdata-all/src/test/resources/log4j2-test.xml
diff --git a/nb-virtdata/pom.xml b/nb-virtdata/pom.xml
new file mode 100644
index 0000000000..4dfc1e3477
--- /dev/null
+++ b/nb-virtdata/pom.xml
@@ -0,0 +1,85 @@
+
+
+
+ 4.0.0
+
+
+ mvn-defaults
+ io.nosqlbench
+ ${revision}
+ ../mvn-defaults
+
+
+ nb-virtdata
+ pom
+ ${project.artifactId}
+ https://nosqlbench.io/
+
+
+ virtdata-lang
+ virtdata-realdata
+ virtdata-lib-basics
+ virtdata-lib-random
+ virtdata-lib-curves4
+ virtdata-lib-realer
+ virtdata-lib-hdf5
+ virtdata-lib-vectors
+ virtdata-api
+ nb-virtdata-all
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-failsafe-plugin
+
+
+
+ integration-test
+ verify
+
+
+
+
+
+ ${project.basedir}/target/virtdata-userlibs-${project.version}.jar
+
+
+
+ **/*Integrated*Test*.java
+
+
+
+
+
+
+
+ src/main/resources
+
+ META_INF/services/**
+ META-INF/functions
+ data/**
+ docs-for-virtdata/**
+ docs/**
+
+
+
+
+
+
+
diff --git a/virtdata-api/docs/custom_elements.md b/nb-virtdata/virtdata-api/docs/custom_elements.md
similarity index 100%
rename from virtdata-api/docs/custom_elements.md
rename to nb-virtdata/virtdata-api/docs/custom_elements.md
diff --git a/virtdata-api/pom.xml b/nb-virtdata/virtdata-api/pom.xml
similarity index 97%
rename from virtdata-api/pom.xml
rename to nb-virtdata/virtdata-api/pom.xml
index 133aea0b4e..c2d98b1f01 100644
--- a/virtdata-api/pom.xml
+++ b/nb-virtdata/virtdata-api/pom.xml
@@ -25,11 +25,11 @@
io.nosqlbench
mvn-defaults
${revision}
- ../mvn-defaults
+ ../../mvn-defaults
virtdata-api
- http://nosqlbench.io/
+ https://nosqlbench.io/
The internal API module for Virtual Data Set modules. Each module that provides
mapping functions should only have to depend on this module to get all the dependencies
diff --git a/virtdata-api/src/main/java/io/nosqlbench/adapters/api/templating/TriFunction.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/adapters/api/templating/TriFunction.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/adapters/api/templating/TriFunction.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/adapters/api/templating/TriFunction.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/ObjectCache.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/ObjectCache.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/ObjectCache.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/ObjectCache.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/ParsedSpanType.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/ParsedSpanType.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/ParsedSpanType.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/ParsedSpanType.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/ParsedTemplateList.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/ParsedTemplateList.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/ParsedTemplateList.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/ParsedTemplateList.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/ParsedTemplateMap.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/ParsedTemplateMap.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/ParsedTemplateMap.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/ParsedTemplateMap.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/Templatizer.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/Templatizer.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/Templatizer.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/Templatizer.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/TypeAndTarget.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/TypeAndTarget.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/TypeAndTarget.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/TypeAndTarget.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/binders/ArrayBinder.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/binders/ArrayBinder.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/binders/ArrayBinder.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/binders/ArrayBinder.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/binders/ListBinder.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/binders/ListBinder.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/binders/ListBinder.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/binders/ListBinder.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/binders/OrderedMapBinder.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/binders/OrderedMapBinder.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/binders/OrderedMapBinder.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/engine/api/templating/binders/OrderedMapBinder.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Categories.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Categories.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Categories.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Categories.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Category.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Category.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Category.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Category.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/DeprecatedFunction.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/DeprecatedFunction.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/DeprecatedFunction.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/DeprecatedFunction.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Description.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Description.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Description.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Description.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Example.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Example.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Example.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Example.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/ExampleData.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/ExampleData.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/ExampleData.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/ExampleData.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Examples.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Examples.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Examples.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Examples.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Input.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Input.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Input.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Input.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Output.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Output.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Output.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Output.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/PerThreadMapper.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/PerThreadMapper.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/PerThreadMapper.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/PerThreadMapper.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Range.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Range.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Range.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/Range.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/See.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/See.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/See.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/See.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/SeeList.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/SeeList.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/SeeList.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/SeeList.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/ThreadSafeMapper.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/ThreadSafeMapper.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/ThreadSafeMapper.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/annotations/ThreadSafeMapper.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/bindings/NBFunctionConverter.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/bindings/NBFunctionConverter.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/bindings/NBFunctionConverter.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/bindings/NBFunctionConverter.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/bindings/VALUE.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/bindings/VALUE.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/bindings/VALUE.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/bindings/VALUE.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/bindings/VirtDataConversions.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/bindings/VirtDataConversions.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/bindings/VirtDataConversions.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/bindings/VirtDataConversions.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/bindings/VirtDataFunctions.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/bindings/VirtDataFunctions.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/bindings/VirtDataFunctions.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/bindings/VirtDataFunctions.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocCtorData.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocCtorData.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocCtorData.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocCtorData.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocForFunc.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocForFunc.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocForFunc.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocForFunc.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocForFuncCtor.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocForFuncCtor.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocForFuncCtor.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocForFuncCtor.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocFuncData.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocFuncData.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocFuncData.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/DocFuncData.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/ExampleDocData.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/ExampleDocData.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/ExampleDocData.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/ExampleDocData.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/ExampleManifest.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/ExampleManifest.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/ExampleManifest.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/ExampleManifest.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FuncEnumerator.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FuncEnumerator.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FuncEnumerator.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FuncEnumerator.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionDocInfoProcessor.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionDocInfoProcessor.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionDocInfoProcessor.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionDocInfoProcessor.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionDocInfoWriter.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionDocInfoWriter.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionDocInfoWriter.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionDocInfoWriter.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionManifestProcessor.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionManifestProcessor.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionManifestProcessor.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/FunctionManifestProcessor.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/ProcessorClassNames.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/ProcessorClassNames.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/ProcessorClassNames.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/api/processors/ProcessorClassNames.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ArgsComparator.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ArgsComparator.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ArgsComparator.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ArgsComparator.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/Binder.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/Binder.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/Binder.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/Binder.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/Bindings.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/Bindings.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/Bindings.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/Bindings.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/BindingsCache.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/BindingsCache.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/BindingsCache.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/BindingsCache.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/BindingsTemplate.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/BindingsTemplate.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/BindingsTemplate.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/BindingsTemplate.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualArrayBindings.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualArrayBindings.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualArrayBindings.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualArrayBindings.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualBindings.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualBindings.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualBindings.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualBindings.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualBindingsArrayTemplate.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualBindingsArrayTemplate.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualBindingsArrayTemplate.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualBindingsArrayTemplate.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualBindingsTemplate.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualBindingsTemplate.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualBindingsTemplate.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualBindingsTemplate.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualMapBindings.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualMapBindings.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualMapBindings.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ContextualMapBindings.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapper.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapper.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapper.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapper.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapperFunctionMapper.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapperFunctionMapper.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapperFunctionMapper.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapperFunctionMapper.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapperLibrary.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapperLibrary.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapperLibrary.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapperLibrary.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapperLibraryFinder.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapperLibraryFinder.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapperLibraryFinder.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/DataMapperLibraryFinder.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/FunctionType.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/FunctionType.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/FunctionType.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/FunctionType.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/FunctionTyper.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/FunctionTyper.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/FunctionTyper.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/FunctionTyper.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/LazyValuesMap.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/LazyValuesMap.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/LazyValuesMap.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/LazyValuesMap.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ResolvedFunction.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ResolvedFunction.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ResolvedFunction.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ResolvedFunction.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ResolverDiagnostics.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ResolverDiagnostics.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ResolverDiagnostics.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ResolverDiagnostics.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/StringObjectPromoter.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/StringObjectPromoter.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/StringObjectPromoter.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/StringObjectPromoter.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ValueType.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ValueType.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ValueType.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ValueType.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ValuesArrayBinder.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ValuesArrayBinder.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ValuesArrayBinder.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ValuesArrayBinder.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ValuesBinder.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ValuesBinder.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ValuesBinder.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ValuesBinder.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ValuesMapBinder.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ValuesMapBinder.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ValuesMapBinder.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/ValuesMapBinder.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtData.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtData.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtData.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtData.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataComposer.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataComposer.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataComposer.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataComposer.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataDocs.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataDocs.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataDocs.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataDocs.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctionFinder.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctionFinder.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctionFinder.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctionFinder.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctionLibrary.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctionLibrary.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctionLibrary.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctionLibrary.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctionResolver.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctionResolver.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctionResolver.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctionResolver.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataLibraries.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataLibraries.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataLibraries.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataLibraries.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataLibrary.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataLibrary.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataLibrary.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/bindings/VirtDataLibrary.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForDoubleFunction.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForDoubleFunction.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForDoubleFunction.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForDoubleFunction.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForDoubleToIntFunction.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForDoubleToIntFunction.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForDoubleToIntFunction.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForDoubleToIntFunction.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForDoubleToLongFunction.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForDoubleToLongFunction.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForDoubleToLongFunction.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForDoubleToLongFunction.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForDoubleUnaryOperator.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForDoubleUnaryOperator.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForDoubleUnaryOperator.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForDoubleUnaryOperator.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForFunction.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForFunction.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForFunction.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForFunction.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForIntFunction.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForIntFunction.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForIntFunction.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForIntFunction.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForIntToDoubleFunction.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForIntToDoubleFunction.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForIntToDoubleFunction.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForIntToDoubleFunction.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForIntToLongFunction.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForIntToLongFunction.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForIntToLongFunction.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForIntToLongFunction.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForIntUnaryOperator.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForIntUnaryOperator.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForIntUnaryOperator.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForIntUnaryOperator.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForLongFunction.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForLongFunction.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForLongFunction.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForLongFunction.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForLongToDoubleFunction.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForLongToDoubleFunction.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForLongToDoubleFunction.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForLongToDoubleFunction.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForLongToIntFunction.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForLongToIntFunction.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForLongToIntFunction.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForLongToIntFunction.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForLongUnaryOperator.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForLongUnaryOperator.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForLongUnaryOperator.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/ComposerForLongUnaryOperator.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/FunctionAssembly.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/FunctionAssembly.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/FunctionAssembly.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/FunctionAssembly.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/FunctionComposer.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/FunctionComposer.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/FunctionComposer.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/composers/FunctionComposer.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/BindPoint.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/BindPoint.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/BindPoint.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/BindPoint.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/BindPointParser.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/BindPointParser.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/BindPointParser.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/BindPointParser.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/CSVBindings.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/CSVBindings.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/CSVBindings.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/CSVBindings.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/CSVBindingsTemplate.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/CSVBindingsTemplate.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/CSVBindingsTemplate.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/CSVBindingsTemplate.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/CapturePoint.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/CapturePoint.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/CapturePoint.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/CapturePoint.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/CapturePointParser.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/CapturePointParser.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/CapturePointParser.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/CapturePointParser.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/ParsedTemplateString.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/ParsedTemplateString.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/ParsedTemplateString.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/ParsedTemplateString.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/StringBindings.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/StringBindings.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/StringBindings.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/StringBindings.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/StringBindingsTemplate.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/StringBindingsTemplate.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/StringBindingsTemplate.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/StringBindingsTemplate.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/StringCompositor.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/StringCompositor.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/StringCompositor.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/StringCompositor.java
diff --git a/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/StringMapCompositor.java b/nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/StringMapCompositor.java
similarity index 100%
rename from virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/StringMapCompositor.java
rename to nb-virtdata/virtdata-api/src/main/java/io/nosqlbench/virtdata/core/templates/StringMapCompositor.java
diff --git a/virtdata-api/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/nb-virtdata/virtdata-api/src/main/resources/META-INF/services/javax.annotation.processing.Processor
similarity index 100%
rename from virtdata-api/src/main/resources/META-INF/services/javax.annotation.processing.Processor
rename to nb-virtdata/virtdata-api/src/main/resources/META-INF/services/javax.annotation.processing.Processor
diff --git a/virtdata-api/src/main/resources/virtdata.md b/nb-virtdata/virtdata-api/src/main/resources/virtdata.md
similarity index 100%
rename from virtdata-api/src/main/resources/virtdata.md
rename to nb-virtdata/virtdata-api/src/main/resources/virtdata.md
diff --git a/virtdata-api/src/test/java/io/nosqlbench/engine/api/templating/ParsedTemplateListTest.java b/nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/engine/api/templating/ParsedTemplateListTest.java
similarity index 100%
rename from virtdata-api/src/test/java/io/nosqlbench/engine/api/templating/ParsedTemplateListTest.java
rename to nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/engine/api/templating/ParsedTemplateListTest.java
diff --git a/virtdata-api/src/test/java/io/nosqlbench/engine/api/templating/ParsedTemplateMapTest.java b/nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/engine/api/templating/ParsedTemplateMapTest.java
similarity index 100%
rename from virtdata-api/src/test/java/io/nosqlbench/engine/api/templating/ParsedTemplateMapTest.java
rename to nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/engine/api/templating/ParsedTemplateMapTest.java
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/annotations/ExampleDataTest.java b/nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/annotations/ExampleDataTest.java
similarity index 100%
rename from virtdata-api/src/test/java/io/nosqlbench/virtdata/annotations/ExampleDataTest.java
rename to nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/annotations/ExampleDataTest.java
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/api/bindings/VirtDataConversionsTest.java b/nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/api/bindings/VirtDataConversionsTest.java
similarity index 100%
rename from virtdata-api/src/test/java/io/nosqlbench/virtdata/api/bindings/VirtDataConversionsTest.java
rename to nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/api/bindings/VirtDataConversionsTest.java
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/ResolvedFunctionTest.java b/nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/ResolvedFunctionTest.java
similarity index 100%
rename from virtdata-api/src/test/java/io/nosqlbench/virtdata/core/ResolvedFunctionTest.java
rename to nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/ResolvedFunctionTest.java
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/VirtDataComposerTest.java b/nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/VirtDataComposerTest.java
similarity index 100%
rename from virtdata-api/src/test/java/io/nosqlbench/virtdata/core/VirtDataComposerTest.java
rename to nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/VirtDataComposerTest.java
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/VirtDataTest.java b/nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/VirtDataTest.java
similarity index 100%
rename from virtdata-api/src/test/java/io/nosqlbench/virtdata/core/VirtDataTest.java
rename to nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/VirtDataTest.java
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/bindings/ArgsComparatorTest.java b/nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/bindings/ArgsComparatorTest.java
similarity index 100%
rename from virtdata-api/src/test/java/io/nosqlbench/virtdata/core/bindings/ArgsComparatorTest.java
rename to nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/bindings/ArgsComparatorTest.java
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctionResolverTest.java b/nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctionResolverTest.java
similarity index 100%
rename from virtdata-api/src/test/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctionResolverTest.java
rename to nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/bindings/VirtDataFunctionResolverTest.java
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/composers/FunctionAssemblerMatrixTest.java b/nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/composers/FunctionAssemblerMatrixTest.java
similarity index 100%
rename from virtdata-api/src/test/java/io/nosqlbench/virtdata/core/composers/FunctionAssemblerMatrixTest.java
rename to nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/composers/FunctionAssemblerMatrixTest.java
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/composers/FunctionAssemblerTest.java b/nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/composers/FunctionAssemblerTest.java
similarity index 100%
rename from virtdata-api/src/test/java/io/nosqlbench/virtdata/core/composers/FunctionAssemblerTest.java
rename to nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/composers/FunctionAssemblerTest.java
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/config/ConfigDataTest.java b/nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/config/ConfigDataTest.java
similarity index 100%
rename from virtdata-api/src/test/java/io/nosqlbench/virtdata/core/config/ConfigDataTest.java
rename to nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/config/ConfigDataTest.java
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/BindPointParserTest.java b/nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/BindPointParserTest.java
similarity index 100%
rename from virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/BindPointParserTest.java
rename to nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/BindPointParserTest.java
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/CapturePointParserTest.java b/nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/CapturePointParserTest.java
similarity index 100%
rename from virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/CapturePointParserTest.java
rename to nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/CapturePointParserTest.java
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/CapturePointTest.java b/nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/CapturePointTest.java
similarity index 100%
rename from virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/CapturePointTest.java
rename to nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/CapturePointTest.java
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/FastStringCompositorTest.java b/nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/FastStringCompositorTest.java
similarity index 100%
rename from virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/FastStringCompositorTest.java
rename to nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/FastStringCompositorTest.java
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/ParsedTemplateStringTest.java b/nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/ParsedTemplateStringTest.java
similarity index 100%
rename from virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/ParsedTemplateStringTest.java
rename to nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/ParsedTemplateStringTest.java
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/StringBindingsTemplateTest.java b/nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/StringBindingsTemplateTest.java
similarity index 100%
rename from virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/StringBindingsTemplateTest.java
rename to nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/StringBindingsTemplateTest.java
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/StringCompositorTest.java b/nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/StringCompositorTest.java
similarity index 100%
rename from virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/StringCompositorTest.java
rename to nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/StringCompositorTest.java
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/TestIdentity.java b/nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/TestIdentity.java
similarity index 100%
rename from virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/TestIdentity.java
rename to nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/TestIdentity.java
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/TestValue.java b/nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/TestValue.java
similarity index 100%
rename from virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/TestValue.java
rename to nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/TestValue.java
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/ValueTypeTest.java b/nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/ValueTypeTest.java
similarity index 100%
rename from virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/ValueTypeTest.java
rename to nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/core/templates/ValueTypeTest.java
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/testmappers/TestableTemplate.java b/nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/testmappers/TestableTemplate.java
similarity index 100%
rename from virtdata-api/src/test/java/io/nosqlbench/virtdata/testmappers/TestableTemplate.java
rename to nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/testmappers/TestableTemplate.java
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/testmappers/TestableTemplateTest.java b/nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/testmappers/TestableTemplateTest.java
similarity index 100%
rename from virtdata-api/src/test/java/io/nosqlbench/virtdata/testmappers/TestableTemplateTest.java
rename to nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/testmappers/TestableTemplateTest.java
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/testmappers/TestingRepeater.java b/nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/testmappers/TestingRepeater.java
similarity index 100%
rename from virtdata-api/src/test/java/io/nosqlbench/virtdata/testmappers/TestingRepeater.java
rename to nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/testmappers/TestingRepeater.java
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/testmappers/TestingStringFunc.java b/nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/testmappers/TestingStringFunc.java
similarity index 100%
rename from virtdata-api/src/test/java/io/nosqlbench/virtdata/testmappers/TestingStringFunc.java
rename to nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/testmappers/TestingStringFunc.java
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/util/StringObjectPromoterTest.java b/nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/util/StringObjectPromoterTest.java
similarity index 100%
rename from virtdata-api/src/test/java/io/nosqlbench/virtdata/util/StringObjectPromoterTest.java
rename to nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/util/StringObjectPromoterTest.java
diff --git a/virtdata-api/src/test/java/io/nosqlbench/virtdata/util/VirtDataFunctionsTest.java b/nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/util/VirtDataFunctionsTest.java
similarity index 100%
rename from virtdata-api/src/test/java/io/nosqlbench/virtdata/util/VirtDataFunctionsTest.java
rename to nb-virtdata/virtdata-api/src/test/java/io/nosqlbench/virtdata/util/VirtDataFunctionsTest.java
diff --git a/virtdata-lang/pom.xml b/nb-virtdata/virtdata-lang/pom.xml
similarity index 97%
rename from virtdata-lang/pom.xml
rename to nb-virtdata/virtdata-lang/pom.xml
index cd97583c8b..9ba35d47e9 100644
--- a/virtdata-lang/pom.xml
+++ b/nb-virtdata/virtdata-lang/pom.xml
@@ -24,11 +24,11 @@
mvn-defaults
io.nosqlbench
${revision}
- ../mvn-defaults
+ ../../mvn-defaults
virtdata-lang
- http://nosqlbench.io/
+ https://nosqlbench.io/
diff --git a/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/ArgType.java b/nb-virtdata/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/ArgType.java
similarity index 100%
rename from virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/ArgType.java
rename to nb-virtdata/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/ArgType.java
diff --git a/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/Assignment.java b/nb-virtdata/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/Assignment.java
similarity index 100%
rename from virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/Assignment.java
rename to nb-virtdata/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/Assignment.java
diff --git a/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/BooleanArg.java b/nb-virtdata/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/BooleanArg.java
similarity index 100%
rename from virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/BooleanArg.java
rename to nb-virtdata/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/BooleanArg.java
diff --git a/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/DoubleArg.java b/nb-virtdata/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/DoubleArg.java
similarity index 100%
rename from virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/DoubleArg.java
rename to nb-virtdata/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/DoubleArg.java
diff --git a/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/Expression.java b/nb-virtdata/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/Expression.java
similarity index 100%
rename from virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/Expression.java
rename to nb-virtdata/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/Expression.java
diff --git a/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/FloatArg.java b/nb-virtdata/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/FloatArg.java
similarity index 100%
rename from virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/FloatArg.java
rename to nb-virtdata/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/FloatArg.java
diff --git a/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/FunctionCall.java b/nb-virtdata/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/FunctionCall.java
similarity index 100%
rename from virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/FunctionCall.java
rename to nb-virtdata/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/FunctionCall.java
diff --git a/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/IntegerArg.java b/nb-virtdata/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/IntegerArg.java
similarity index 100%
rename from virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/IntegerArg.java
rename to nb-virtdata/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/IntegerArg.java
diff --git a/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/LongArg.java b/nb-virtdata/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/LongArg.java
similarity index 100%
rename from virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/LongArg.java
rename to nb-virtdata/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/LongArg.java
diff --git a/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/RefArg.java b/nb-virtdata/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/RefArg.java
similarity index 100%
rename from virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/RefArg.java
rename to nb-virtdata/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/RefArg.java
diff --git a/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/StringArg.java b/nb-virtdata/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/StringArg.java
similarity index 100%
rename from virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/StringArg.java
rename to nb-virtdata/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/StringArg.java
diff --git a/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/VariableRef.java b/nb-virtdata/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/VariableRef.java
similarity index 100%
rename from virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/VariableRef.java
rename to nb-virtdata/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/VariableRef.java
diff --git a/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/VirtDataAST.java b/nb-virtdata/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/VirtDataAST.java
similarity index 100%
rename from virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/VirtDataAST.java
rename to nb-virtdata/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/VirtDataAST.java
diff --git a/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/VirtDataFlow.java b/nb-virtdata/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/VirtDataFlow.java
similarity index 100%
rename from virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/VirtDataFlow.java
rename to nb-virtdata/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/ast/VirtDataFlow.java
diff --git a/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/grammars/VirtData.g4 b/nb-virtdata/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/grammars/VirtData.g4
similarity index 100%
rename from virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/grammars/VirtData.g4
rename to nb-virtdata/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/grammars/VirtData.g4
diff --git a/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/oldgrammars/Config.g4 b/nb-virtdata/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/oldgrammars/Config.g4
similarity index 100%
rename from virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/oldgrammars/Config.g4
rename to nb-virtdata/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/oldgrammars/Config.g4
diff --git a/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/oldgrammars/MGv1.g4 b/nb-virtdata/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/oldgrammars/MGv1.g4
similarity index 100%
rename from virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/oldgrammars/MGv1.g4
rename to nb-virtdata/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/oldgrammars/MGv1.g4
diff --git a/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/oldgrammars/MGv2.g4 b/nb-virtdata/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/oldgrammars/MGv2.g4
similarity index 100%
rename from virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/oldgrammars/MGv2.g4
rename to nb-virtdata/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/oldgrammars/MGv2.g4
diff --git a/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/oldgrammars/MgRedux.g4 b/nb-virtdata/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/oldgrammars/MgRedux.g4
similarity index 100%
rename from virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/oldgrammars/MgRedux.g4
rename to nb-virtdata/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/oldgrammars/MgRedux.g4
diff --git a/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/oldgrammars/OpTemplate.g4 b/nb-virtdata/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/oldgrammars/OpTemplate.g4
similarity index 100%
rename from virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/oldgrammars/OpTemplate.g4
rename to nb-virtdata/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/oldgrammars/OpTemplate.g4
diff --git a/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/parser/VirtDataBuilder.java b/nb-virtdata/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/parser/VirtDataBuilder.java
similarity index 100%
rename from virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/parser/VirtDataBuilder.java
rename to nb-virtdata/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/parser/VirtDataBuilder.java
diff --git a/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/parser/VirtDataDSL.java b/nb-virtdata/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/parser/VirtDataDSL.java
similarity index 100%
rename from virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/parser/VirtDataDSL.java
rename to nb-virtdata/virtdata-lang/src/main/java/io/nosqlbench/virtdata/lang/parser/VirtDataDSL.java
diff --git a/virtdata-lang/src/test/java/io/nosqlbench/virtdata/lang/parser/VirtdataBuilderTest.java b/nb-virtdata/virtdata-lang/src/test/java/io/nosqlbench/virtdata/lang/parser/VirtdataBuilderTest.java
similarity index 100%
rename from virtdata-lang/src/test/java/io/nosqlbench/virtdata/lang/parser/VirtdataBuilderTest.java
rename to nb-virtdata/virtdata-lang/src/test/java/io/nosqlbench/virtdata/lang/parser/VirtdataBuilderTest.java
diff --git a/virtdata-lang/src/test/resources/log4j2-test.xml b/nb-virtdata/virtdata-lang/src/test/resources/log4j2-test.xml
similarity index 100%
rename from virtdata-lang/src/test/resources/log4j2-test.xml
rename to nb-virtdata/virtdata-lang/src/test/resources/log4j2-test.xml
diff --git a/virtdata-lang/src/test/resources/test-syntax-lambda.virtdata b/nb-virtdata/virtdata-lang/src/test/resources/test-syntax-lambda.virtdata
similarity index 100%
rename from virtdata-lang/src/test/resources/test-syntax-lambda.virtdata
rename to nb-virtdata/virtdata-lang/src/test/resources/test-syntax-lambda.virtdata
diff --git a/virtdata-lang/src/test/resources/test-syntax.virtdata b/nb-virtdata/virtdata-lang/src/test/resources/test-syntax.virtdata
similarity index 100%
rename from virtdata-lang/src/test/resources/test-syntax.virtdata
rename to nb-virtdata/virtdata-lang/src/test/resources/test-syntax.virtdata
diff --git a/virtdata-lang/src/test/resources/test-syntax.yaml b/nb-virtdata/virtdata-lang/src/test/resources/test-syntax.yaml
similarity index 100%
rename from virtdata-lang/src/test/resources/test-syntax.yaml
rename to nb-virtdata/virtdata-lang/src/test/resources/test-syntax.yaml
diff --git a/virtdata-lib-basics/pom.xml b/nb-virtdata/virtdata-lib-basics/pom.xml
similarity index 96%
rename from virtdata-lib-basics/pom.xml
rename to nb-virtdata/virtdata-lib-basics/pom.xml
index cde3c8a2b9..532ccedbdb 100644
--- a/virtdata-lib-basics/pom.xml
+++ b/nb-virtdata/virtdata-lib-basics/pom.xml
@@ -25,12 +25,12 @@
mvn-defaults
io.nosqlbench
${revision}
- ../mvn-defaults
+ ../../mvn-defaults
virtdata-lib-basics
- http://nosqlbench.io/
+ https://nosqlbench.io/
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/DateTimeFormats.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/DateTimeFormats.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/DateTimeFormats.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/DateTimeFormats.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/MVELExpr.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/MVELExpr.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/MVELExpr.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/MVELExpr.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/lfsrs/MetaShift.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/lfsrs/MetaShift.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/lfsrs/MetaShift.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/lfsrs/MetaShift.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/AliasElementSampler.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/AliasElementSampler.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/AliasElementSampler.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/AliasElementSampler.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/AliasSamplerDoubleInt.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/AliasSamplerDoubleInt.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/AliasSamplerDoubleInt.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/AliasSamplerDoubleInt.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/DiscreteProbabilityBuffer.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/DiscreteProbabilityBuffer.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/DiscreteProbabilityBuffer.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/DiscreteProbabilityBuffer.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/ElemProbD.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/ElemProbD.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/ElemProbD.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/ElemProbD.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/EvProbD.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/EvProbD.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/EvProbD.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/EvProbD.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/EvProbF.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/EvProbF.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/EvProbF.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/EvProbF.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/threadstate/SharedState.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/threadstate/SharedState.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/threadstate/SharedState.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/core/threadstate/SharedState.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_any/ToJSON.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_any/ToJSON.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_any/ToJSON.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_any/ToJSON.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_any/ToJSONF.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_any/ToJSONF.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_any/ToJSONF.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_any/ToJSONF.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_any/ToJSONFPretty.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_any/ToJSONFPretty.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_any/ToJSONFPretty.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_any/ToJSONFPretty.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_any/ToJSONPretty.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_any/ToJSONPretty.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_any/ToJSONPretty.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_any/ToJSONPretty.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_bytebuffer/ByteBufferToHex.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_bytebuffer/ByteBufferToHex.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_bytebuffer/ByteBufferToHex.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_bytebuffer/ByteBufferToHex.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_bytebuffer/DigestToByteBuffer.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_bytebuffer/DigestToByteBuffer.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_bytebuffer/DigestToByteBuffer.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_bytebuffer/DigestToByteBuffer.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_bytebuffer/ToHexString.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_bytebuffer/ToHexString.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_bytebuffer/ToHexString.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_bytebuffer/ToHexString.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_charbuffer/ToByteBuffer.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_charbuffer/ToByteBuffer.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_charbuffer/ToByteBuffer.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_charbuffer/ToByteBuffer.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_charbuffer/ToString.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_charbuffer/ToString.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_charbuffer/ToString.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_charbuffer/ToString.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToBoolean.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToBoolean.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToBoolean.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToBoolean.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToByte.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToByte.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToByte.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToByte.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToByteBuffer.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToByteBuffer.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToByteBuffer.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToByteBuffer.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToFloat.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToFloat.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToFloat.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToFloat.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToInt.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToInt.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToInt.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToInt.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToLong.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToLong.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToLong.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToLong.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToShort.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToShort.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToShort.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToShort.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToString.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToString.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToString.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToString.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToBoolean.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToBoolean.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToBoolean.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToBoolean.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToByte.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToByte.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToByte.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToByte.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToByteBuffer.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToByteBuffer.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToByteBuffer.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToByteBuffer.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToInt.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToInt.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToInt.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToInt.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToLong.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToLong.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToLong.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToLong.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToShort.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToShort.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToShort.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToShort.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToString.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToString.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToString.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_float/ToString.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToBoolean.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToBoolean.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToBoolean.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToBoolean.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToByte.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToByte.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToByte.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToByte.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToByteBuffer.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToByteBuffer.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToByteBuffer.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToByteBuffer.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToFloat.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToFloat.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToFloat.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToFloat.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToShort.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToShort.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToShort.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToShort.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToString.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToString.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToString.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_int/ToString.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToByte.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToByte.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToByte.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToByte.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToByteBuffer.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToByteBuffer.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToByteBuffer.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToByteBuffer.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToDouble.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToDouble.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToDouble.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToDouble.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToFloat.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToFloat.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToFloat.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToFloat.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToHexString.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToHexString.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToHexString.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToHexString.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToInt.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToInt.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToInt.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToInt.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToShort.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToShort.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToShort.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToShort.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToString.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToString.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToString.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToString.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_short/ToByte.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_short/ToByte.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_short/ToByte.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_short/ToByte.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_short/ToByteBuffer.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_short/ToByteBuffer.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_short/ToByteBuffer.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_short/ToByteBuffer.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_short/ToFloat.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_short/ToFloat.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_short/ToFloat.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_short/ToFloat.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToByte.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToByte.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToByte.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToByte.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToByteBuffer.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToByteBuffer.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToByteBuffer.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToByteBuffer.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToCharBuffer.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToCharBuffer.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToCharBuffer.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToCharBuffer.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToFloat.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToFloat.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToFloat.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToFloat.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToInt.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToInt.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToInt.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToInt.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToLong.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToLong.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToLong.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToLong.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToShort.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToShort.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToShort.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToShort.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToUUID.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToUUID.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToUUID.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToUUID.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/diagnostics/TypeOf.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/diagnostics/TypeOf.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/diagnostics/TypeOf.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/diagnostics/TypeOf.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/distributions/CSVFrequencySampler.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/distributions/CSVFrequencySampler.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/distributions/CSVFrequencySampler.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/distributions/CSVFrequencySampler.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/distributions/CSVSampler.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/distributions/CSVSampler.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/distributions/CSVSampler.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/distributions/CSVSampler.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/distributions/DelimFrequencySampler.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/distributions/DelimFrequencySampler.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/distributions/DelimFrequencySampler.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/distributions/DelimFrequencySampler.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/distributions/LabeledStatistic.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/distributions/LabeledStatistic.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/distributions/LabeledStatistic.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/distributions/LabeledStatistic.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/distributions/WeightedStringsFromCSV.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/distributions/WeightedStringsFromCSV.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/distributions/WeightedStringsFromCSV.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/distributions/WeightedStringsFromCSV.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/formatting/DecimalFormat.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/formatting/DecimalFormat.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/formatting/DecimalFormat.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/formatting/DecimalFormat.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/formatting/Format.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/formatting/Format.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/formatting/Format.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/formatting/Format.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_ary/to_list/ToDoubleList.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_ary/to_list/ToDoubleList.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_ary/to_list/ToDoubleList.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_ary/to_list/ToDoubleList.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_ary/to_list/ToFloatList.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_ary/to_list/ToFloatList.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_ary/to_list/ToFloatList.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_ary/to_list/ToFloatList.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_bytebuffer/to_string/ToBase64.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_bytebuffer/to_string/ToBase64.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_bytebuffer/to_string/ToBase64.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_bytebuffer/to_string/ToBase64.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_bigdecimal/ToBigDecimal.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_bigdecimal/ToBigDecimal.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_bigdecimal/ToBigDecimal.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_bigdecimal/ToBigDecimal.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Add.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Add.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Add.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Add.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Clamp.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Clamp.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Clamp.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Clamp.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Div.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Div.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Div.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Div.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/DoubleFlow.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/DoubleFlow.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/DoubleFlow.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/DoubleFlow.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Expr.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Expr.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Expr.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Expr.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Load.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Load.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Load.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Load.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Max.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Max.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Max.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Max.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Min.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Min.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Min.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Min.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Mul.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Mul.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Mul.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Mul.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Save.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Save.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Save.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/Save.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/SumFunctions.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/SumFunctions.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/SumFunctions.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/SumFunctions.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/TriangleWave.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/TriangleWave.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/TriangleWave.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/TriangleWave.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_float/DoubleToFloat.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_float/DoubleToFloat.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_float/DoubleToFloat.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_float/DoubleToFloat.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfCloseTo.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfCloseTo.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfCloseTo.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfCloseTo.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfEq.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfEq.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfEq.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfEq.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfGe.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfGe.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfGe.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfGe.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfGt.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfGt.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfGt.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfGt.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfLe.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfLe.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfLe.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfLe.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfLt.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfLt.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfLt.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfLt.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfWithin.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfWithin.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfWithin.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_other/NullIfWithin.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfCloseTo.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfCloseTo.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfCloseTo.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfCloseTo.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfEq.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfEq.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfEq.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfEq.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfGe.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfGe.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfGe.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfGe.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfGt.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfGt.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfGt.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfGt.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfLe.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfLe.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfLe.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfLe.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfLt.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfLt.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfLt.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfLt.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfWithin.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfWithin.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfWithin.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_unset/UnsetIfWithin.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_int/to_bigdecimal/ToBigDecimal.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_int/to_bigdecimal/ToBigDecimal.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_int/to_bigdecimal/ToBigDecimal.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_int/to_bigdecimal/ToBigDecimal.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigdecimal/ModuloToBigDecimal.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigdecimal/ModuloToBigDecimal.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigdecimal/ModuloToBigDecimal.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigdecimal/ModuloToBigDecimal.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigdecimal/ToBigDecimal.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigdecimal/ToBigDecimal.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigdecimal/ToBigDecimal.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigdecimal/ToBigDecimal.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigint/ModuloToBigInt.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigint/ModuloToBigInt.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigint/ModuloToBigInt.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigint/ModuloToBigInt.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigint/ToBigInt.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigint/ToBigInt.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigint/ToBigInt.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigint/ToBigInt.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_boolean/ModuloToBoolean.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_boolean/ModuloToBoolean.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_boolean/ModuloToBoolean.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_boolean/ModuloToBoolean.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_boolean/ToBoolean.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_boolean/ToBoolean.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_boolean/ToBoolean.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_boolean/ToBoolean.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_byte/LongToByte.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_byte/LongToByte.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_byte/LongToByte.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_byte/LongToByte.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_byte/ModuloToByte.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_byte/ModuloToByte.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_byte/ModuloToByte.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_byte/ModuloToByte.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/ByteBufferSizedHashed.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/ByteBufferSizedHashed.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/ByteBufferSizedHashed.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/ByteBufferSizedHashed.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/DigestToByteBuffer.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/DigestToByteBuffer.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/DigestToByteBuffer.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/DigestToByteBuffer.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/HashedByteBufferExtract.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/HashedByteBufferExtract.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/HashedByteBufferExtract.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/HashedByteBufferExtract.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/HashedToByteBuffer.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/HashedToByteBuffer.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/HashedToByteBuffer.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/HashedToByteBuffer.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/ToMD5ByteBuffer.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/ToMD5ByteBuffer.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/ToMD5ByteBuffer.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/ToMD5ByteBuffer.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_charbuffer/CharBufferExtract.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_charbuffer/CharBufferExtract.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_charbuffer/CharBufferExtract.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_charbuffer/CharBufferExtract.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/HashedLineToStringList.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/HashedLineToStringList.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/HashedLineToStringList.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/HashedLineToStringList.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/HashedLineToStringSet.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/HashedLineToStringSet.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/HashedLineToStringSet.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/HashedLineToStringSet.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/HashedLineToStringStringMap.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/HashedLineToStringStringMap.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/HashedLineToStringStringMap.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/HashedLineToStringStringMap.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/HashedRangeToLongList.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/HashedRangeToLongList.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/HashedRangeToLongList.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/HashedRangeToLongList.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/List.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/List.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/List.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/List.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListFunctions.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListFunctions.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListFunctions.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListFunctions.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListHashed.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListHashed.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListHashed.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListHashed.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListSized.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListSized.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListSized.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListSized.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListSizedHashed.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListSizedHashed.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListSizedHashed.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListSizedHashed.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListSizedStepped.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListSizedStepped.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListSizedStepped.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListSizedStepped.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListStepped.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListStepped.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListStepped.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListStepped.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/Map.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/Map.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/Map.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/Map.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapFunctions.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapFunctions.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapFunctions.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapFunctions.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapHashed.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapHashed.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapHashed.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapHashed.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapSized.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapSized.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapSized.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapSized.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapSizedHashed.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapSizedHashed.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapSizedHashed.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapSizedHashed.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapSizedStepped.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapSizedStepped.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapSizedStepped.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapSizedStepped.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapStepped.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapStepped.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapStepped.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapStepped.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/Set.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/Set.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/Set.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/Set.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetFunctions.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetFunctions.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetFunctions.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetFunctions.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetHashed.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetHashed.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetHashed.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetHashed.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetSized.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetSized.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetSized.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetSized.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetSizedHashed.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetSizedHashed.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetSizedHashed.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetSizedHashed.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetSizedStepped.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetSizedStepped.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetSizedStepped.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetSizedStepped.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetStepped.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetStepped.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetStepped.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetStepped.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/StringList.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/StringList.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/StringList.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/StringList.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/StringMap.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/StringMap.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/StringMap.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/StringMap.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/StringSet.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/StringSet.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/StringSet.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/StringSet.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_double/FixedValues.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_double/FixedValues.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_double/FixedValues.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_double/FixedValues.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_double/HashRange.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_double/HashRange.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_double/HashRange.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_double/HashRange.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_double/HashedRangedToNonuniformDouble.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_double/HashedRangedToNonuniformDouble.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_double/HashedRangedToNonuniformDouble.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_double/HashedRangedToNonuniformDouble.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_double/Interpolate.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_double/Interpolate.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_double/Interpolate.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_double/Interpolate.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_double/Mul.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_double/Mul.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_double/Mul.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_double/Mul.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_float/FixedValues.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_float/FixedValues.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_float/FixedValues.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_float/FixedValues.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_float/HashRange.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_float/HashRange.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_float/HashRange.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_float/HashRange.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_float/HashedRangedToNonuniformFloat.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_float/HashedRangedToNonuniformFloat.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_float/HashedRangedToNonuniformFloat.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_float/HashedRangedToNonuniformFloat.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_float/Mul.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_float/Mul.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_float/Mul.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_float/Mul.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_inetaddress/ToInetAddress.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_inetaddress/ToInetAddress.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_inetaddress/ToInetAddress.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_inetaddress/ToInetAddress.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Add.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Add.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Add.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Add.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/AddCycleRange.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/AddCycleRange.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/AddCycleRange.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/AddCycleRange.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/AddHashRange.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/AddHashRange.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/AddHashRange.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/AddHashRange.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/CycleRange.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/CycleRange.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/CycleRange.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/CycleRange.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Div.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Div.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Div.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Div.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Expr.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Expr.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Expr.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Expr.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/FixedValue.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/FixedValue.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/FixedValue.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/FixedValue.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/FixedValues.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/FixedValues.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/FixedValues.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/FixedValues.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Hash.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Hash.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Hash.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Hash.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/HashInterval.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/HashInterval.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/HashInterval.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/HashInterval.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/HashRange.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/HashRange.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/HashRange.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/HashRange.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/HashRangeScaled.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/HashRangeScaled.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/HashRangeScaled.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/HashRangeScaled.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/HashedLineToInt.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/HashedLineToInt.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/HashedLineToInt.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/HashedLineToInt.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Mod.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Mod.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Mod.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Mod.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/ModuloToInteger.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/ModuloToInteger.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/ModuloToInteger.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/ModuloToInteger.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Mul.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Mul.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Mul.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/Mul.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/SignedHash.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/SignedHash.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/SignedHash.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/SignedHash.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/ToInt.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/ToInt.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/ToInt.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_int/ToInt.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Add.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Add.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Add.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Add.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/AddCycleRange.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/AddCycleRange.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/AddCycleRange.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/AddCycleRange.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/AddHashRange.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/AddHashRange.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/AddHashRange.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/AddHashRange.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Clamp.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Clamp.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Clamp.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Clamp.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/CycleRange.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/CycleRange.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/CycleRange.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/CycleRange.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Div.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Div.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Div.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Div.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/DivideToLong.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/DivideToLong.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/DivideToLong.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/DivideToLong.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Expr.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Expr.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Expr.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Expr.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/FixedValue.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/FixedValue.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/FixedValue.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/FixedValue.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/FixedValues.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/FixedValues.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/FixedValues.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/FixedValues.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/FullHash.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/FullHash.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/FullHash.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/FullHash.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Hash.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Hash.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Hash.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Hash.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HashInterval.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HashInterval.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HashInterval.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HashInterval.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HashRange.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HashRange.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HashRange.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HashRange.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HashRangeScaled.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HashRangeScaled.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HashRangeScaled.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HashRangeScaled.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HostHash.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HostHash.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HostHash.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HostHash.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Identity.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Identity.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Identity.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Identity.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Interpolate.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Interpolate.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Interpolate.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Interpolate.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Load.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Load.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Load.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Load.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/LongFlow.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/LongFlow.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/LongFlow.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/LongFlow.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Max.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Max.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Max.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Max.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Min.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Min.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Min.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Min.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Mod.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Mod.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Mod.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Mod.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/ModuloToLong.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/ModuloToLong.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/ModuloToLong.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/ModuloToLong.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Mul.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Mul.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Mul.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Mul.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Murmur3DivToLong.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Murmur3DivToLong.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Murmur3DivToLong.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Murmur3DivToLong.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/PartitionLongs.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/PartitionLongs.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/PartitionLongs.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/PartitionLongs.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Save.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Save.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Save.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Save.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Shuffle.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Shuffle.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Shuffle.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Shuffle.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/SignedHash.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/SignedHash.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/SignedHash.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/SignedHash.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Swap.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Swap.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Swap.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/Swap.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/TriangleWave.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/TriangleWave.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/TriangleWave.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/TriangleWave.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/TriangularStep.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/TriangularStep.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/TriangularStep.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/TriangularStep.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/WeightedLongs.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/WeightedLongs.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/WeightedLongs.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/WeightedLongs.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_object/CoinFunc.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_object/CoinFunc.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_object/CoinFunc.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_object/CoinFunc.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_object/Discard.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_object/Discard.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_object/Discard.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_object/Discard.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_object/Expr.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_object/Expr.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_object/Expr.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_object/Expr.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_object/WeightedFuncs.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_object/WeightedFuncs.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_object/WeightedFuncs.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_object/WeightedFuncs.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullIfEq.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullIfEq.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullIfEq.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullIfEq.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullIfGe.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullIfGe.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullIfGe.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullIfGe.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullIfGt.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullIfGt.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullIfGt.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullIfGt.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullIfLe.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullIfLe.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullIfLe.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullIfLe.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullIfLt.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullIfLt.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullIfLt.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullIfLt.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_short/LongToShort.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_short/LongToShort.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_short/LongToShort.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_short/LongToShort.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_short/ModuloToShort.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_short/ModuloToShort.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_short/ModuloToShort.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_short/ModuloToShort.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/AlphaNumericString.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/AlphaNumericString.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/AlphaNumericString.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/AlphaNumericString.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/CharBufImage.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/CharBufImage.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/CharBufImage.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/CharBufImage.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Combinations.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Combinations.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Combinations.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Combinations.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Concat.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Concat.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Concat.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Concat.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ConcatArray.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ConcatArray.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ConcatArray.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ConcatArray.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ConcatChained.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ConcatChained.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ConcatChained.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ConcatChained.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ConcatCycle.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ConcatCycle.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ConcatCycle.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ConcatCycle.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ConcatFixed.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ConcatFixed.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ConcatFixed.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ConcatFixed.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ConcatHashed.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ConcatHashed.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ConcatHashed.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ConcatHashed.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ConcatStepped.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ConcatStepped.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ConcatStepped.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ConcatStepped.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/DirectoryLines.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/DirectoryLines.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/DirectoryLines.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/DirectoryLines.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/DirectoryLinesStable.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/DirectoryLinesStable.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/DirectoryLinesStable.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/DirectoryLinesStable.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/DivideToLongToString.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/DivideToLongToString.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/DivideToLongToString.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/DivideToLongToString.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Expr.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Expr.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Expr.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Expr.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/FixedValue.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/FixedValue.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/FixedValue.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/FixedValue.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/HashedFileExtractToString.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/HashedFileExtractToString.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/HashedFileExtractToString.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/HashedFileExtractToString.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/HashedLineToString.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/HashedLineToString.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/HashedLineToString.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/HashedLineToString.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/HashedLinesToKeyValueString.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/HashedLinesToKeyValueString.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/HashedLinesToKeyValueString.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/HashedLinesToKeyValueString.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/HashedLoremExtractToString.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/HashedLoremExtractToString.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/HashedLoremExtractToString.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/HashedLoremExtractToString.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Join.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Join.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Join.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Join.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/JoinTemplate.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/JoinTemplate.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/JoinTemplate.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/JoinTemplate.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ListTemplate.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ListTemplate.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ListTemplate.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ListTemplate.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/LongToString.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/LongToString.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/LongToString.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/LongToString.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ModuloCSVLineToString.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ModuloCSVLineToString.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ModuloCSVLineToString.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ModuloCSVLineToString.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ModuloLineToString.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ModuloLineToString.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ModuloLineToString.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ModuloLineToString.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Murmur3DivToString.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Murmur3DivToString.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Murmur3DivToString.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Murmur3DivToString.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/NumberNameToString.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/NumberNameToString.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/NumberNameToString.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/NumberNameToString.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/StaticStringMapper.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/StaticStringMapper.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/StaticStringMapper.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/StaticStringMapper.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/StringDateWrapper.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/StringDateWrapper.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/StringDateWrapper.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/StringDateWrapper.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Template.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Template.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Template.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/Template.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ToBase64String.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ToBase64String.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ToBase64String.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ToBase64String.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/WeightedStrings.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/WeightedStrings.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/WeightedStrings.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/WeightedStrings.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/CurrentEpochMillis.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/CurrentEpochMillis.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/CurrentEpochMillis.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/CurrentEpochMillis.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ElapsedNanoTime.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ElapsedNanoTime.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ElapsedNanoTime.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ElapsedNanoTime.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/StartingEpochMillis.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/StartingEpochMillis.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/StartingEpochMillis.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/StartingEpochMillis.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToDate.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToDate.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToDate.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToDate.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToDateTime.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToDateTime.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToDateTime.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToDateTime.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToEpochTimeUUID.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToEpochTimeUUID.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToEpochTimeUUID.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToEpochTimeUUID.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToFinestTimeUUID.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToFinestTimeUUID.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToFinestTimeUUID.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToFinestTimeUUID.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToJavaInstant.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToJavaInstant.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToJavaInstant.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToJavaInstant.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToJodaDateTime.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToJodaDateTime.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToJodaDateTime.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToJodaDateTime.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToJodaInstant.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToJodaInstant.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToJodaInstant.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToJodaInstant.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToLocalTime.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToLocalTime.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToLocalTime.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToLocalTime.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/Timezones.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/Timezones.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/Timezones.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/Timezones.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfDay.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfDay.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfDay.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfDay.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfHour.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfHour.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfHour.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfHour.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfMinute.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfMinute.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfMinute.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfMinute.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfMonth.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfMonth.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfMonth.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfMonth.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfNamedWeekDay.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfNamedWeekDay.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfNamedWeekDay.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfNamedWeekDay.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfNextDay.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfNextDay.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfNextDay.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfNextDay.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfNextNamedWeekDay.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfNextNamedWeekDay.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfNextNamedWeekDay.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfNextNamedWeekDay.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfSecond.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfSecond.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfSecond.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfSecond.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfYear.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfYear.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfYear.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfYear.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/Unset.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/Unset.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/Unset.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/Unset.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/UnsetIfEq.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/UnsetIfEq.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/UnsetIfEq.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/UnsetIfEq.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/UnsetIfGe.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/UnsetIfGe.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/UnsetIfGe.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/UnsetIfGe.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/UnsetIfGt.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/UnsetIfGt.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/UnsetIfGt.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/UnsetIfGt.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/UnsetIfLe.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/UnsetIfLe.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/UnsetIfLe.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/UnsetIfLe.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/UnsetIfLt.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/UnsetIfLt.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/UnsetIfLt.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_unset/UnsetIfLt.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_uuid/Expr.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_uuid/Expr.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_uuid/Expr.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_uuid/Expr.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_uuid/ToHashedUUID.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_uuid/ToHashedUUID.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_uuid/ToHashedUUID.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_uuid/ToHashedUUID.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_uuid/ToUUID.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_uuid/ToUUID.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_uuid/ToUUID.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_uuid/ToUUID.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_vector/NormalizeDoubleListVector.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_vector/NormalizeDoubleListVector.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_vector/NormalizeDoubleListVector.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_vector/NormalizeDoubleListVector.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_vector/NormalizeFloatListVector.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_vector/NormalizeFloatListVector.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_vector/NormalizeFloatListVector.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_vector/NormalizeFloatListVector.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_vector/NormalizeListVector.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_vector/NormalizeListVector.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_vector/NormalizeListVector.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_vector/NormalizeListVector.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_vector/UniformVectorSizedStepped.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_vector/UniformVectorSizedStepped.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_vector/UniformVectorSizedStepped.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_vector/UniformVectorSizedStepped.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/EscapeJSON.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/EscapeJSON.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/EscapeJSON.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/EscapeJSON.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/MatchFunc.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/MatchFunc.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/MatchFunc.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/MatchFunc.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/MatchRegex.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/MatchRegex.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/MatchRegex.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/MatchRegex.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_bigdecimal/ToBigDecimal.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_bigdecimal/ToBigDecimal.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_bigdecimal/ToBigDecimal.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_bigdecimal/ToBigDecimal.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_epoch/DateTimeParser.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_epoch/DateTimeParser.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_epoch/DateTimeParser.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_epoch/DateTimeParser.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/NullIfEmpty.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/NullIfEmpty.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/NullIfEmpty.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/NullIfEmpty.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/NullIfNullOrEmpty.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/NullIfNullOrEmpty.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/NullIfNullOrEmpty.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/NullIfNullOrEmpty.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/UnsetIfEmpty.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/UnsetIfEmpty.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/UnsetIfEmpty.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/UnsetIfEmpty.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/UnsetIfNullOrEmpty.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/UnsetIfNullOrEmpty.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/UnsetIfNullOrEmpty.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/UnsetIfNullOrEmpty.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/UnsetIfStringEq.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/UnsetIfStringEq.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/UnsetIfStringEq.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/UnsetIfStringEq.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/UnsetIfStringNe.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/UnsetIfStringNe.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/UnsetIfStringNe.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_string/to_unset/UnsetIfStringNe.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_uuid/ToBase64String.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_uuid/ToBase64String.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_uuid/ToBase64String.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/from_uuid/ToBase64String.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/functionadapters/Flow.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/functionadapters/Flow.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/functionadapters/Flow.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/functionadapters/Flow.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/functionadapters/ToLongFunction.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/functionadapters/ToLongFunction.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/functionadapters/ToLongFunction.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/functionadapters/ToLongFunction.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/functionadapters/ToLongUnaryOperator.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/functionadapters/ToLongUnaryOperator.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/functionadapters/ToLongUnaryOperator.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/functionadapters/ToLongUnaryOperator.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/nondeterministic/ThreadNumToInteger.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/nondeterministic/ThreadNumToInteger.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/nondeterministic/ThreadNumToInteger.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/nondeterministic/ThreadNumToInteger.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/nondeterministic/ThreadNumToLong.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/nondeterministic/ThreadNumToLong.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/nondeterministic/ThreadNumToLong.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/nondeterministic/ThreadNumToLong.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/nondeterministic/to_int/ThreadNum.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/nondeterministic/to_int/ThreadNum.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/nondeterministic/to_int/ThreadNum.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/nondeterministic/to_int/ThreadNum.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/nondeterministic/to_long/ThreadNum.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/nondeterministic/to_long/ThreadNum.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/nondeterministic/to_long/ThreadNum.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/nondeterministic/to_long/ThreadNum.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/periodic/Sin.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/periodic/Sin.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/periodic/Sin.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/periodic/Sin.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/repeaters/RepeatList.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/repeaters/RepeatList.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/repeaters/RepeatList.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/repeaters/RepeatList.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/Clear.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/Clear.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/Clear.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/Clear.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/Load.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/Load.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/Load.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/Load.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadDouble.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadDouble.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadDouble.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadDouble.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadElement.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadElement.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadElement.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadElement.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadFloat.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadFloat.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadFloat.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadFloat.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadInteger.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadInteger.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadInteger.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadInteger.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadLong.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadLong.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadLong.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadLong.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadString.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadString.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadString.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadString.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/NullOrLoad.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/NullOrLoad.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/NullOrLoad.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/NullOrLoad.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/NullOrPass.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/NullOrPass.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/NullOrPass.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/NullOrPass.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/Save.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/Save.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/Save.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/Save.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveDouble.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveDouble.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveDouble.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveDouble.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveFloat.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveFloat.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveFloat.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveFloat.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveInteger.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveInteger.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveInteger.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveInteger.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveLong.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveLong.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveLong.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveLong.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveString.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveString.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveString.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/SaveString.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/Show.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/Show.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/Show.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/Show.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/Swap.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/Swap.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/Swap.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/Swap.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/UnsetOrLoad.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/UnsetOrLoad.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/UnsetOrLoad.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/UnsetOrLoad.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/UnsetOrPass.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/UnsetOrPass.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/UnsetOrPass.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/UnsetOrPass.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/Clear.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/Clear.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/Clear.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/Clear.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/Load.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/Load.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/Load.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/Load.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/LoadDouble.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/LoadDouble.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/LoadDouble.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/LoadDouble.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/LoadFloat.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/LoadFloat.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/LoadFloat.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/LoadFloat.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/LoadInteger.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/LoadInteger.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/LoadInteger.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/LoadInteger.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/LoadLong.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/LoadLong.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/LoadLong.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/LoadLong.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/LoadString.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/LoadString.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/LoadString.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/LoadString.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/Save.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/Save.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/Save.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/Save.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveDouble.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveDouble.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveDouble.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveDouble.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveFloat.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveFloat.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveFloat.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveFloat.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveInteger.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveInteger.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveInteger.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveInteger.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveLong.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveLong.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveLong.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveLong.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveString.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveString.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveString.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/SaveString.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/Show.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/Show.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/Show.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/Show.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/Swap.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/Swap.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/Swap.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/stateful/from_long/Swap.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/statistics/LongStats.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/statistics/LongStats.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/statistics/LongStats.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/statistics/LongStats.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/temporal/CurrentTimeMillis.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/temporal/CurrentTimeMillis.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/temporal/CurrentTimeMillis.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/temporal/CurrentTimeMillis.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Add.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Add.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Add.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Add.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/AddCycleRange.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/AddCycleRange.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/AddCycleRange.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/AddCycleRange.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/AddHashRange.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/AddHashRange.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/AddHashRange.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/AddHashRange.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Clamp.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Clamp.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Clamp.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Clamp.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/CycleRange.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/CycleRange.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/CycleRange.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/CycleRange.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Div.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Div.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Div.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Div.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Expr.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Expr.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Expr.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Expr.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Hash.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Hash.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Hash.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Hash.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/HashInterval.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/HashInterval.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/HashInterval.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/HashInterval.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/HashRange.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/HashRange.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/HashRange.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/HashRange.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/HashRangeScaled.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/HashRangeScaled.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/HashRangeScaled.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/HashRangeScaled.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/IntFlow.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/IntFlow.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/IntFlow.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/IntFlow.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Load.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Load.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Load.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Load.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Max.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Max.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Max.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Max.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Min.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Min.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Min.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Min.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Mod.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Mod.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Mod.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Mod.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Mul.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Mul.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Mul.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Mul.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Save.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Save.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Save.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/Save.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/SignalPID.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/SignalPID.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/SignalPID.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/SignalPID.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/SignedHash.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/SignedHash.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/SignedHash.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/SignedHash.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/ToInt.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/ToInt.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/ToInt.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/ToInt.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/FieldExtractor.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/FieldExtractor.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/FieldExtractor.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/FieldExtractor.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/FirstLines.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/FirstLines.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/FirstLines.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/FirstLines.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/HTMLEntityDecode.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/HTMLEntityDecode.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/HTMLEntityDecode.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/HTMLEntityDecode.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/HTMLEntityEncode.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/HTMLEntityEncode.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/HTMLEntityEncode.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/HTMLEntityEncode.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/Load.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/Load.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/Load.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/Load.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/MirrorToString.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/MirrorToString.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/MirrorToString.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/MirrorToString.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/Prefix.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/Prefix.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/Prefix.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/Prefix.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/ReplaceAll.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/ReplaceAll.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/ReplaceAll.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/ReplaceAll.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/ReplaceRegex.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/ReplaceRegex.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/ReplaceRegex.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/ReplaceRegex.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/Save.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/Save.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/Save.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/Save.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/StringFlow.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/StringFlow.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/StringFlow.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/StringFlow.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/Suffix.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/Suffix.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/Suffix.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/Suffix.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/ToBase64String.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/ToBase64String.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/ToBase64String.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/ToBase64String.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/ToString.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/ToString.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/ToString.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/ToString.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/Token.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/Token.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/Token.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/Token.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/Trim.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/Trim.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/Trim.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/Trim.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/URLDecode.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/URLDecode.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/URLDecode.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/URLDecode.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/URLEncode.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/URLEncode.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/URLEncode.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/URLEncode.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/util/Combiner.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/util/Combiner.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/util/Combiner.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/util/Combiner.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/util/Credentials.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/util/Credentials.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/util/Credentials.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/util/Credentials.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/util/DoubleCombiner.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/util/DoubleCombiner.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/util/DoubleCombiner.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/util/DoubleCombiner.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/util/MathContextReader.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/util/MathContextReader.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/util/MathContextReader.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/util/MathContextReader.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/util/Stringify.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/util/Stringify.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/util/Stringify.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/library/basics/shared/util/Stringify.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/murmur/Checksum128.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/murmur/Checksum128.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/murmur/Checksum128.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/murmur/Checksum128.java
diff --git a/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/murmur/Murmur3F.java b/nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/murmur/Murmur3F.java
similarity index 100%
rename from virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/murmur/Murmur3F.java
rename to nb-virtdata/virtdata-lib-basics/src/main/java/io/nosqlbench/virtdata/murmur/Murmur3F.java
diff --git a/virtdata-lib-curves4/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/nb-virtdata/virtdata-lib-basics/src/main/resources/META-INF/services/javax.annotation.processing.Processor
similarity index 100%
rename from virtdata-lib-curves4/src/main/resources/META-INF/services/javax.annotation.processing.Processor
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/META-INF/services/javax.annotation.processing.Processor
diff --git a/virtdata-lib-basics/src/main/resources/data/adventures.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/data/adventures.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/data/adventures.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/data/adventures.txt
diff --git a/virtdata-lib-basics/src/main/resources/data/careers.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/data/careers.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/data/careers.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/data/careers.txt
diff --git a/virtdata-lib-basics/src/main/resources/data/companies.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/data/companies.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/data/companies.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/data/companies.txt
diff --git a/virtdata-lib-basics/src/main/resources/data/jobdescription.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/data/jobdescription.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/data/jobdescription.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/data/jobdescription.txt
diff --git a/virtdata-lib-basics/src/main/resources/data/lastnames.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/data/lastnames.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/data/lastnames.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/data/lastnames.txt
diff --git a/virtdata-lib-basics/src/main/resources/data/lorem_ipsum_full.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/data/lorem_ipsum_full.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/data/lorem_ipsum_full.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/data/lorem_ipsum_full.txt
diff --git a/virtdata-lib-basics/src/main/resources/data/names.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/data/names.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/data/names.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/data/names.txt
diff --git a/virtdata-lib-basics/src/main/resources/data/numbers.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/data/numbers.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/data/numbers.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/data/numbers.txt
diff --git a/virtdata-lib-basics/src/main/resources/data/types5.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/data/types5.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/data/types5.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/data/types5.txt
diff --git a/virtdata-lib-basics/src/main/resources/data/variable_words.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/data/variable_words.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/data/variable_words.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/data/variable_words.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/10.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/10.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/10.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/10.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/11.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/11.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/11.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/11.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/12.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/12.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/12.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/12.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/13.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/13.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/13.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/13.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/14.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/14.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/14.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/14.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/15.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/15.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/15.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/15.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/16.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/16.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/16.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/16.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/17.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/17.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/17.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/17.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/18.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/18.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/18.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/18.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/19.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/19.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/19.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/19.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/20.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/20.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/20.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/20.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/21.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/21.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/21.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/21.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/22.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/22.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/22.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/22.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/23.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/23.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/23.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/23.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/24.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/24.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/24.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/24.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/25.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/25.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/25.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/25.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/26.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/26.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/26.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/26.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/27.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/27.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/27.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/27.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/28.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/28.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/28.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/28.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/29.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/29.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/29.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/29.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/30.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/30.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/30.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/30.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/31.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/31.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/31.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/31.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/32.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/32.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/32.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/32.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/33.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/33.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/33.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/33.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/34.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/34.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/34.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/34.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/35.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/35.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/35.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/35.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/36.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/36.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/36.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/36.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/37.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/37.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/37.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/37.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/38.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/38.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/38.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/38.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/39.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/39.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/39.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/39.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/4.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/4.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/4.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/4.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/40.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/40.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/40.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/40.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/41.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/41.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/41.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/41.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/42.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/42.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/42.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/42.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/43.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/43.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/43.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/43.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/44.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/44.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/44.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/44.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/45.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/45.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/45.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/45.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/46.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/46.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/46.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/46.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/47.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/47.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/47.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/47.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/48.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/48.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/48.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/48.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/49.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/49.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/49.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/49.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/5.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/5.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/5.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/5.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/50.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/50.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/50.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/50.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/51.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/51.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/51.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/51.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/52.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/52.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/52.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/52.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/53.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/53.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/53.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/53.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/54.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/54.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/54.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/54.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/55.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/55.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/55.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/55.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/56.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/56.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/56.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/56.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/57.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/57.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/57.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/57.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/58.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/58.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/58.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/58.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/59.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/59.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/59.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/59.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/6.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/6.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/6.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/6.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/60.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/60.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/60.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/60.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/61.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/61.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/61.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/61.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/62.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/62.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/62.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/62.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/63.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/63.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/63.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/63.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/64.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/64.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/64.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/64.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/7.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/7.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/7.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/7.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/8.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/8.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/8.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/8.txt
diff --git a/virtdata-lib-basics/src/main/resources/lfsrmasks/9.txt b/nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/9.txt
similarity index 100%
rename from virtdata-lib-basics/src/main/resources/lfsrmasks/9.txt
rename to nb-virtdata/virtdata-lib-basics/src/main/resources/lfsrmasks/9.txt
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/core/lfsrs/MetaShiftTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/core/lfsrs/MetaShiftTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/core/lfsrs/MetaShiftTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/core/lfsrs/MetaShiftTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/DiscreteProbabilityBufferTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/DiscreteProbabilityBufferTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/DiscreteProbabilityBufferTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/DiscreteProbabilityBufferTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/aliasmethod/AliasElementSamplerTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/aliasmethod/AliasElementSamplerTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/aliasmethod/AliasElementSamplerTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/aliasmethod/AliasElementSamplerTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/aliasmethod/AliasSamplerDoubleIntTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/aliasmethod/AliasSamplerDoubleIntTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/aliasmethod/AliasSamplerDoubleIntTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/core/stathelpers/aliasmethod/AliasSamplerDoubleIntTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/IntFlowTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/IntFlowTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/IntFlowTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/IntFlowTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/basicsmappers/ExprTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/basicsmappers/ExprTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/basicsmappers/ExprTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/basicsmappers/ExprTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToStringTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToStringTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToStringTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_double/ToStringTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToByteBufferTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToByteBufferTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToByteBufferTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToByteBufferTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToStringTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToStringTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToStringTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_long/ToStringTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToUUIDTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToUUIDTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToUUIDTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/conversions/from_string/ToUUIDTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/diagnostics/TypeOfTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/diagnostics/TypeOfTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/diagnostics/TypeOfTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/diagnostics/TypeOfTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/distributions/CSVSamplerTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/distributions/CSVSamplerTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/distributions/CSVSamplerTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/distributions/CSVSamplerTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_bigdecimal/ToBigDecimalTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_bigdecimal/ToBigDecimalTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_bigdecimal/ToBigDecimalTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_bigdecimal/ToBigDecimalTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/SumFunctionsTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/SumFunctionsTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/SumFunctionsTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/SumFunctionsTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/to_double/ClampTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/to_double/ClampTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/to_double/ClampTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_double/to_double/to_double/ClampTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigdecimal/ToBigDecimalTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigdecimal/ToBigDecimalTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigdecimal/ToBigDecimalTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bigdecimal/ToBigDecimalTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/ByteBufferSizedHashedTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/ByteBufferSizedHashedTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/ByteBufferSizedHashedTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/ByteBufferSizedHashedTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/DigestToByteBufferTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/DigestToByteBufferTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/DigestToByteBufferTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/DigestToByteBufferTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/HashedByteBufferExtractTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/HashedByteBufferExtractTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/HashedByteBufferExtractTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_bytebuffer/HashedByteBufferExtractTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListFunctionsTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListFunctionsTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListFunctionsTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListFunctionsTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListSizedHashedTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListSizedHashedTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListSizedHashedTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListSizedHashedTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/ListTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapFunctionsTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapFunctionsTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapFunctionsTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapFunctionsTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/MapTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetFunctionsTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetFunctionsTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetFunctionsTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetFunctionsTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_collection/SetTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HashIntervalTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HashIntervalTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HashIntervalTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HashIntervalTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HashRangeScaledTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HashRangeScaledTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HashRangeScaledTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/HashRangeScaledTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/InterpolateTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/InterpolateTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/InterpolateTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/InterpolateTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/PartitionLongsTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/PartitionLongsTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/PartitionLongsTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/PartitionLongsTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/SaveTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/SaveTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/SaveTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/SaveTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/ShuffleTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/ShuffleTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/ShuffleTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/ShuffleTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/SwapTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/SwapTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/SwapTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/SwapTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/TriangleWaveTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/TriangleWaveTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/TriangleWaveTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/TriangleWaveTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/TriangularStepTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/TriangularStepTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/TriangularStepTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_long/TriangularStepTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_object/CoinFuncTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_object/CoinFuncTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_object/CoinFuncTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_object/CoinFuncTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_object/WeightedFuncsTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_object/WeightedFuncsTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_object/WeightedFuncsTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_object/WeightedFuncsTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullsRatioTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullsRatioTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullsRatioTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_other/NullsRatioTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ConcatArrayTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ConcatArrayTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ConcatArrayTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ConcatArrayTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ConcatTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ConcatTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ConcatTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ConcatTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/DirectoryLinesStableTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/DirectoryLinesStableTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/DirectoryLinesStableTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/DirectoryLinesStableTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/DirectoryLinesTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/DirectoryLinesTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/DirectoryLinesTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/DirectoryLinesTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/JoinTemplateTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/JoinTemplateTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/JoinTemplateTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/JoinTemplateTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/JoinTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/JoinTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/JoinTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/JoinTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/NumberNameToStringTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/NumberNameToStringTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/NumberNameToStringTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/NumberNameToStringTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/TextImageExtractTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/TextImageExtractTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/TextImageExtractTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/TextImageExtractTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ToBase64StringTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ToBase64StringTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ToBase64StringTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_string/ToBase64StringTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToDateTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToDateTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToDateTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/ToDateTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/TimezonesTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/TimezonesTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/TimezonesTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/TimezonesTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfTimeframeTests.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfTimeframeTests.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfTimeframeTests.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_time_types/joda/ToMillisAtStartOfTimeframeTests.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_uuid/ToHashedUUIDTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_uuid/ToHashedUUIDTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_uuid/ToHashedUUIDTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_uuid/ToHashedUUIDTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_uuid/ToUUIDTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_uuid/ToUUIDTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_uuid/ToUUIDTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_uuid/ToUUIDTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_vector/ToNormalizedVectorTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_vector/ToNormalizedVectorTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_vector/ToNormalizedVectorTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_vector/ToNormalizedVectorTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_vector/UniformVectorSteppedTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_vector/UniformVectorSteppedTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_vector/UniformVectorSteppedTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_long/to_vector/UniformVectorSteppedTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_string/EscapeJSONTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_string/EscapeJSONTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_string/EscapeJSONTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_string/EscapeJSONTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_string/MatchFuncTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_string/MatchFuncTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_string/MatchFuncTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_string/MatchFuncTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_string/MatchRegexTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_string/MatchRegexTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_string/MatchRegexTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/from_string/MatchRegexTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/repeaters/RepeatListTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/repeaters/RepeatListTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/repeaters/RepeatListTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/repeaters/RepeatListTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadThreadLocalTests.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadThreadLocalTests.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadThreadLocalTests.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/stateful/LoadThreadLocalTests.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/stateful/NullOrPassTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/stateful/NullOrPassTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/stateful/NullOrPassTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/stateful/NullOrPassTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/stateful/ShowTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/stateful/ShowTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/stateful/ShowTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/stateful/ShowTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/IntHashTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/IntHashTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/IntHashTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_int/IntHashTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/FieldExtractorTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/FieldExtractorTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/FieldExtractorTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/FieldExtractorTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/FirstLinesTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/FirstLinesTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/FirstLinesTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/FirstLinesTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/MirrorToStringTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/MirrorToStringTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/MirrorToStringTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/MirrorToStringTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/ReplaceRegexTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/ReplaceRegexTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/ReplaceRegexTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/ReplaceRegexTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/TemplateTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/TemplateTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/TemplateTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/TemplateTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/TokenTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/TokenTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/TokenTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/unary_string/TokenTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/util/CombinerTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/util/CombinerTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/util/CombinerTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/util/CombinerTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/util/DoubleCombinerTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/util/DoubleCombinerTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/util/DoubleCombinerTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/shared/util/DoubleCombinerTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/libraryimpl/BasicDataMappersTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/libraryimpl/BasicDataMappersTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/libraryimpl/BasicDataMappersTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/libraryimpl/BasicDataMappersTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_collections/HashedRangeToLongListTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_collections/HashedRangeToLongListTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_collections/HashedRangeToLongListTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_collections/HashedRangeToLongListTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_double/HashedDoubleRangeTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_double/HashedDoubleRangeTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_double/HashedDoubleRangeTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_double/HashedDoubleRangeTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_long/HashRangeTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_long/HashRangeTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_long/HashRangeTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_long/HashRangeTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_long/HashTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_long/HashTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_long/HashTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_long/HashTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_long/RangeTests.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_long/RangeTests.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_long/RangeTests.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_long/RangeTests.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_long/SignalPIDTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_long/SignalPIDTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_long/SignalPIDTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_long/SignalPIDTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_long/SignedHashTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_long/SignedHashTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_long/SignedHashTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_long/SignedHashTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_string/AlphaNumericStringTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_string/AlphaNumericStringTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_string/AlphaNumericStringTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_string/AlphaNumericStringTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_string/CombinationsTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_string/CombinationsTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_string/CombinationsTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_string/CombinationsTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_string/HashedFileExtractToStringTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_string/HashedFileExtractToStringTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_string/HashedFileExtractToStringTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_string/HashedFileExtractToStringTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_string/WeightedStringsTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_string/WeightedStringsTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_string/WeightedStringsTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_string/WeightedStringsTest.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_timeuuid/TimeUUIDTests.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_timeuuid/TimeUUIDTests.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_timeuuid/TimeUUIDTests.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_timeuuid/TimeUUIDTests.java
diff --git a/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_timeuuid/ToEpochTimeUUIDTest.java b/nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_timeuuid/ToEpochTimeUUIDTest.java
similarity index 100%
rename from virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_timeuuid/ToEpochTimeUUIDTest.java
rename to nb-virtdata/virtdata-lib-basics/src/test/java/io/nosqlbench/virtdata/library/basics/tests/long_timeuuid/ToEpochTimeUUIDTest.java
diff --git a/virtdata-lib-basics/src/test/resources/basicdata.csv b/nb-virtdata/virtdata-lib-basics/src/test/resources/basicdata.csv
similarity index 100%
rename from virtdata-lib-basics/src/test/resources/basicdata.csv
rename to nb-virtdata/virtdata-lib-basics/src/test/resources/basicdata.csv
diff --git a/virtdata-lib-basics/src/test/resources/data/text-provider-sample.txt b/nb-virtdata/virtdata-lib-basics/src/test/resources/data/text-provider-sample.txt
similarity index 100%
rename from virtdata-lib-basics/src/test/resources/data/text-provider-sample.txt
rename to nb-virtdata/virtdata-lib-basics/src/test/resources/data/text-provider-sample.txt
diff --git a/virtdata-lib-basics/src/test/resources/log4j2-test.xml b/nb-virtdata/virtdata-lib-basics/src/test/resources/log4j2-test.xml
similarity index 100%
rename from virtdata-lib-basics/src/test/resources/log4j2-test.xml
rename to nb-virtdata/virtdata-lib-basics/src/test/resources/log4j2-test.xml
diff --git a/virtdata-lib-basics/src/test/resources/static-do-not-change/data1.txt b/nb-virtdata/virtdata-lib-basics/src/test/resources/static-do-not-change/data1.txt
similarity index 100%
rename from virtdata-lib-basics/src/test/resources/static-do-not-change/data1.txt
rename to nb-virtdata/virtdata-lib-basics/src/test/resources/static-do-not-change/data1.txt
diff --git a/virtdata-lib-basics/src/test/resources/static-do-not-change/data2.txt b/nb-virtdata/virtdata-lib-basics/src/test/resources/static-do-not-change/data2.txt
similarity index 100%
rename from virtdata-lib-basics/src/test/resources/static-do-not-change/data2.txt
rename to nb-virtdata/virtdata-lib-basics/src/test/resources/static-do-not-change/data2.txt
diff --git a/virtdata-lib-basics/src/test/resources/static-do-not-change/subdirectory-static-do-not-change/data3-empty.txt b/nb-virtdata/virtdata-lib-basics/src/test/resources/static-do-not-change/subdirectory-static-do-not-change/data3-empty.txt
similarity index 100%
rename from virtdata-lib-basics/src/test/resources/static-do-not-change/subdirectory-static-do-not-change/data3-empty.txt
rename to nb-virtdata/virtdata-lib-basics/src/test/resources/static-do-not-change/subdirectory-static-do-not-change/data3-empty.txt
diff --git a/virtdata-lib-basics/src/test/resources/static-do-not-change/subdirectory-static-do-not-change/data4-mismatching.dat b/nb-virtdata/virtdata-lib-basics/src/test/resources/static-do-not-change/subdirectory-static-do-not-change/data4-mismatching.dat
similarity index 100%
rename from virtdata-lib-basics/src/test/resources/static-do-not-change/subdirectory-static-do-not-change/data4-mismatching.dat
rename to nb-virtdata/virtdata-lib-basics/src/test/resources/static-do-not-change/subdirectory-static-do-not-change/data4-mismatching.dat
diff --git a/virtdata-lib-curves4/pom.xml b/nb-virtdata/virtdata-lib-curves4/pom.xml
similarity index 96%
rename from virtdata-lib-curves4/pom.xml
rename to nb-virtdata/virtdata-lib-curves4/pom.xml
index c796a3bb32..8f59c5e92b 100644
--- a/virtdata-lib-curves4/pom.xml
+++ b/nb-virtdata/virtdata-lib-curves4/pom.xml
@@ -21,13 +21,13 @@
mvn-defaults
io.nosqlbench
${revision}
- ../mvn-defaults
+ ../../mvn-defaults
virtdata-lib-curves4
jar
virtdata-lib-curves4
- http://nosqlbench.io/
+ https://nosqlbench.io/
Statistical sampling library for use in virtdata libraries, based
on apache commons math 4
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/common/InterpolatingIntDoubleSampler.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/common/InterpolatingIntDoubleSampler.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/common/InterpolatingIntDoubleSampler.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/common/InterpolatingIntDoubleSampler.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/common/InterpolatingLongDoubleSampler.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/common/InterpolatingLongDoubleSampler.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/common/InterpolatingLongDoubleSampler.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/common/InterpolatingLongDoubleSampler.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/common/RealDistributionICDSource.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/common/RealDistributionICDSource.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/common/RealDistributionICDSource.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/common/RealDistributionICDSource.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/common/RealIntDoubleSampler.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/common/RealIntDoubleSampler.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/common/RealIntDoubleSampler.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/common/RealIntDoubleSampler.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/common/RealLongDoubleSampler.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/common/RealLongDoubleSampler.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/common/RealLongDoubleSampler.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/common/RealLongDoubleSampler.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Beta.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Beta.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Beta.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Beta.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Cauchy.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Cauchy.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Cauchy.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Cauchy.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/ChiSquared.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/ChiSquared.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/ChiSquared.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/ChiSquared.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/ConstantContinuous.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/ConstantContinuous.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/ConstantContinuous.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/ConstantContinuous.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Enumerated.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Enumerated.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Enumerated.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Enumerated.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Exponential.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Exponential.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Exponential.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Exponential.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/F.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/F.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/F.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/F.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Gamma.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Gamma.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Gamma.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Gamma.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Gumbel.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Gumbel.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Gumbel.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Gumbel.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/IntToDoubleContinuousCurve.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/IntToDoubleContinuousCurve.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/IntToDoubleContinuousCurve.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/IntToDoubleContinuousCurve.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Laplace.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Laplace.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Laplace.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Laplace.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Levy.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Levy.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Levy.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Levy.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/LogNormal.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/LogNormal.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/LogNormal.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/LogNormal.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Logistic.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Logistic.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Logistic.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Logistic.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Nakagami.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Nakagami.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Nakagami.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Nakagami.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Normal.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Normal.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Normal.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Normal.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Pareto.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Pareto.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Pareto.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Pareto.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/T.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/T.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/T.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/T.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Triangular.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Triangular.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Triangular.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Triangular.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Uniform.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Uniform.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Uniform.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Uniform.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Weibull.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Weibull.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Weibull.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/int_double/Weibull.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Beta.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Beta.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Beta.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Beta.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Cauchy.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Cauchy.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Cauchy.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Cauchy.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/ChiSquared.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/ChiSquared.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/ChiSquared.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/ChiSquared.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/ConstantContinuous.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/ConstantContinuous.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/ConstantContinuous.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/ConstantContinuous.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Enumerated.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Enumerated.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Enumerated.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Enumerated.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Exponential.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Exponential.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Exponential.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Exponential.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/F.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/F.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/F.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/F.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Gamma.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Gamma.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Gamma.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Gamma.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Gumbel.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Gumbel.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Gumbel.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Gumbel.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Laplace.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Laplace.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Laplace.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Laplace.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Levy.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Levy.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Levy.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Levy.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/LogNormal.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/LogNormal.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/LogNormal.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/LogNormal.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Logistic.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Logistic.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Logistic.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Logistic.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/LongToDoubleContinuousCurve.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/LongToDoubleContinuousCurve.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/LongToDoubleContinuousCurve.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/LongToDoubleContinuousCurve.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Nakagami.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Nakagami.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Nakagami.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Nakagami.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Normal.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Normal.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Normal.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Normal.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Pareto.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Pareto.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Pareto.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Pareto.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/T.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/T.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/T.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/T.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Triangular.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Triangular.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Triangular.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Triangular.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Uniform.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Uniform.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Uniform.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Uniform.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Weibull.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Weibull.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Weibull.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/continuous/long_double/Weibull.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/DiscreteIntIntSampler.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/DiscreteIntIntSampler.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/DiscreteIntIntSampler.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/DiscreteIntIntSampler.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/DiscreteIntLongSampler.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/DiscreteIntLongSampler.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/DiscreteIntLongSampler.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/DiscreteIntLongSampler.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/DiscreteLongIntSampler.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/DiscreteLongIntSampler.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/DiscreteLongIntSampler.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/DiscreteLongIntSampler.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/DiscreteLongLongSampler.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/DiscreteLongLongSampler.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/DiscreteLongLongSampler.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/DiscreteLongLongSampler.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/IntegerDistributionICDSource.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/IntegerDistributionICDSource.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/IntegerDistributionICDSource.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/IntegerDistributionICDSource.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/InterpolatingIntIntSampler.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/InterpolatingIntIntSampler.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/InterpolatingIntIntSampler.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/InterpolatingIntIntSampler.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/InterpolatingIntLongSampler.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/InterpolatingIntLongSampler.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/InterpolatingIntLongSampler.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/InterpolatingIntLongSampler.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/InterpolatingLongIntSampler.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/InterpolatingLongIntSampler.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/InterpolatingLongIntSampler.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/InterpolatingLongIntSampler.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/InterpolatingLongLongSampler.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/InterpolatingLongLongSampler.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/InterpolatingLongLongSampler.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/InterpolatingLongLongSampler.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/ThreadSafeHash.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/ThreadSafeHash.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/ThreadSafeHash.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/common/ThreadSafeHash.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Binomial.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Binomial.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Binomial.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Binomial.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Geometric.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Geometric.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Geometric.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Geometric.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Hypergeometric.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Hypergeometric.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Hypergeometric.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Hypergeometric.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/IntToIntDiscreteCurve.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/IntToIntDiscreteCurve.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/IntToIntDiscreteCurve.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/IntToIntDiscreteCurve.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Pascal.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Pascal.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Pascal.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Pascal.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Poisson.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Poisson.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Poisson.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Poisson.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Uniform.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Uniform.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Uniform.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Uniform.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Zipf.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Zipf.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Zipf.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_int/Zipf.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Binomial.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Binomial.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Binomial.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Binomial.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Geometric.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Geometric.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Geometric.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Geometric.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Hypergeometric.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Hypergeometric.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Hypergeometric.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Hypergeometric.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/IntToLongDiscreteCurve.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/IntToLongDiscreteCurve.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/IntToLongDiscreteCurve.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/IntToLongDiscreteCurve.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Pascal.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Pascal.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Pascal.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Pascal.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Poisson.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Poisson.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Poisson.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Poisson.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Uniform.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Uniform.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Uniform.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Uniform.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Zipf.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Zipf.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Zipf.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/int_long/Zipf.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Binomial.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Binomial.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Binomial.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Binomial.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Geometric.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Geometric.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Geometric.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Geometric.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Hypergeometric.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Hypergeometric.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Hypergeometric.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Hypergeometric.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/LongToIntDiscreteCurve.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/LongToIntDiscreteCurve.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/LongToIntDiscreteCurve.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/LongToIntDiscreteCurve.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Pascal.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Pascal.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Pascal.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Pascal.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Poisson.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Poisson.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Poisson.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Poisson.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Uniform.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Uniform.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Uniform.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Uniform.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Zipf.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Zipf.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Zipf.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_int/Zipf.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Binomial.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Binomial.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Binomial.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Binomial.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Geometric.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Geometric.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Geometric.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Geometric.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Hypergeometric.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Hypergeometric.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Hypergeometric.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Hypergeometric.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/LongToLongDiscreteCurve.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/LongToLongDiscreteCurve.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/LongToLongDiscreteCurve.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/LongToLongDiscreteCurve.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Pascal.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Pascal.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Pascal.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Pascal.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Poisson.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Poisson.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Poisson.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Poisson.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Uniform.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Uniform.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Uniform.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Uniform.java
diff --git a/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Zipf.java b/nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Zipf.java
similarity index 100%
rename from virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Zipf.java
rename to nb-virtdata/virtdata-lib-curves4/src/main/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/Zipf.java
diff --git a/virtdata-lib-random/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/nb-virtdata/virtdata-lib-curves4/src/main/resources/META-INF/services/javax.annotation.processing.Processor
similarity index 100%
rename from virtdata-lib-random/src/main/resources/META-INF/services/javax.annotation.processing.Processor
rename to nb-virtdata/virtdata-lib-curves4/src/main/resources/META-INF/services/javax.annotation.processing.Processor
diff --git a/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-math4/4.0-SNAPSHOT/commons-math4-4.0-SNAPSHOT.jar b/nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-math4/4.0-SNAPSHOT/commons-math4-4.0-SNAPSHOT.jar
similarity index 100%
rename from virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-math4/4.0-SNAPSHOT/commons-math4-4.0-SNAPSHOT.jar
rename to nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-math4/4.0-SNAPSHOT/commons-math4-4.0-SNAPSHOT.jar
diff --git a/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-math4/4.0-SNAPSHOT/commons-math4-4.0-SNAPSHOT.pom b/nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-math4/4.0-SNAPSHOT/commons-math4-4.0-SNAPSHOT.pom
similarity index 100%
rename from virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-math4/4.0-SNAPSHOT/commons-math4-4.0-SNAPSHOT.pom
rename to nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-math4/4.0-SNAPSHOT/commons-math4-4.0-SNAPSHOT.pom
diff --git a/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-math4/4.0-SNAPSHOT/maven-metadata-local.xml b/nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-math4/4.0-SNAPSHOT/maven-metadata-local.xml
similarity index 100%
rename from virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-math4/4.0-SNAPSHOT/maven-metadata-local.xml
rename to nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-math4/4.0-SNAPSHOT/maven-metadata-local.xml
diff --git a/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-math4/maven-metadata-local.xml b/nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-math4/maven-metadata-local.xml
similarity index 100%
rename from virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-math4/maven-metadata-local.xml
rename to nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-math4/maven-metadata-local.xml
diff --git a/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-angle/1.0-SNAPSHOT/commons-numbers-angle-1.0-SNAPSHOT.jar b/nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-angle/1.0-SNAPSHOT/commons-numbers-angle-1.0-SNAPSHOT.jar
similarity index 100%
rename from virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-angle/1.0-SNAPSHOT/commons-numbers-angle-1.0-SNAPSHOT.jar
rename to nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-angle/1.0-SNAPSHOT/commons-numbers-angle-1.0-SNAPSHOT.jar
diff --git a/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-angle/1.0-SNAPSHOT/commons-numbers-angle-1.0-SNAPSHOT.pom b/nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-angle/1.0-SNAPSHOT/commons-numbers-angle-1.0-SNAPSHOT.pom
similarity index 100%
rename from virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-angle/1.0-SNAPSHOT/commons-numbers-angle-1.0-SNAPSHOT.pom
rename to nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-angle/1.0-SNAPSHOT/commons-numbers-angle-1.0-SNAPSHOT.pom
diff --git a/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-angle/1.0-SNAPSHOT/maven-metadata-local.xml b/nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-angle/1.0-SNAPSHOT/maven-metadata-local.xml
similarity index 100%
rename from virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-angle/1.0-SNAPSHOT/maven-metadata-local.xml
rename to nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-angle/1.0-SNAPSHOT/maven-metadata-local.xml
diff --git a/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-angle/maven-metadata-local.xml b/nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-angle/maven-metadata-local.xml
similarity index 100%
rename from virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-angle/maven-metadata-local.xml
rename to nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-angle/maven-metadata-local.xml
diff --git a/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-arrays/1.0-SNAPSHOT/commons-numbers-arrays-1.0-SNAPSHOT.jar b/nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-arrays/1.0-SNAPSHOT/commons-numbers-arrays-1.0-SNAPSHOT.jar
similarity index 100%
rename from virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-arrays/1.0-SNAPSHOT/commons-numbers-arrays-1.0-SNAPSHOT.jar
rename to nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-arrays/1.0-SNAPSHOT/commons-numbers-arrays-1.0-SNAPSHOT.jar
diff --git a/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-arrays/1.0-SNAPSHOT/commons-numbers-arrays-1.0-SNAPSHOT.pom b/nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-arrays/1.0-SNAPSHOT/commons-numbers-arrays-1.0-SNAPSHOT.pom
similarity index 100%
rename from virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-arrays/1.0-SNAPSHOT/commons-numbers-arrays-1.0-SNAPSHOT.pom
rename to nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-arrays/1.0-SNAPSHOT/commons-numbers-arrays-1.0-SNAPSHOT.pom
diff --git a/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-arrays/1.0-SNAPSHOT/maven-metadata-local.xml b/nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-arrays/1.0-SNAPSHOT/maven-metadata-local.xml
similarity index 100%
rename from virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-arrays/1.0-SNAPSHOT/maven-metadata-local.xml
rename to nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-arrays/1.0-SNAPSHOT/maven-metadata-local.xml
diff --git a/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-arrays/maven-metadata-local.xml b/nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-arrays/maven-metadata-local.xml
similarity index 100%
rename from virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-arrays/maven-metadata-local.xml
rename to nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-arrays/maven-metadata-local.xml
diff --git a/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-combinatorics/1.0-SNAPSHOT/commons-numbers-combinatorics-1.0-SNAPSHOT.jar b/nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-combinatorics/1.0-SNAPSHOT/commons-numbers-combinatorics-1.0-SNAPSHOT.jar
similarity index 100%
rename from virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-combinatorics/1.0-SNAPSHOT/commons-numbers-combinatorics-1.0-SNAPSHOT.jar
rename to nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-combinatorics/1.0-SNAPSHOT/commons-numbers-combinatorics-1.0-SNAPSHOT.jar
diff --git a/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-combinatorics/1.0-SNAPSHOT/commons-numbers-combinatorics-1.0-SNAPSHOT.pom b/nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-combinatorics/1.0-SNAPSHOT/commons-numbers-combinatorics-1.0-SNAPSHOT.pom
similarity index 100%
rename from virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-combinatorics/1.0-SNAPSHOT/commons-numbers-combinatorics-1.0-SNAPSHOT.pom
rename to nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-combinatorics/1.0-SNAPSHOT/commons-numbers-combinatorics-1.0-SNAPSHOT.pom
diff --git a/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-combinatorics/1.0-SNAPSHOT/maven-metadata-local.xml b/nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-combinatorics/1.0-SNAPSHOT/maven-metadata-local.xml
similarity index 100%
rename from virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-combinatorics/1.0-SNAPSHOT/maven-metadata-local.xml
rename to nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-combinatorics/1.0-SNAPSHOT/maven-metadata-local.xml
diff --git a/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-combinatorics/maven-metadata-local.xml b/nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-combinatorics/maven-metadata-local.xml
similarity index 100%
rename from virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-combinatorics/maven-metadata-local.xml
rename to nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-combinatorics/maven-metadata-local.xml
diff --git a/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-complex-streams/1.0-SNAPSHOT/commons-numbers-complex-streams-1.0-SNAPSHOT.jar b/nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-complex-streams/1.0-SNAPSHOT/commons-numbers-complex-streams-1.0-SNAPSHOT.jar
similarity index 100%
rename from virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-complex-streams/1.0-SNAPSHOT/commons-numbers-complex-streams-1.0-SNAPSHOT.jar
rename to nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-complex-streams/1.0-SNAPSHOT/commons-numbers-complex-streams-1.0-SNAPSHOT.jar
diff --git a/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-complex-streams/1.0-SNAPSHOT/commons-numbers-complex-streams-1.0-SNAPSHOT.pom b/nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-complex-streams/1.0-SNAPSHOT/commons-numbers-complex-streams-1.0-SNAPSHOT.pom
similarity index 100%
rename from virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-complex-streams/1.0-SNAPSHOT/commons-numbers-complex-streams-1.0-SNAPSHOT.pom
rename to nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-complex-streams/1.0-SNAPSHOT/commons-numbers-complex-streams-1.0-SNAPSHOT.pom
diff --git a/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-complex-streams/1.0-SNAPSHOT/maven-metadata-local.xml b/nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-complex-streams/1.0-SNAPSHOT/maven-metadata-local.xml
similarity index 100%
rename from virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-complex-streams/1.0-SNAPSHOT/maven-metadata-local.xml
rename to nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-complex-streams/1.0-SNAPSHOT/maven-metadata-local.xml
diff --git a/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-complex-streams/maven-metadata-local.xml b/nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-complex-streams/maven-metadata-local.xml
similarity index 100%
rename from virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-complex-streams/maven-metadata-local.xml
rename to nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-complex-streams/maven-metadata-local.xml
diff --git a/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-complex/1.0-SNAPSHOT/commons-numbers-complex-1.0-SNAPSHOT.jar b/nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-complex/1.0-SNAPSHOT/commons-numbers-complex-1.0-SNAPSHOT.jar
similarity index 100%
rename from virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-complex/1.0-SNAPSHOT/commons-numbers-complex-1.0-SNAPSHOT.jar
rename to nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-complex/1.0-SNAPSHOT/commons-numbers-complex-1.0-SNAPSHOT.jar
diff --git a/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-complex/1.0-SNAPSHOT/commons-numbers-complex-1.0-SNAPSHOT.pom b/nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-complex/1.0-SNAPSHOT/commons-numbers-complex-1.0-SNAPSHOT.pom
similarity index 100%
rename from virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-complex/1.0-SNAPSHOT/commons-numbers-complex-1.0-SNAPSHOT.pom
rename to nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-complex/1.0-SNAPSHOT/commons-numbers-complex-1.0-SNAPSHOT.pom
diff --git a/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-complex/1.0-SNAPSHOT/maven-metadata-local.xml b/nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-complex/1.0-SNAPSHOT/maven-metadata-local.xml
similarity index 100%
rename from virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-complex/1.0-SNAPSHOT/maven-metadata-local.xml
rename to nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-complex/1.0-SNAPSHOT/maven-metadata-local.xml
diff --git a/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-complex/maven-metadata-local.xml b/nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-complex/maven-metadata-local.xml
similarity index 100%
rename from virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-complex/maven-metadata-local.xml
rename to nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-complex/maven-metadata-local.xml
diff --git a/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-core/1.0-SNAPSHOT/commons-numbers-core-1.0-SNAPSHOT.jar b/nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-core/1.0-SNAPSHOT/commons-numbers-core-1.0-SNAPSHOT.jar
similarity index 100%
rename from virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-core/1.0-SNAPSHOT/commons-numbers-core-1.0-SNAPSHOT.jar
rename to nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-core/1.0-SNAPSHOT/commons-numbers-core-1.0-SNAPSHOT.jar
diff --git a/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-core/1.0-SNAPSHOT/commons-numbers-core-1.0-SNAPSHOT.pom b/nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-core/1.0-SNAPSHOT/commons-numbers-core-1.0-SNAPSHOT.pom
similarity index 100%
rename from virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-core/1.0-SNAPSHOT/commons-numbers-core-1.0-SNAPSHOT.pom
rename to nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-core/1.0-SNAPSHOT/commons-numbers-core-1.0-SNAPSHOT.pom
diff --git a/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-core/1.0-SNAPSHOT/maven-metadata-local.xml b/nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-core/1.0-SNAPSHOT/maven-metadata-local.xml
similarity index 100%
rename from virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-core/1.0-SNAPSHOT/maven-metadata-local.xml
rename to nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-core/1.0-SNAPSHOT/maven-metadata-local.xml
diff --git a/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-core/maven-metadata-local.xml b/nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-core/maven-metadata-local.xml
similarity index 100%
rename from virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-core/maven-metadata-local.xml
rename to nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-core/maven-metadata-local.xml
diff --git a/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-fraction/1.0-SNAPSHOT/commons-numbers-fraction-1.0-SNAPSHOT.jar b/nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-fraction/1.0-SNAPSHOT/commons-numbers-fraction-1.0-SNAPSHOT.jar
similarity index 100%
rename from virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-fraction/1.0-SNAPSHOT/commons-numbers-fraction-1.0-SNAPSHOT.jar
rename to nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-fraction/1.0-SNAPSHOT/commons-numbers-fraction-1.0-SNAPSHOT.jar
diff --git a/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-fraction/1.0-SNAPSHOT/commons-numbers-fraction-1.0-SNAPSHOT.pom b/nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-fraction/1.0-SNAPSHOT/commons-numbers-fraction-1.0-SNAPSHOT.pom
similarity index 100%
rename from virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-fraction/1.0-SNAPSHOT/commons-numbers-fraction-1.0-SNAPSHOT.pom
rename to nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-fraction/1.0-SNAPSHOT/commons-numbers-fraction-1.0-SNAPSHOT.pom
diff --git a/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-fraction/1.0-SNAPSHOT/maven-metadata-local.xml b/nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-fraction/1.0-SNAPSHOT/maven-metadata-local.xml
similarity index 100%
rename from virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-fraction/1.0-SNAPSHOT/maven-metadata-local.xml
rename to nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-fraction/1.0-SNAPSHOT/maven-metadata-local.xml
diff --git a/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-fraction/maven-metadata-local.xml b/nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-fraction/maven-metadata-local.xml
similarity index 100%
rename from virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-fraction/maven-metadata-local.xml
rename to nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-fraction/maven-metadata-local.xml
diff --git a/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-gamma/1.0-SNAPSHOT/commons-numbers-gamma-1.0-SNAPSHOT.jar b/nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-gamma/1.0-SNAPSHOT/commons-numbers-gamma-1.0-SNAPSHOT.jar
similarity index 100%
rename from virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-gamma/1.0-SNAPSHOT/commons-numbers-gamma-1.0-SNAPSHOT.jar
rename to nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-gamma/1.0-SNAPSHOT/commons-numbers-gamma-1.0-SNAPSHOT.jar
diff --git a/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-gamma/1.0-SNAPSHOT/commons-numbers-gamma-1.0-SNAPSHOT.pom b/nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-gamma/1.0-SNAPSHOT/commons-numbers-gamma-1.0-SNAPSHOT.pom
similarity index 100%
rename from virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-gamma/1.0-SNAPSHOT/commons-numbers-gamma-1.0-SNAPSHOT.pom
rename to nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-gamma/1.0-SNAPSHOT/commons-numbers-gamma-1.0-SNAPSHOT.pom
diff --git a/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-gamma/1.0-SNAPSHOT/maven-metadata-local.xml b/nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-gamma/1.0-SNAPSHOT/maven-metadata-local.xml
similarity index 100%
rename from virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-gamma/1.0-SNAPSHOT/maven-metadata-local.xml
rename to nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-gamma/1.0-SNAPSHOT/maven-metadata-local.xml
diff --git a/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-gamma/maven-metadata-local.xml b/nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-gamma/maven-metadata-local.xml
similarity index 100%
rename from virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-gamma/maven-metadata-local.xml
rename to nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-numbers-gamma/maven-metadata-local.xml
diff --git a/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-statistics-distribution/0.1-SNAPSHOT/commons-statistics-distribution-0.1-SNAPSHOT.jar b/nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-statistics-distribution/0.1-SNAPSHOT/commons-statistics-distribution-0.1-SNAPSHOT.jar
similarity index 100%
rename from virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-statistics-distribution/0.1-SNAPSHOT/commons-statistics-distribution-0.1-SNAPSHOT.jar
rename to nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-statistics-distribution/0.1-SNAPSHOT/commons-statistics-distribution-0.1-SNAPSHOT.jar
diff --git a/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-statistics-distribution/0.1-SNAPSHOT/commons-statistics-distribution-0.1-SNAPSHOT.pom b/nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-statistics-distribution/0.1-SNAPSHOT/commons-statistics-distribution-0.1-SNAPSHOT.pom
similarity index 100%
rename from virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-statistics-distribution/0.1-SNAPSHOT/commons-statistics-distribution-0.1-SNAPSHOT.pom
rename to nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-statistics-distribution/0.1-SNAPSHOT/commons-statistics-distribution-0.1-SNAPSHOT.pom
diff --git a/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-statistics-distribution/0.1-SNAPSHOT/maven-metadata-local.xml b/nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-statistics-distribution/0.1-SNAPSHOT/maven-metadata-local.xml
similarity index 100%
rename from virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-statistics-distribution/0.1-SNAPSHOT/maven-metadata-local.xml
rename to nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-statistics-distribution/0.1-SNAPSHOT/maven-metadata-local.xml
diff --git a/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-statistics-distribution/maven-metadata-local.xml b/nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-statistics-distribution/maven-metadata-local.xml
similarity index 100%
rename from virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-statistics-distribution/maven-metadata-local.xml
rename to nb-virtdata/virtdata-lib-curves4/src/main/resources/repo/org/apache/commons/commons-statistics-distribution/maven-metadata-local.xml
diff --git a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/EnumeratedTest.java b/nb-virtdata/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/EnumeratedTest.java
similarity index 100%
rename from virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/EnumeratedTest.java
rename to nb-virtdata/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/EnumeratedTest.java
diff --git a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/LevyTest.java b/nb-virtdata/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/LevyTest.java
similarity index 100%
rename from virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/LevyTest.java
rename to nb-virtdata/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/LevyTest.java
diff --git a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/RealDistributionsConcurrencyTests.java b/nb-virtdata/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/RealDistributionsConcurrencyTests.java
similarity index 100%
rename from virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/RealDistributionsConcurrencyTests.java
rename to nb-virtdata/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/RealDistributionsConcurrencyTests.java
diff --git a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/RealDistributionsValuesTest.java b/nb-virtdata/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/RealDistributionsValuesTest.java
similarity index 100%
rename from virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/RealDistributionsValuesTest.java
rename to nb-virtdata/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/continuous/RealDistributionsValuesTest.java
diff --git a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/IntegerDistributionsBinomialSanity.java b/nb-virtdata/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/IntegerDistributionsBinomialSanity.java
similarity index 100%
rename from virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/IntegerDistributionsBinomialSanity.java
rename to nb-virtdata/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/IntegerDistributionsBinomialSanity.java
diff --git a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/IntegerDistributionsConcurrencyTest.java b/nb-virtdata/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/IntegerDistributionsConcurrencyTest.java
similarity index 100%
rename from virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/IntegerDistributionsConcurrencyTest.java
rename to nb-virtdata/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/IntegerDistributionsConcurrencyTest.java
diff --git a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/IntegerDistributionsValuesTest.java b/nb-virtdata/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/IntegerDistributionsValuesTest.java
similarity index 100%
rename from virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/IntegerDistributionsValuesTest.java
rename to nb-virtdata/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/IntegerDistributionsValuesTest.java
diff --git a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/common/ThreadSafeHashTest.java b/nb-virtdata/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/common/ThreadSafeHashTest.java
similarity index 100%
rename from virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/common/ThreadSafeHashTest.java
rename to nb-virtdata/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/common/ThreadSafeHashTest.java
diff --git a/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/ZipfTest.java b/nb-virtdata/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/ZipfTest.java
similarity index 100%
rename from virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/ZipfTest.java
rename to nb-virtdata/virtdata-lib-curves4/src/test/java/io/nosqlbench/virtdata/library/curves4/discrete/long_long/ZipfTest.java
diff --git a/virtdata-lib-hdf5/pom.xml b/nb-virtdata/virtdata-lib-hdf5/pom.xml
similarity index 95%
rename from virtdata-lib-hdf5/pom.xml
rename to nb-virtdata/virtdata-lib-hdf5/pom.xml
index 6899784602..9c3f6a5219 100644
--- a/virtdata-lib-hdf5/pom.xml
+++ b/nb-virtdata/virtdata-lib-hdf5/pom.xml
@@ -21,13 +21,13 @@
mvn-defaults
io.nosqlbench
${revision}
- ../mvn-defaults
+ ../../mvn-defaults
virtdata-lib-hdf5
jar
virtdata-lib-hdf5
- http://nosqlbench.io/
+ https://nosqlbench.io/
With inspiration from other libraries
diff --git a/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/AbstractHdfFileToVectorType.java b/nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/AbstractHdfFileToVectorType.java
similarity index 100%
rename from virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/AbstractHdfFileToVectorType.java
rename to nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/AbstractHdfFileToVectorType.java
diff --git a/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_array/HdfFileToFloatArray.java b/nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_array/HdfFileToFloatArray.java
similarity index 100%
rename from virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_array/HdfFileToFloatArray.java
rename to nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_array/HdfFileToFloatArray.java
diff --git a/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_array/HdfFileToIntArray.java b/nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_array/HdfFileToIntArray.java
similarity index 100%
rename from virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_array/HdfFileToIntArray.java
rename to nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_array/HdfFileToIntArray.java
diff --git a/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_array/HdfFileToLongArray.java b/nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_array/HdfFileToLongArray.java
similarity index 100%
rename from virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_array/HdfFileToLongArray.java
rename to nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_array/HdfFileToLongArray.java
diff --git a/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_list/HdfFileToFloatList.java b/nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_list/HdfFileToFloatList.java
similarity index 100%
rename from virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_list/HdfFileToFloatList.java
rename to nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_list/HdfFileToFloatList.java
diff --git a/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_list/HdfFileToIntList.java b/nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_list/HdfFileToIntList.java
similarity index 100%
rename from virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_list/HdfFileToIntList.java
rename to nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_list/HdfFileToIntList.java
diff --git a/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_list/HdfFileToLongList.java b/nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_list/HdfFileToLongList.java
similarity index 100%
rename from virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_list/HdfFileToLongList.java
rename to nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_list/HdfFileToLongList.java
diff --git a/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/HdfDatasetToString.java b/nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/HdfDatasetToString.java
similarity index 100%
rename from virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/HdfDatasetToString.java
rename to nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/HdfDatasetToString.java
diff --git a/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/HdfDatasetToStrings.java b/nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/HdfDatasetToStrings.java
similarity index 100%
rename from virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/HdfDatasetToStrings.java
rename to nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/HdfDatasetToStrings.java
diff --git a/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/HdfDatasetsToString.java b/nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/HdfDatasetsToString.java
similarity index 100%
rename from virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/HdfDatasetsToString.java
rename to nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/HdfDatasetsToString.java
diff --git a/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/predicate_parser/DatasetParser.java b/nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/predicate_parser/DatasetParser.java
similarity index 100%
rename from virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/predicate_parser/DatasetParser.java
rename to nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/predicate_parser/DatasetParser.java
diff --git a/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/predicate_parser/from_json/NoopDatasetParser.java b/nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/predicate_parser/from_json/NoopDatasetParser.java
similarity index 100%
rename from virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/predicate_parser/from_json/NoopDatasetParser.java
rename to nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/predicate_parser/from_json/NoopDatasetParser.java
diff --git a/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/predicate_parser/from_json/to_cql/CqlDatasetParser.java b/nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/predicate_parser/from_json/to_cql/CqlDatasetParser.java
similarity index 100%
rename from virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/predicate_parser/from_json/to_cql/CqlDatasetParser.java
rename to nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/predicate_parser/from_json/to_cql/CqlDatasetParser.java
diff --git a/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/predicate_parser/from_json/to_cql/JAWDatasetParser.java b/nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/predicate_parser/from_json/to_cql/JAWDatasetParser.java
similarity index 100%
rename from virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/predicate_parser/from_json/to_cql/JAWDatasetParser.java
rename to nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/predicate_parser/from_json/to_cql/JAWDatasetParser.java
diff --git a/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/predicate_parser/predicates.md b/nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/predicate_parser/predicates.md
similarity index 100%
rename from virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/predicate_parser/predicates.md
rename to nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/predicate_parser/predicates.md
diff --git a/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/helpers/DoubleEmbeddingGenerator.java b/nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/helpers/DoubleEmbeddingGenerator.java
similarity index 100%
rename from virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/helpers/DoubleEmbeddingGenerator.java
rename to nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/helpers/DoubleEmbeddingGenerator.java
diff --git a/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/helpers/EmbeddingGenerator.java b/nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/helpers/EmbeddingGenerator.java
similarity index 100%
rename from virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/helpers/EmbeddingGenerator.java
rename to nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/helpers/EmbeddingGenerator.java
diff --git a/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/helpers/EmbeddingGeneratorFactory.java b/nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/helpers/EmbeddingGeneratorFactory.java
similarity index 100%
rename from virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/helpers/EmbeddingGeneratorFactory.java
rename to nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/helpers/EmbeddingGeneratorFactory.java
diff --git a/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/helpers/FloatEmbeddingGenerator.java b/nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/helpers/FloatEmbeddingGenerator.java
similarity index 100%
rename from virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/helpers/FloatEmbeddingGenerator.java
rename to nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/helpers/FloatEmbeddingGenerator.java
diff --git a/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/helpers/IntEmbeddingGenerator.java b/nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/helpers/IntEmbeddingGenerator.java
similarity index 100%
rename from virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/helpers/IntEmbeddingGenerator.java
rename to nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/helpers/IntEmbeddingGenerator.java
diff --git a/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/helpers/LongEmbeddingGenerator.java b/nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/helpers/LongEmbeddingGenerator.java
similarity index 100%
rename from virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/helpers/LongEmbeddingGenerator.java
rename to nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/hdf5/helpers/LongEmbeddingGenerator.java
diff --git a/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/ivecfvec/FVecReader.java b/nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/ivecfvec/FVecReader.java
similarity index 100%
rename from virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/ivecfvec/FVecReader.java
rename to nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/ivecfvec/FVecReader.java
diff --git a/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/ivecfvec/IVecReader.java b/nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/ivecfvec/IVecReader.java
similarity index 100%
rename from virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/ivecfvec/IVecReader.java
rename to nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/ivecfvec/IVecReader.java
diff --git a/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/ivecfvec/IvecFvecMethods.java b/nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/ivecfvec/IvecFvecMethods.java
similarity index 100%
rename from virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/ivecfvec/IvecFvecMethods.java
rename to nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/ivecfvec/IvecFvecMethods.java
diff --git a/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/wrappers/JsonListWrapper.java b/nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/wrappers/JsonListWrapper.java
similarity index 100%
rename from virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/wrappers/JsonListWrapper.java
rename to nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/library/wrappers/JsonListWrapper.java
diff --git a/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/JsonPredicateSerDes.java b/nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/JsonPredicateSerDes.java
similarity index 100%
rename from virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/JsonPredicateSerDes.java
rename to nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/JsonPredicateSerDes.java
diff --git a/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/adapter/ExamplePredicateAdapter.java b/nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/adapter/ExamplePredicateAdapter.java
similarity index 100%
rename from virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/adapter/ExamplePredicateAdapter.java
rename to nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/adapter/ExamplePredicateAdapter.java
diff --git a/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/ast/PComparator.java b/nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/ast/PComparator.java
similarity index 100%
rename from virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/ast/PComparator.java
rename to nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/ast/PComparator.java
diff --git a/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/ast/PConjunction.java b/nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/ast/PConjunction.java
similarity index 100%
rename from virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/ast/PConjunction.java
rename to nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/ast/PConjunction.java
diff --git a/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/ast/PField.java b/nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/ast/PField.java
similarity index 100%
rename from virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/ast/PField.java
rename to nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/ast/PField.java
diff --git a/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/ast/POperator.java b/nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/ast/POperator.java
similarity index 100%
rename from virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/ast/POperator.java
rename to nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/ast/POperator.java
diff --git a/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/ast/PredicateExpr.java b/nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/ast/PredicateExpr.java
similarity index 100%
rename from virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/ast/PredicateExpr.java
rename to nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/ast/PredicateExpr.java
diff --git a/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/ast/PredicateExprDefaultImpl.java b/nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/ast/PredicateExprDefaultImpl.java
similarity index 100%
rename from virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/ast/PredicateExprDefaultImpl.java
rename to nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/ast/PredicateExprDefaultImpl.java
diff --git a/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/ast/PredicateTerm.java b/nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/ast/PredicateTerm.java
similarity index 100%
rename from virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/ast/PredicateTerm.java
rename to nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/ast/PredicateTerm.java
diff --git a/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/package-info.java b/nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/package-info.java
similarity index 100%
rename from virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/package-info.java
rename to nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/package-info.java
diff --git a/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/types/PredicateAdapter.java b/nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/types/PredicateAdapter.java
similarity index 100%
rename from virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/types/PredicateAdapter.java
rename to nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/types/PredicateAdapter.java
diff --git a/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/types/PredicateSerDes.java b/nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/types/PredicateSerDes.java
similarity index 100%
rename from virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/types/PredicateSerDes.java
rename to nb-virtdata/virtdata-lib-hdf5/src/main/java/io/nosqlbench/virtdata/predicates/types/PredicateSerDes.java
diff --git a/virtdata-lib-hdf5/src/test/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_array/HdfFileToArrayTest.java b/nb-virtdata/virtdata-lib-hdf5/src/test/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_array/HdfFileToArrayTest.java
similarity index 100%
rename from virtdata-lib-hdf5/src/test/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_array/HdfFileToArrayTest.java
rename to nb-virtdata/virtdata-lib-hdf5/src/test/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_array/HdfFileToArrayTest.java
diff --git a/virtdata-lib-hdf5/src/test/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_list/HdfFileToVectorTest.java b/nb-virtdata/virtdata-lib-hdf5/src/test/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_list/HdfFileToVectorTest.java
similarity index 100%
rename from virtdata-lib-hdf5/src/test/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_list/HdfFileToVectorTest.java
rename to nb-virtdata/virtdata-lib-hdf5/src/test/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_list/HdfFileToVectorTest.java
diff --git a/virtdata-lib-hdf5/src/test/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/HdfDatasetToStringsTest.java b/nb-virtdata/virtdata-lib-hdf5/src/test/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/HdfDatasetToStringsTest.java
similarity index 100%
rename from virtdata-lib-hdf5/src/test/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/HdfDatasetToStringsTest.java
rename to nb-virtdata/virtdata-lib-hdf5/src/test/java/io/nosqlbench/virtdata/library/hdf5/from_long/to_string/HdfDatasetToStringsTest.java
diff --git a/virtdata-lib-hdf5/src/test/java/io/nosqlbench/virtdata/library/ivecfvec/IVecReaderTest.java b/nb-virtdata/virtdata-lib-hdf5/src/test/java/io/nosqlbench/virtdata/library/ivecfvec/IVecReaderTest.java
similarity index 100%
rename from virtdata-lib-hdf5/src/test/java/io/nosqlbench/virtdata/library/ivecfvec/IVecReaderTest.java
rename to nb-virtdata/virtdata-lib-hdf5/src/test/java/io/nosqlbench/virtdata/library/ivecfvec/IVecReaderTest.java
diff --git a/virtdata-lib-hdf5/src/test/java/io/nosqlbench/virtdata/predicates/adapter/ExamplePredicateAdapterTest.java b/nb-virtdata/virtdata-lib-hdf5/src/test/java/io/nosqlbench/virtdata/predicates/adapter/ExamplePredicateAdapterTest.java
similarity index 100%
rename from virtdata-lib-hdf5/src/test/java/io/nosqlbench/virtdata/predicates/adapter/ExamplePredicateAdapterTest.java
rename to nb-virtdata/virtdata-lib-hdf5/src/test/java/io/nosqlbench/virtdata/predicates/adapter/ExamplePredicateAdapterTest.java
diff --git a/virtdata-lib-hdf5/src/test/java/io/nosqlbench/virtdata/predicates/adapter/JsonPredicateSerDesTest.java b/nb-virtdata/virtdata-lib-hdf5/src/test/java/io/nosqlbench/virtdata/predicates/adapter/JsonPredicateSerDesTest.java
similarity index 100%
rename from virtdata-lib-hdf5/src/test/java/io/nosqlbench/virtdata/predicates/adapter/JsonPredicateSerDesTest.java
rename to nb-virtdata/virtdata-lib-hdf5/src/test/java/io/nosqlbench/virtdata/predicates/adapter/JsonPredicateSerDesTest.java
diff --git a/virtdata-lib-hdf5/src/test/resources/h5ex_t_float.h5 b/nb-virtdata/virtdata-lib-hdf5/src/test/resources/h5ex_t_float.h5
similarity index 100%
rename from virtdata-lib-hdf5/src/test/resources/h5ex_t_float.h5
rename to nb-virtdata/virtdata-lib-hdf5/src/test/resources/h5ex_t_float.h5
diff --git a/virtdata-lib-hdf5/src/test/resources/hdf5_test_strings.h5 b/nb-virtdata/virtdata-lib-hdf5/src/test/resources/hdf5_test_strings.h5
similarity index 100%
rename from virtdata-lib-hdf5/src/test/resources/hdf5_test_strings.h5
rename to nb-virtdata/virtdata-lib-hdf5/src/test/resources/hdf5_test_strings.h5
diff --git a/virtdata-lib-hdf5/src/test/resources/ivecfvec/test_ada_002_10000_base_vectors.fvec b/nb-virtdata/virtdata-lib-hdf5/src/test/resources/ivecfvec/test_ada_002_10000_base_vectors.fvec
similarity index 100%
rename from virtdata-lib-hdf5/src/test/resources/ivecfvec/test_ada_002_10000_base_vectors.fvec
rename to nb-virtdata/virtdata-lib-hdf5/src/test/resources/ivecfvec/test_ada_002_10000_base_vectors.fvec
diff --git a/virtdata-lib-hdf5/src/test/resources/ivecfvec/test_ada_002_10000_distances_count.fvec b/nb-virtdata/virtdata-lib-hdf5/src/test/resources/ivecfvec/test_ada_002_10000_distances_count.fvec
similarity index 100%
rename from virtdata-lib-hdf5/src/test/resources/ivecfvec/test_ada_002_10000_distances_count.fvec
rename to nb-virtdata/virtdata-lib-hdf5/src/test/resources/ivecfvec/test_ada_002_10000_distances_count.fvec
diff --git a/virtdata-lib-hdf5/src/test/resources/ivecfvec/test_ada_002_10000_indices_query_10000.ivec b/nb-virtdata/virtdata-lib-hdf5/src/test/resources/ivecfvec/test_ada_002_10000_indices_query_10000.ivec
similarity index 100%
rename from virtdata-lib-hdf5/src/test/resources/ivecfvec/test_ada_002_10000_indices_query_10000.ivec
rename to nb-virtdata/virtdata-lib-hdf5/src/test/resources/ivecfvec/test_ada_002_10000_indices_query_10000.ivec
diff --git a/virtdata-lib-hdf5/src/test/resources/ivecfvec/test_ada_002_10000_query_vectors_10000.fvec b/nb-virtdata/virtdata-lib-hdf5/src/test/resources/ivecfvec/test_ada_002_10000_query_vectors_10000.fvec
similarity index 100%
rename from virtdata-lib-hdf5/src/test/resources/ivecfvec/test_ada_002_10000_query_vectors_10000.fvec
rename to nb-virtdata/virtdata-lib-hdf5/src/test/resources/ivecfvec/test_ada_002_10000_query_vectors_10000.fvec
diff --git a/virtdata-lib-random/pom.xml b/nb-virtdata/virtdata-lib-random/pom.xml
similarity index 96%
rename from virtdata-lib-random/pom.xml
rename to nb-virtdata/virtdata-lib-random/pom.xml
index b66021b744..9dc63c0682 100644
--- a/virtdata-lib-random/pom.xml
+++ b/nb-virtdata/virtdata-lib-random/pom.xml
@@ -24,12 +24,12 @@
mvn-defaults
io.nosqlbench
${revision}
- ../mvn-defaults
+ ../../mvn-defaults
virtdata-lib-random
- http://nosqlbench.io/
+ https://nosqlbench.io/
diff --git a/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/Murmur3Time.java b/nb-virtdata/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/Murmur3Time.java
similarity index 100%
rename from virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/Murmur3Time.java
rename to nb-virtdata/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/Murmur3Time.java
diff --git a/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomFileExtractToString.java b/nb-virtdata/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomFileExtractToString.java
similarity index 100%
rename from virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomFileExtractToString.java
rename to nb-virtdata/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomFileExtractToString.java
diff --git a/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLineToInt.java b/nb-virtdata/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLineToInt.java
similarity index 100%
rename from virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLineToInt.java
rename to nb-virtdata/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLineToInt.java
diff --git a/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLineToString.java b/nb-virtdata/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLineToString.java
similarity index 100%
rename from virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLineToString.java
rename to nb-virtdata/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLineToString.java
diff --git a/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLineToStringMap.java b/nb-virtdata/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLineToStringMap.java
similarity index 100%
rename from virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLineToStringMap.java
rename to nb-virtdata/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLineToStringMap.java
diff --git a/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLinesToKeyValueString.java b/nb-virtdata/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLinesToKeyValueString.java
similarity index 100%
rename from virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLinesToKeyValueString.java
rename to nb-virtdata/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLinesToKeyValueString.java
diff --git a/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLongToString.java b/nb-virtdata/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLongToString.java
similarity index 100%
rename from virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLongToString.java
rename to nb-virtdata/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLongToString.java
diff --git a/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLoremExtractToString.java b/nb-virtdata/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLoremExtractToString.java
similarity index 100%
rename from virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLoremExtractToString.java
rename to nb-virtdata/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomLoremExtractToString.java
diff --git a/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomRangedToDouble.java b/nb-virtdata/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomRangedToDouble.java
similarity index 100%
rename from virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomRangedToDouble.java
rename to nb-virtdata/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomRangedToDouble.java
diff --git a/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomRangedToInt.java b/nb-virtdata/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomRangedToInt.java
similarity index 100%
rename from virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomRangedToInt.java
rename to nb-virtdata/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomRangedToInt.java
diff --git a/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomRangedToLong.java b/nb-virtdata/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomRangedToLong.java
similarity index 100%
rename from virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomRangedToLong.java
rename to nb-virtdata/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomRangedToLong.java
diff --git a/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomRangedToString.java b/nb-virtdata/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomRangedToString.java
similarity index 100%
rename from virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomRangedToString.java
rename to nb-virtdata/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomRangedToString.java
diff --git a/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomToByteBuffer.java b/nb-virtdata/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomToByteBuffer.java
similarity index 100%
rename from virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomToByteBuffer.java
rename to nb-virtdata/virtdata-lib-random/src/main/java/io/nosqlbench/virtdata/library/random/RandomToByteBuffer.java
diff --git a/virtdata-lib-realer/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/nb-virtdata/virtdata-lib-random/src/main/resources/META-INF/services/javax.annotation.processing.Processor
similarity index 100%
rename from virtdata-lib-realer/src/main/resources/META-INF/services/javax.annotation.processing.Processor
rename to nb-virtdata/virtdata-lib-random/src/main/resources/META-INF/services/javax.annotation.processing.Processor
diff --git a/virtdata-lib-realer/pom.xml b/nb-virtdata/virtdata-lib-realer/pom.xml
similarity index 95%
rename from virtdata-lib-realer/pom.xml
rename to nb-virtdata/virtdata-lib-realer/pom.xml
index 881ce9e3ee..5dfefdaf81 100644
--- a/virtdata-lib-realer/pom.xml
+++ b/nb-virtdata/virtdata-lib-realer/pom.xml
@@ -23,13 +23,13 @@
mvn-defaults
io.nosqlbench
${revision}
- ../mvn-defaults
+ ../../mvn-defaults
virtdata-lib-realer
jar
virtdata-lib-realer
- http://nosqlbench.io/
+ https://nosqlbench.io/
With inspiration from other libraries
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/Cities.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/Cities.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/Cities.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/Cities.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/CitiesByDensity.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/CitiesByDensity.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/CitiesByDensity.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/CitiesByDensity.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/CitiesByPopulation.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/CitiesByPopulation.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/CitiesByPopulation.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/CitiesByPopulation.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/Counties.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/Counties.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/Counties.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/Counties.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/CountiesByDensity.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/CountiesByDensity.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/CountiesByDensity.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/CountiesByDensity.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/CountiesByPopulation.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/CountiesByPopulation.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/CountiesByPopulation.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/CountiesByPopulation.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/CountryCodes.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/CountryCodes.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/CountryCodes.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/CountryCodes.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/CountryNames.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/CountryNames.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/CountryNames.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/CountryNames.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/FirstNames.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/FirstNames.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/FirstNames.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/FirstNames.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/FullNames.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/FullNames.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/FullNames.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/FullNames.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/LastNames.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/LastNames.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/LastNames.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/LastNames.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/StateCodes.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/StateCodes.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/StateCodes.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/StateCodes.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/StateCodesByDensity.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/StateCodesByDensity.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/StateCodesByDensity.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/StateCodesByDensity.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/StateCodesByPopulation.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/StateCodesByPopulation.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/StateCodesByPopulation.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/StateCodesByPopulation.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/StateNames.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/StateNames.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/StateNames.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/StateNames.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/StateNamesByDensity.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/StateNamesByDensity.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/StateNamesByDensity.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/StateNamesByDensity.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/StateNamesByPopulation.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/StateNamesByPopulation.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/StateNamesByPopulation.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/StateNamesByPopulation.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/TimeZones.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/TimeZones.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/TimeZones.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/TimeZones.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/TimeZonesByDensity.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/TimeZonesByDensity.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/TimeZonesByDensity.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/TimeZonesByDensity.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/TimeZonesByPopulation.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/TimeZonesByPopulation.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/TimeZonesByPopulation.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/TimeZonesByPopulation.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/ZipCodes.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/ZipCodes.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/ZipCodes.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/ZipCodes.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/ZipCodesByDensity.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/ZipCodesByDensity.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/ZipCodesByDensity.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/ZipCodesByDensity.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/ZipCodesByPopulation.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/ZipCodesByPopulation.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/ZipCodesByPopulation.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/ZipCodesByPopulation.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/astronomy/Galaxy.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/astronomy/Galaxy.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/astronomy/Galaxy.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/astronomy/Galaxy.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/astronomy/Nebula.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/astronomy/Nebula.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/astronomy/Nebula.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/astronomy/Nebula.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/astronomy/Planet.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/astronomy/Planet.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/astronomy/Planet.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/astronomy/Planet.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/astronomy/StarCluster.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/astronomy/StarCluster.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/astronomy/StarCluster.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/astronomy/StarCluster.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/books/BookAuthor.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/books/BookAuthor.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/books/BookAuthor.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/books/BookAuthor.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/books/BookGenre.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/books/BookGenre.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/books/BookGenre.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/books/BookGenre.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/books/BookPublisher.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/books/BookPublisher.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/books/BookPublisher.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/books/BookPublisher.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/books/BookTitle.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/books/BookTitle.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/books/BookTitle.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/books/BookTitle.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/creditcards/CreditCardExpiryDate.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/creditcards/CreditCardExpiryDate.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/creditcards/CreditCardExpiryDate.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/creditcards/CreditCardExpiryDate.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/creditcards/CreditCardNumber.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/creditcards/CreditCardNumber.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/creditcards/CreditCardNumber.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/creditcards/CreditCardNumber.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/creditcards/CreditCardType.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/creditcards/CreditCardType.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/creditcards/CreditCardType.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/creditcards/CreditCardType.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/education/Campus.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/education/Campus.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/education/Campus.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/education/Campus.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/education/HighSchool.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/education/HighSchool.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/education/HighSchool.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/education/HighSchool.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/education/Major.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/education/Major.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/education/Major.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/education/Major.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/education/UniversityName.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/education/UniversityName.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/education/UniversityName.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/education/UniversityName.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/industry/Profession.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/industry/Profession.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/industry/Profession.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/industry/Profession.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/inet/DomainName.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/inet/DomainName.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/inet/DomainName.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/inet/DomainName.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/inet/EmailAddress.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/inet/EmailAddress.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/inet/EmailAddress.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/inet/EmailAddress.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/inet/IPV4Addrses.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/inet/IPV4Addrses.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/inet/IPV4Addrses.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/inet/IPV4Addrses.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/inet/IPV6Address.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/inet/IPV6Address.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/inet/IPV6Address.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/inet/IPV6Address.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/inet/MacAddress.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/inet/MacAddress.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/inet/MacAddress.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/inet/MacAddress.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/inet/Password.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/inet/Password.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/inet/Password.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/inet/Password.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/inet/PrivateIPV4Address.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/inet/PrivateIPV4Address.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/inet/PrivateIPV4Address.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/inet/PrivateIPV4Address.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/inet/PublicIPV4Address.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/inet/PublicIPV4Address.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/inet/PublicIPV4Address.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/inet/PublicIPV4Address.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/inet/URL.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/inet/URL.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/inet/URL.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/inet/URL.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/inet/Username.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/inet/Username.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/inet/Username.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/inet/Username.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/lookupcodes/ASIN.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/lookupcodes/ASIN.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/lookupcodes/ASIN.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/lookupcodes/ASIN.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/lookupcodes/EAN.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/lookupcodes/EAN.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/lookupcodes/EAN.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/lookupcodes/EAN.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/lookupcodes/IMEI.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/lookupcodes/IMEI.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/lookupcodes/IMEI.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/lookupcodes/IMEI.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/lookupcodes/ISBN.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/lookupcodes/ISBN.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/lookupcodes/ISBN.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/lookupcodes/ISBN.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/retail/Price.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/retail/Price.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/retail/Price.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/retail/Price.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/retail/ProductCategory.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/retail/ProductCategory.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/retail/ProductCategory.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/retail/ProductCategory.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/retail/ProductName.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/retail/ProductName.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/retail/ProductName.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/retail/ProductName.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/timeandlocale/Locale.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/timeandlocale/Locale.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/timeandlocale/Locale.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/timeandlocale/Locale.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/timeandlocale/TimeZone.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/timeandlocale/TimeZone.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/timeandlocale/TimeZone.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/timeandlocale/TimeZone.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/AreaCode.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/AreaCode.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/AreaCode.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/AreaCode.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/City.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/City.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/City.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/City.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/Country.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/Country.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/Country.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/Country.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/CountryCode.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/CountryCode.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/CountryCode.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/CountryCode.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/FirstName.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/FirstName.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/FirstName.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/FirstName.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/LastName.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/LastName.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/LastName.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/LastName.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/LatLon.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/LatLon.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/LatLon.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/LatLon.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/Latitude.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/Latitude.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/Latitude.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/Latitude.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/Longitude.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/Longitude.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/Longitude.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/Longitude.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/PhoneNumber.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/PhoneNumber.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/PhoneNumber.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/PhoneNumber.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/State.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/State.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/State.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/State.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/StateCode.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/StateCode.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/StateCode.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/StateCode.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/StreetName.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/StreetName.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/StreetName.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/StreetName.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/ZipCode.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/ZipCode.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/ZipCode.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/userinfo/ZipCode.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/vehicles/CarColor.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/vehicles/CarColor.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/vehicles/CarColor.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/vehicles/CarColor.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/vehicles/CarMake.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/vehicles/CarMake.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/vehicles/CarMake.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/vehicles/CarMake.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/vehicles/CarModel.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/vehicles/CarModel.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/vehicles/CarModel.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/vehicles/CarModel.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/vehicles/CarYear.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/vehicles/CarYear.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/vehicles/CarYear.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/vehicles/CarYear.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/webapps/ColorHSL.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/webapps/ColorHSL.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/webapps/ColorHSL.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/webapps/ColorHSL.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/webapps/ColorHSLA.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/webapps/ColorHSLA.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/webapps/ColorHSLA.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/webapps/ColorHSLA.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/webapps/ColorHex.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/webapps/ColorHex.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/webapps/ColorHex.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/webapps/ColorHex.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/webapps/ColorName.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/webapps/ColorName.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/webapps/ColorName.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/webapps/ColorName.java
diff --git a/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/webapps/ColorRGB.java b/nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/webapps/ColorRGB.java
similarity index 100%
rename from virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/webapps/ColorRGB.java
rename to nb-virtdata/virtdata-lib-realer/src/main/java/io/nosqlbench/virtdata/library/realer/todo/webapps/ColorRGB.java
diff --git a/virtdata-realdata/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/nb-virtdata/virtdata-lib-realer/src/main/resources/META-INF/services/javax.annotation.processing.Processor
similarity index 100%
rename from virtdata-realdata/src/main/resources/META-INF/services/javax.annotation.processing.Processor
rename to nb-virtdata/virtdata-lib-realer/src/main/resources/META-INF/services/javax.annotation.processing.Processor
diff --git a/virtdata-lib-vectors/pom.xml b/nb-virtdata/virtdata-lib-vectors/pom.xml
similarity index 59%
rename from virtdata-lib-vectors/pom.xml
rename to nb-virtdata/virtdata-lib-vectors/pom.xml
index b579fb27fe..02707097e0 100644
--- a/virtdata-lib-vectors/pom.xml
+++ b/nb-virtdata/virtdata-lib-vectors/pom.xml
@@ -23,13 +23,13 @@
mvn-defaults
io.nosqlbench
${revision}
- ../mvn-defaults
+ ../../mvn-defaults
virtdata-lib-vectors
jar
- virtdata-lib-vectors
- http://nosqlbench.io/
+ ${project.artifactId}
+ https://nosqlbench.io/
With inspiration from other libraries
@@ -53,46 +53,46 @@
1.13.0
-
- org.matheclipse
- matheclipse-core
- 3.1.0-SNAPSHOT
-
-
- org.slf4j
- *
-
-
- org.apache.logging.log4j
- *
-
-
- org.apache.log4j
- *
-
-
-
-
-
- org.matheclipse
- matheclipse-gpl
- 3.1.0-SNAPSHOT
-
-
- org.slf4j
- *
-
-
- org.apache.logging.log4j
- *
-
-
- org.apache.log4j
- *
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/algorithms/CircleAlgorithm.java b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/algorithms/CircleAlgorithm.java
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/algorithms/CircleAlgorithm.java
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/algorithms/CircleAlgorithm.java
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/algorithms/GoldenAngle.java b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/algorithms/GoldenAngle.java
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/algorithms/GoldenAngle.java
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/algorithms/GoldenAngle.java
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/algorithms/LatLonBased.java b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/algorithms/LatLonBased.java
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/algorithms/LatLonBased.java
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/algorithms/LatLonBased.java
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/DNN_angular1_neighbors.java b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/DNN_angular1_neighbors.java
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/DNN_angular1_neighbors.java
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/DNN_angular1_neighbors.java
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/DnnAngular1V.java b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/DnnAngular1V.java
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/DnnAngular1V.java
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/DnnAngular1V.java
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/dnn_angular.png b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/dnn_angular.png
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/dnn_angular.png
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/dnn_angular.png
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/dnn_angular.svg b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/dnn_angular.svg
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/dnn_angular.svg
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/dnn_angular.svg
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/dnn_angular1_plot.png b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/dnn_angular1_plot.png
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/dnn_angular1_plot.png
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/dnn_angular1_plot.png
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/bitfield_circle.svg b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/bitfield_circle.svg
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/bitfield_circle.svg
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/bitfield_circle.svg
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/bitfield_filling_curve.svg b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/bitfield_filling_curve.svg
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/bitfield_filling_curve.svg
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/bitfield_filling_curve.svg
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/circlefield/CFVectorMapper.java b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/circlefield/CFVectorMapper.java
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/circlefield/CFVectorMapper.java
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/circlefield/CFVectorMapper.java
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/circlefield/CFVectorSpace.java b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/circlefield/CFVectorSpace.java
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/circlefield/CFVectorSpace.java
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/circlefield/CFVectorSpace.java
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/circlefield/package-info.java b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/circlefield/package-info.java
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/circlefield/package-info.java
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/circlefield/package-info.java
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/circular/CircularPartitioner.java b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/circular/CircularPartitioner.java
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/circular/CircularPartitioner.java
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/circular/CircularPartitioner.java
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/circular/DNN_CircularSpace.java b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/circular/DNN_CircularSpace.java
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/circular/DNN_CircularSpace.java
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/circular/DNN_CircularSpace.java
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/circular/bitfield_filling_curve.svg b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/circular/bitfield_filling_curve.svg
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/circular/bitfield_filling_curve.svg
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/circular/bitfield_filling_curve.svg
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/circular/bitfield_filling_curve_2.svg b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/circular/bitfield_filling_curve_2.svg
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/circular/bitfield_filling_curve_2.svg
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/circular/bitfield_filling_curve_2.svg
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/circular/package-info.java b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/circular/package-info.java
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/circular/package-info.java
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/circular/package-info.java
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/euclidean/DNN_euclidean_neighbors.java b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/euclidean/DNN_euclidean_neighbors.java
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/euclidean/DNN_euclidean_neighbors.java
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/euclidean/DNN_euclidean_neighbors.java
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/euclidean/DNN_euclidean_v.java b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/euclidean/DNN_euclidean_v.java
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/euclidean/DNN_euclidean_v.java
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/euclidean/DNN_euclidean_v.java
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/euclidean/DNN_euclidean_v_series.java b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/euclidean/DNN_euclidean_v_series.java
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/euclidean/DNN_euclidean_v_series.java
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/euclidean/DNN_euclidean_v_series.java
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/euclidean/DNN_euclidean_v_wrap.java b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/euclidean/DNN_euclidean_v_wrap.java
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/euclidean/DNN_euclidean_v_wrap.java
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/euclidean/DNN_euclidean_v_wrap.java
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/package-info.java b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/package-info.java
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/package-info.java
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/package-info.java
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/types/CircleVectors.java b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/types/CircleVectors.java
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/types/CircleVectors.java
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/types/CircleVectors.java
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/types/DNN_IntDoubleVectorSpace.java b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/types/DNN_IntDoubleVectorSpace.java
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/types/DNN_IntDoubleVectorSpace.java
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/types/DNN_IntDoubleVectorSpace.java
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/types/DNN_LongVectorSpace.java b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/types/DNN_LongVectorSpace.java
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/types/DNN_LongVectorSpace.java
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/dnn/types/DNN_LongVectorSpace.java
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/DoubleArrayCache.java b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/DoubleArrayCache.java
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/DoubleArrayCache.java
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/DoubleArrayCache.java
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/DoubleCache.java b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/DoubleCache.java
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/DoubleCache.java
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/DoubleCache.java
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/DoubleSequence.java b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/DoubleSequence.java
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/DoubleSequence.java
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/DoubleSequence.java
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/DoubleVectorPadLeft.java b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/DoubleVectorPadLeft.java
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/DoubleVectorPadLeft.java
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/DoubleVectorPadLeft.java
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/DoubleVectorPadRight.java b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/DoubleVectorPadRight.java
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/DoubleVectorPadRight.java
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/DoubleVectorPadRight.java
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/DoubleVectorPrefix.java b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/DoubleVectorPrefix.java
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/DoubleVectorPrefix.java
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/DoubleVectorPrefix.java
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/DoubleVectorSuffix.java b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/DoubleVectorSuffix.java
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/DoubleVectorSuffix.java
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/DoubleVectorSuffix.java
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/DoubleVectors.java b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/DoubleVectors.java
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/DoubleVectors.java
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/DoubleVectors.java
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/FloatVectorPadLeft.java b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/FloatVectorPadLeft.java
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/FloatVectorPadLeft.java
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/FloatVectorPadLeft.java
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/FloatVectorPadRight.java b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/FloatVectorPadRight.java
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/FloatVectorPadRight.java
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/FloatVectorPadRight.java
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/FloatVectorPrefix.java b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/FloatVectorPrefix.java
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/FloatVectorPrefix.java
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/FloatVectorPrefix.java
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/FloatVectorSuffix.java b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/FloatVectorSuffix.java
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/FloatVectorSuffix.java
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/FloatVectorSuffix.java
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/FloatVectors.java b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/FloatVectors.java
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/FloatVectors.java
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/FloatVectors.java
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/GoldenAngleDoubleVectors.java b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/GoldenAngleDoubleVectors.java
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/GoldenAngleDoubleVectors.java
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/GoldenAngleDoubleVectors.java
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/HashedDoubleVectors.java b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/HashedDoubleVectors.java
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/HashedDoubleVectors.java
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/HashedDoubleVectors.java
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/HashedFloatVectors.java b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/HashedFloatVectors.java
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/HashedFloatVectors.java
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/HashedFloatVectors.java
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/NormalizeDoubleVector.java b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/NormalizeDoubleVector.java
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/NormalizeDoubleVector.java
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/NormalizeDoubleVector.java
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/NormalizeFloatVector.java b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/NormalizeFloatVector.java
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/NormalizeFloatVector.java
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/NormalizeFloatVector.java
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/ToFloatVector.java b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/ToFloatVector.java
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/ToFloatVector.java
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/ToFloatVector.java
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/UnitSteps.java b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/UnitSteps.java
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/UnitSteps.java
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/UnitSteps.java
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/VectorSequence.java b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/VectorSequence.java
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/VectorSequence.java
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/primitive/VectorSequence.java
diff --git a/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/util/BitFields.java b/nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/util/BitFields.java
similarity index 100%
rename from virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/util/BitFields.java
rename to nb-virtdata/virtdata-lib-vectors/src/main/java/io/nosqlbench/virtdata/lib/vectors/util/BitFields.java
diff --git a/nb-virtdata/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/DNN_Symbolic_Tests.java b/nb-virtdata/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/DNN_Symbolic_Tests.java
new file mode 100644
index 0000000000..62d167fda6
--- /dev/null
+++ b/nb-virtdata/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/DNN_Symbolic_Tests.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2024 nosqlbench
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.nosqlbench.virtdata.lib.vectors.dnn;
+
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+//import org.matheclipse.core.eval.ExprEvaluator;
+//import org.matheclipse.core.expression.F;
+//import org.matheclipse.core.interfaces.IExpr;
+//import org.matheclipse.core.interfaces.ISymbol;
+//import org.matheclipse.core.interfaces.IAST;
+
+public class DNN_Symbolic_Tests {
+//
+// @Disabled
+// @Test
+// public void testExactRepresentation() {
+// ExprEvaluator util = new ExprEvaluator(false, (short)10);
+//
+// // Convert an expression to the internal Java form:
+// // Note: single character identifiers are case sensitive
+// // (the "D()" function identifier must be written as upper case
+// // character)
+// String javaForm = util.toJavaForm("D(sin(x)*cos(x),x)");
+// // prints: D(Times(Sin(x),Cos(x)),x)
+// System.out.println("Out[1]: " + javaForm.toString());
+//
+// // Use the Java form to create an expression with F.* static
+// // methods:
+// ISymbol x = F.Dummy("x");
+// IAST function = F.D(F.Times(F.Sin(x), F.Cos(x)), x);
+// IExpr result = util.eval(function);
+// // print: Cos(x)^2-Sin(x)^2
+// System.out.println("Out[2]: " + result.toString());
+//
+// // Note "diff" is an alias for the "D" function
+// result = util.eval("diff(sin(x)*cos(x),x)");
+// // print: Cos(x)^2-Sin(x)^2
+// System.out.println("Out[3]: " + result.toString());
+//
+// // evaluate the last result (% contains "last answer")
+// result = util.eval("%+cos(x)^2");
+// // print: 2*Cos(x)^2-Sin(x)^2
+// System.out.println("Out[4]: " + result.toString());
+//
+// // evaluate an Integrate[] expression
+// result = util.eval("integrate(sin(x)^5,x)");
+// // print: 2/3*Cos(x)^3-1/5*Cos(x)^5-Cos(x)
+// System.out.println("Out[5]: " + result.toString());
+//
+// // set the value of a variable "a" to 10
+// result = util.eval("a=10");
+// // print: 10
+// System.out.println("Out[6]: " + result.toString());
+//
+// // do a calculation with variable "a"
+// result = util.eval("a*3+b");
+// // print: 30+b
+// System.out.println("Out[7]: " + result.toString());
+//
+// // Do a calculation in "numeric mode" with the N() function
+// // Note: single character identifiers are case sensistive
+// // (the "N()" function identifier must be written as upper case
+// // character)
+// result = util.eval("N(sinh(5))");
+// // print: 74.20321057778875
+// System.out.println("Out[8]: " + result.toString());
+//
+// // define a function with a recursive factorial function definition.
+// // Note: fac(0) is the stop condition.
+// result = util.eval("fac(x_Integer):=x*fac(x-1);fac(0)=1");
+// // now calculate factorial of 10:
+// result = util.eval("fac(10)");
+// // print: 3628800
+// System.out.println("Out[9]: " + result.toString());
+//
+// function = F.Function(F.Divide(F.Gamma(F.Plus(F.C1, F.Slot1)), F.Gamma(F.Plus(F.C1, F.Slot2))));
+// // eval function ( Gamma(1+#1)/Gamma(1+#2) ) & [23,20]
+// result = util.evalFunction(function, "23", "20");
+// // print: 10626
+// System.out.println("Out[10]: " + result.toString());
+// }
+}
diff --git a/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/DNNAngular1NeighborsTest.java b/nb-virtdata/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/DNNAngular1NeighborsTest.java
similarity index 100%
rename from virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/DNNAngular1NeighborsTest.java
rename to nb-virtdata/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/DNNAngular1NeighborsTest.java
diff --git a/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/DNNAngular1VTest.java b/nb-virtdata/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/DNNAngular1VTest.java
similarity index 100%
rename from virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/DNNAngular1VTest.java
rename to nb-virtdata/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/DNNAngular1VTest.java
diff --git a/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/DNN_angular_distance_decimal.java b/nb-virtdata/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/DNN_angular_distance_decimal.java
similarity index 100%
rename from virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/DNN_angular_distance_decimal.java
rename to nb-virtdata/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/DNN_angular_distance_decimal.java
diff --git a/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/DNN_angular_distance_decimalTest.java b/nb-virtdata/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/DNN_angular_distance_decimalTest.java
similarity index 100%
rename from virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/DNN_angular_distance_decimalTest.java
rename to nb-virtdata/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/DNN_angular_distance_decimalTest.java
diff --git a/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/DNN_angular_distance_double.java b/nb-virtdata/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/DNN_angular_distance_double.java
similarity index 100%
rename from virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/DNN_angular_distance_double.java
rename to nb-virtdata/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/DNN_angular_distance_double.java
diff --git a/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/DNN_angular_distance_float.java b/nb-virtdata/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/DNN_angular_distance_float.java
similarity index 100%
rename from virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/DNN_angular_distance_float.java
rename to nb-virtdata/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/DNN_angular_distance_float.java
diff --git a/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/DNN_angular_v_decimal.java b/nb-virtdata/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/DNN_angular_v_decimal.java
similarity index 100%
rename from virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/DNN_angular_v_decimal.java
rename to nb-virtdata/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/angular/DNN_angular_v_decimal.java
diff --git a/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/circlefield/CFVectorMapperTest.java b/nb-virtdata/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/circlefield/CFVectorMapperTest.java
similarity index 100%
rename from virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/circlefield/CFVectorMapperTest.java
rename to nb-virtdata/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/circlefield/CFVectorMapperTest.java
diff --git a/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/circular/CircleVectorsTest.java b/nb-virtdata/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/circular/CircleVectorsTest.java
similarity index 100%
rename from virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/circular/CircleVectorsTest.java
rename to nb-virtdata/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/circular/CircleVectorsTest.java
diff --git a/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/circular/CircularPartitionerTest.java b/nb-virtdata/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/circular/CircularPartitionerTest.java
similarity index 100%
rename from virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/circular/CircularPartitionerTest.java
rename to nb-virtdata/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/circular/CircularPartitionerTest.java
diff --git a/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/euclidean/DNNEuclideanNeighborsTest.java b/nb-virtdata/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/euclidean/DNNEuclideanNeighborsTest.java
similarity index 100%
rename from virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/euclidean/DNNEuclideanNeighborsTest.java
rename to nb-virtdata/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/euclidean/DNNEuclideanNeighborsTest.java
diff --git a/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/euclidean/DNNEuclideanVTest.java b/nb-virtdata/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/euclidean/DNNEuclideanVTest.java
similarity index 100%
rename from virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/euclidean/DNNEuclideanVTest.java
rename to nb-virtdata/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/euclidean/DNNEuclideanVTest.java
diff --git a/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/primitive/CharVectorsTest.java b/nb-virtdata/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/primitive/CharVectorsTest.java
similarity index 100%
rename from virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/primitive/CharVectorsTest.java
rename to nb-virtdata/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/primitive/CharVectorsTest.java
diff --git a/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/primitive/DoubleVectorTest.java b/nb-virtdata/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/primitive/DoubleVectorTest.java
similarity index 100%
rename from virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/primitive/DoubleVectorTest.java
rename to nb-virtdata/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/primitive/DoubleVectorTest.java
diff --git a/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/primitive/HashedDoubleVectorsTest.java b/nb-virtdata/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/primitive/HashedDoubleVectorsTest.java
similarity index 100%
rename from virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/primitive/HashedDoubleVectorsTest.java
rename to nb-virtdata/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/primitive/HashedDoubleVectorsTest.java
diff --git a/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/util/BitFieldsJMHTest.java b/nb-virtdata/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/util/BitFieldsJMHTest.java
similarity index 100%
rename from virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/util/BitFieldsJMHTest.java
rename to nb-virtdata/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/util/BitFieldsJMHTest.java
diff --git a/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/util/BitFieldsTest.java b/nb-virtdata/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/util/BitFieldsTest.java
similarity index 100%
rename from virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/util/BitFieldsTest.java
rename to nb-virtdata/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/util/BitFieldsTest.java
diff --git a/virtdata-realdata/pom.xml b/nb-virtdata/virtdata-realdata/pom.xml
similarity index 96%
rename from virtdata-realdata/pom.xml
rename to nb-virtdata/virtdata-realdata/pom.xml
index cd6f851892..23827c3e14 100644
--- a/virtdata-realdata/pom.xml
+++ b/nb-virtdata/virtdata-realdata/pom.xml
@@ -24,11 +24,11 @@
mvn-defaults
io.nosqlbench
${revision}
- ../mvn-defaults
+ ../../mvn-defaults
virtdata-realdata
- http://nosqlbench.io/
+ https://nosqlbench.io/
diff --git a/virtdata-realdata/src/main/java/io/nosqlbench/virtdata/realdata/PlaceHolder.java b/nb-virtdata/virtdata-realdata/src/main/java/io/nosqlbench/virtdata/realdata/PlaceHolder.java
similarity index 100%
rename from virtdata-realdata/src/main/java/io/nosqlbench/virtdata/realdata/PlaceHolder.java
rename to nb-virtdata/virtdata-realdata/src/main/java/io/nosqlbench/virtdata/realdata/PlaceHolder.java
diff --git a/virtdata-userlibs/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/nb-virtdata/virtdata-realdata/src/main/resources/META-INF/services/javax.annotation.processing.Processor
similarity index 100%
rename from virtdata-userlibs/src/main/resources/META-INF/services/javax.annotation.processing.Processor
rename to nb-virtdata/virtdata-realdata/src/main/resources/META-INF/services/javax.annotation.processing.Processor
diff --git a/virtdata-realdata/src/main/resources/data/.prep_census/prep_firstnames.sh b/nb-virtdata/virtdata-realdata/src/main/resources/data/.prep_census/prep_firstnames.sh
similarity index 100%
rename from virtdata-realdata/src/main/resources/data/.prep_census/prep_firstnames.sh
rename to nb-virtdata/virtdata-realdata/src/main/resources/data/.prep_census/prep_firstnames.sh
diff --git a/virtdata-realdata/src/main/resources/data/.prep_census/prep_national_places.sh b/nb-virtdata/virtdata-realdata/src/main/resources/data/.prep_census/prep_national_places.sh
similarity index 100%
rename from virtdata-realdata/src/main/resources/data/.prep_census/prep_national_places.sh
rename to nb-virtdata/virtdata-realdata/src/main/resources/data/.prep_census/prep_national_places.sh
diff --git a/virtdata-realdata/src/main/resources/data/.prep_census/prep_surnames.sh b/nb-virtdata/virtdata-realdata/src/main/resources/data/.prep_census/prep_surnames.sh
similarity index 100%
rename from virtdata-realdata/src/main/resources/data/.prep_census/prep_surnames.sh
rename to nb-virtdata/virtdata-realdata/src/main/resources/data/.prep_census/prep_surnames.sh
diff --git a/virtdata-realdata/src/main/resources/data/README.md b/nb-virtdata/virtdata-realdata/src/main/resources/data/README.md
similarity index 100%
rename from virtdata-realdata/src/main/resources/data/README.md
rename to nb-virtdata/virtdata-realdata/src/main/resources/data/README.md
diff --git a/virtdata-realdata/src/main/resources/data/census_places.csv b/nb-virtdata/virtdata-realdata/src/main/resources/data/census_places.csv
similarity index 100%
rename from virtdata-realdata/src/main/resources/data/census_places.csv
rename to nb-virtdata/virtdata-realdata/src/main/resources/data/census_places.csv
diff --git a/virtdata-realdata/src/main/resources/data/census_state_abbrev.csv b/nb-virtdata/virtdata-realdata/src/main/resources/data/census_state_abbrev.csv
similarity index 100%
rename from virtdata-realdata/src/main/resources/data/census_state_abbrev.csv
rename to nb-virtdata/virtdata-realdata/src/main/resources/data/census_state_abbrev.csv
diff --git a/virtdata-realdata/src/main/resources/data/countries.csv b/nb-virtdata/virtdata-realdata/src/main/resources/data/countries.csv
similarity index 100%
rename from virtdata-realdata/src/main/resources/data/countries.csv
rename to nb-virtdata/virtdata-realdata/src/main/resources/data/countries.csv
diff --git a/virtdata-realdata/src/main/resources/data/female_firstnames.csv b/nb-virtdata/virtdata-realdata/src/main/resources/data/female_firstnames.csv
similarity index 100%
rename from virtdata-realdata/src/main/resources/data/female_firstnames.csv
rename to nb-virtdata/virtdata-realdata/src/main/resources/data/female_firstnames.csv
diff --git a/virtdata-realdata/src/main/resources/data/male_firstnames.csv b/nb-virtdata/virtdata-realdata/src/main/resources/data/male_firstnames.csv
similarity index 100%
rename from virtdata-realdata/src/main/resources/data/male_firstnames.csv
rename to nb-virtdata/virtdata-realdata/src/main/resources/data/male_firstnames.csv
diff --git a/virtdata-realdata/src/main/resources/data/nationalities.csv b/nb-virtdata/virtdata-realdata/src/main/resources/data/nationalities.csv
similarity index 100%
rename from virtdata-realdata/src/main/resources/data/nationalities.csv
rename to nb-virtdata/virtdata-realdata/src/main/resources/data/nationalities.csv
diff --git a/virtdata-realdata/src/main/resources/data/simplemaps/README.md b/nb-virtdata/virtdata-realdata/src/main/resources/data/simplemaps/README.md
similarity index 100%
rename from virtdata-realdata/src/main/resources/data/simplemaps/README.md
rename to nb-virtdata/virtdata-realdata/src/main/resources/data/simplemaps/README.md
diff --git a/virtdata-realdata/src/main/resources/data/simplemaps/license.txt b/nb-virtdata/virtdata-realdata/src/main/resources/data/simplemaps/license.txt
similarity index 100%
rename from virtdata-realdata/src/main/resources/data/simplemaps/license.txt
rename to nb-virtdata/virtdata-realdata/src/main/resources/data/simplemaps/license.txt
diff --git a/virtdata-realdata/src/main/resources/data/simplemaps/uszips.csv b/nb-virtdata/virtdata-realdata/src/main/resources/data/simplemaps/uszips.csv
similarity index 100%
rename from virtdata-realdata/src/main/resources/data/simplemaps/uszips.csv
rename to nb-virtdata/virtdata-realdata/src/main/resources/data/simplemaps/uszips.csv
diff --git a/virtdata-realdata/src/main/resources/data/surnames.csv b/nb-virtdata/virtdata-realdata/src/main/resources/data/surnames.csv
similarity index 100%
rename from virtdata-realdata/src/main/resources/data/surnames.csv
rename to nb-virtdata/virtdata-realdata/src/main/resources/data/surnames.csv
diff --git a/virtdata-realdata/src/main/resources/data/us_cities_states_counties.csv b/nb-virtdata/virtdata-realdata/src/main/resources/data/us_cities_states_counties.csv
similarity index 100%
rename from virtdata-realdata/src/main/resources/data/us_cities_states_counties.csv
rename to nb-virtdata/virtdata-realdata/src/main/resources/data/us_cities_states_counties.csv
diff --git a/nb5/.gitignore b/nb5/.gitignore
deleted file mode 100644
index 663efc108c..0000000000
--- a/nb5/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-cache/**
diff --git a/nb5/build-bin.sh b/nb5/nb-appimage/build-bin.sh
similarity index 98%
rename from nb5/build-bin.sh
rename to nb5/nb-appimage/build-bin.sh
index 91550aa300..2001f7a823 100755
--- a/nb5/build-bin.sh
+++ b/nb5/nb-appimage/build-bin.sh
@@ -34,7 +34,7 @@ then
exit 2
fi
-rsync -av appimage/skel/ "${APPDIR}/"
+rsync -av nb-appimage/skel/ "${APPDIR}/"
cp target/${JAR_NAME} "${APPDIR}/usr/bin/${JAR_NAME}"
mkdir -p "${APPDIR}/usr/bin/jre"
diff --git a/nb5/appimage/skel/nb5.desktop b/nb5/nb-appimage/skel/nb5.desktop
similarity index 100%
rename from nb5/appimage/skel/nb5.desktop
rename to nb5/nb-appimage/skel/nb5.desktop
diff --git a/nb5/appimage/skel/nb5.png b/nb5/nb-appimage/skel/nb5.png
similarity index 100%
rename from nb5/appimage/skel/nb5.png
rename to nb5/nb-appimage/skel/nb5.png
diff --git a/nb5/appimage/skel/usr/bin/nb5 b/nb5/nb-appimage/skel/usr/bin/nb5
similarity index 100%
rename from nb5/appimage/skel/usr/bin/nb5
rename to nb5/nb-appimage/skel/usr/bin/nb5
diff --git a/nb5/nb-scripts/link-jar-name.sh b/nb5/nb5-scripts/link-jar-name.sh
similarity index 97%
rename from nb5/nb-scripts/link-jar-name.sh
rename to nb5/nb5-scripts/link-jar-name.sh
index 6a66bb6dd2..07bb1b61c1 100755
--- a/nb5/nb-scripts/link-jar-name.sh
+++ b/nb5/nb5-scripts/link-jar-name.sh
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# Copyright (c) 2022 nosqlbench
+# Copyright (c) 2022-2024 nosqlbench
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -47,7 +47,6 @@ do
fi
done
-
echo "Unable to find any jar to link to ${JAR_NAME} name.."
exit 2
diff --git a/nb5/pom.xml b/nb5/pom.xml
index 1c65de4156..ab8f7e418b 100644
--- a/nb5/pom.xml
+++ b/nb5/pom.xml
@@ -34,92 +34,26 @@
UTF-8
- nosqlbench Command Line
+ nb5
-
io.nosqlbench
nbr
${revision}
-
-
-
-
-
- io.nosqlbench
- adapter-diag
- ${revision}
-
-
-
- io.nosqlbench
- adapter-stdout
- ${revision}
-
-
-
- io.nosqlbench
- adapter-cqld4
- ${revision}
-
io.nosqlbench
- adapter-dynamodb
- ${revision}
-
-
- io.nosqlbench
- adapter-http
- ${revision}
-
-
- io.nosqlbench
- adapter-tcp
- ${revision}
-
-
- io.nosqlbench
- adapter-pulsar
- ${revision}
-
-
- io.nosqlbench
- adapter-kafka
- ${revision}
-
-
- io.nosqlbench
- adapter-amqp
- ${revision}
-
-
- io.nosqlbench
- adapter-jdbc
- ${revision}
-
-
- io.nosqlbench
- adapter-mongodb
- ${revision}
-
-
- io.nosqlbench
- adapter-aws-opensearch
- ${revision}
-
-
- io.nosqlbench
- adapter-s4j
+ nb-adapters-included
${revision}
+
+
-
@@ -172,11 +106,12 @@
${project.version}
${project.basedir}
- ${project.basedir}/nb-scripts/link-jar-name.sh
+ ${project.basedir}/nb5-scripts/link-jar-name.sh
+
@@ -204,7 +139,7 @@
${project.basedir}
- ${project.basedir}/build-bin.sh
+ ${project.basedir}/nb-appimage/build-bin.sh
@@ -213,13 +148,13 @@
- enforce
+ converge-nb5
false
-
+
@@ -239,242 +174,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/nbr-examples/pom.xml b/nbr-demos/pom.xml
similarity index 92%
rename from nbr-examples/pom.xml
rename to nbr-demos/pom.xml
index 9088889efb..272924414e 100644
--- a/nbr-examples/pom.xml
+++ b/nbr-demos/pom.xml
@@ -24,7 +24,7 @@
../mvn-defaults
- nbr-examples
+ nbr-demos
jar
${project.artifactId}
Runtime-Only CLI for nosqlbench
@@ -42,12 +42,6 @@
${revision}
-
-
-
-
-
-
diff --git a/virtdata-userlibs/src/main/resources/log4j2.xml b/nbr-demos/src/main/resources/log4j2.xml
similarity index 100%
rename from virtdata-userlibs/src/main/resources/log4j2.xml
rename to nbr-demos/src/main/resources/log4j2.xml
diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/SpeedCheckIntegrationTests.java b/nbr-demos/src/test/java/io/nosqlbench/nbr/examples/SpeedCheckIntegrationTests.java
similarity index 100%
rename from nbr-examples/src/test/java/io/nosqlbench/nbr/examples/SpeedCheckIntegrationTests.java
rename to nbr-demos/src/test/java/io/nosqlbench/nbr/examples/SpeedCheckIntegrationTests.java
diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/DirectNBSessionTests.java b/nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/DirectNBSessionTests.java
similarity index 100%
rename from nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/DirectNBSessionTests.java
rename to nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/DirectNBSessionTests.java
diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/DirectRuntimeScenarioTests.java b/nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/DirectRuntimeScenarioTests.java
similarity index 100%
rename from nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/DirectRuntimeScenarioTests.java
rename to nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/DirectRuntimeScenarioTests.java
diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_activity_error.java b/nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_activity_error.java
similarity index 100%
rename from nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_activity_error.java
rename to nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_activity_error.java
diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_activity_init_error.java b/nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_activity_init_error.java
similarity index 100%
rename from nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_activity_init_error.java
rename to nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_activity_init_error.java
diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_await_finished.java b/nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_await_finished.java
similarity index 100%
rename from nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_await_finished.java
rename to nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_await_finished.java
diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_basicdiag.java b/nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_basicdiag.java
similarity index 100%
rename from nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_basicdiag.java
rename to nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_basicdiag.java
diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_blockingrun.java b/nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_blockingrun.java
similarity index 100%
rename from nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_blockingrun.java
rename to nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_blockingrun.java
diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_cocycledelay_bursty.java b/nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_cocycledelay_bursty.java
similarity index 100%
rename from nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_cocycledelay_bursty.java
rename to nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_cocycledelay_bursty.java
diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_cocycledelay_bursty_backup.java b/nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_cocycledelay_bursty_backup.java
similarity index 100%
rename from nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_cocycledelay_bursty_backup.java
rename to nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_cocycledelay_bursty_backup.java
diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_cocycledelay_strict.java b/nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_cocycledelay_strict.java
similarity index 100%
rename from nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_cocycledelay_strict.java
rename to nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_cocycledelay_strict.java
diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_cycle_rate.java b/nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_cycle_rate.java
similarity index 100%
rename from nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_cycle_rate.java
rename to nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_cycle_rate.java
diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_cycle_rate_change.java b/nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_cycle_rate_change.java
similarity index 100%
rename from nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_cycle_rate_change.java
rename to nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_cycle_rate_change.java
diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_extension_csvmetrics.java b/nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_extension_csvmetrics.java
similarity index 100%
rename from nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_extension_csvmetrics.java
rename to nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_extension_csvmetrics.java
diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_extension_csvoutput.java b/nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_extension_csvoutput.java
similarity index 100%
rename from nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_extension_csvoutput.java
rename to nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_extension_csvoutput.java
diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_extension_example.java b/nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_extension_example.java
similarity index 100%
rename from nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_extension_example.java
rename to nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_extension_example.java
diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_extension_histostatslogger.java b/nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_extension_histostatslogger.java
similarity index 100%
rename from nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_extension_histostatslogger.java
rename to nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_extension_histostatslogger.java
diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_extension_shutdown_hook.java b/nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_extension_shutdown_hook.java
similarity index 100%
rename from nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_extension_shutdown_hook.java
rename to nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_extension_shutdown_hook.java
diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_histologger.java b/nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_histologger.java
similarity index 100%
rename from nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_histologger.java
rename to nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_histologger.java
diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_linkedinput.java b/nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_linkedinput.java
similarity index 100%
rename from nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_linkedinput.java
rename to nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_linkedinput.java
diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_optimo_test.java b/nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_optimo_test.java
similarity index 100%
rename from nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_optimo_test.java
rename to nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_optimo_test.java
diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_params_variable.java b/nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_params_variable.java
similarity index 100%
rename from nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_params_variable.java
rename to nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_params_variable.java
diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_readmetrics.java b/nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_readmetrics.java
similarity index 100%
rename from nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_readmetrics.java
rename to nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_readmetrics.java
diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_speedcheck.java b/nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_speedcheck.java
similarity index 100%
rename from nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_speedcheck.java
rename to nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_speedcheck.java
diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_start_stop_diag.java b/nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_start_stop_diag.java
similarity index 100%
rename from nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_start_stop_diag.java
rename to nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_start_stop_diag.java
diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_threadchange.java b/nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_threadchange.java
similarity index 100%
rename from nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_threadchange.java
rename to nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_threadchange.java
diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_threadspeeds.java b/nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_threadspeeds.java
similarity index 100%
rename from nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_threadspeeds.java
rename to nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_threadspeeds.java
diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_undef_param.java b/nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_undef_param.java
similarity index 100%
rename from nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injava/NB_undef_param.java
rename to nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injava/NB_undef_param.java
diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injavascript/ScenarioExampleTests.java b/nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injavascript/ScenarioExampleTests.java
similarity index 100%
rename from nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injavascript/ScenarioExampleTests.java
rename to nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injavascript/ScenarioExampleTests.java
diff --git a/nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injavascript/ScriptExampleTests.java b/nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injavascript/ScriptExampleTests.java
similarity index 100%
rename from nbr-examples/src/test/java/io/nosqlbench/nbr/examples/injavascript/ScriptExampleTests.java
rename to nbr-demos/src/test/java/io/nosqlbench/nbr/examples/injavascript/ScriptExampleTests.java
diff --git a/nbr-examples/src/test/resources/junit-platform.properties b/nbr-demos/src/test/resources/junit-platform.properties
similarity index 100%
rename from nbr-examples/src/test/resources/junit-platform.properties
rename to nbr-demos/src/test/resources/junit-platform.properties
diff --git a/virtdata-userlibs/src/test/resources/log4j2-test.xml b/nbr-demos/src/test/resources/log4j2-test.xml
similarity index 100%
rename from virtdata-userlibs/src/test/resources/log4j2-test.xml
rename to nbr-demos/src/test/resources/log4j2-test.xml
diff --git a/nbr-examples/src/test/resources/scenarios/basic_scenario.yaml b/nbr-demos/src/test/resources/scenarios/basic_scenario.yaml
similarity index 100%
rename from nbr-examples/src/test/resources/scenarios/basic_scenario.yaml
rename to nbr-demos/src/test/resources/scenarios/basic_scenario.yaml
diff --git a/nbr-examples/src/test/resources/scripts/examples/README.md b/nbr-demos/src/test/resources/scripts/examples/README.md
similarity index 100%
rename from nbr-examples/src/test/resources/scripts/examples/README.md
rename to nbr-demos/src/test/resources/scripts/examples/README.md
diff --git a/nbr-examples/src/test/resources/scripts/examples/activity_error.js b/nbr-demos/src/test/resources/scripts/examples/activity_error.js
similarity index 100%
rename from nbr-examples/src/test/resources/scripts/examples/activity_error.js
rename to nbr-demos/src/test/resources/scripts/examples/activity_error.js
diff --git a/nbr-examples/src/test/resources/scripts/examples/activity_init_error.js b/nbr-demos/src/test/resources/scripts/examples/activity_init_error.js
similarity index 100%
rename from nbr-examples/src/test/resources/scripts/examples/activity_init_error.js
rename to nbr-demos/src/test/resources/scripts/examples/activity_init_error.js
diff --git a/nbr-examples/src/test/resources/scripts/examples/await_finished.js b/nbr-demos/src/test/resources/scripts/examples/await_finished.js
similarity index 100%
rename from nbr-examples/src/test/resources/scripts/examples/await_finished.js
rename to nbr-demos/src/test/resources/scripts/examples/await_finished.js
diff --git a/nbr-examples/src/test/resources/scripts/examples/basicdiag.js b/nbr-demos/src/test/resources/scripts/examples/basicdiag.js
similarity index 100%
rename from nbr-examples/src/test/resources/scripts/examples/basicdiag.js
rename to nbr-demos/src/test/resources/scripts/examples/basicdiag.js
diff --git a/nbr-examples/src/test/resources/scripts/examples/basicdiag.md b/nbr-demos/src/test/resources/scripts/examples/basicdiag.md
similarity index 100%
rename from nbr-examples/src/test/resources/scripts/examples/basicdiag.md
rename to nbr-demos/src/test/resources/scripts/examples/basicdiag.md
diff --git a/nbr-examples/src/test/resources/scripts/examples/blockingrun.js b/nbr-demos/src/test/resources/scripts/examples/blockingrun.js
similarity index 100%
rename from nbr-examples/src/test/resources/scripts/examples/blockingrun.js
rename to nbr-demos/src/test/resources/scripts/examples/blockingrun.js
diff --git a/nbr-examples/src/test/resources/scripts/examples/cocycledelay_bursty.js b/nbr-demos/src/test/resources/scripts/examples/cocycledelay_bursty.js
similarity index 100%
rename from nbr-examples/src/test/resources/scripts/examples/cocycledelay_bursty.js
rename to nbr-demos/src/test/resources/scripts/examples/cocycledelay_bursty.js
diff --git a/nbr-examples/src/test/resources/scripts/examples/cocycledelay_strict.js b/nbr-demos/src/test/resources/scripts/examples/cocycledelay_strict.js
similarity index 100%
rename from nbr-examples/src/test/resources/scripts/examples/cocycledelay_strict.js
rename to nbr-demos/src/test/resources/scripts/examples/cocycledelay_strict.js
diff --git a/nbr-examples/src/test/resources/scripts/examples/cycle_rate.js b/nbr-demos/src/test/resources/scripts/examples/cycle_rate.js
similarity index 100%
rename from nbr-examples/src/test/resources/scripts/examples/cycle_rate.js
rename to nbr-demos/src/test/resources/scripts/examples/cycle_rate.js
diff --git a/nbr-examples/src/test/resources/scripts/examples/cycle_rate_change.js b/nbr-demos/src/test/resources/scripts/examples/cycle_rate_change.js
similarity index 100%
rename from nbr-examples/src/test/resources/scripts/examples/cycle_rate_change.js
rename to nbr-demos/src/test/resources/scripts/examples/cycle_rate_change.js
diff --git a/nbr-examples/src/test/resources/scripts/examples/doconly/extension_files.js b/nbr-demos/src/test/resources/scripts/examples/doconly/extension_files.js
similarity index 100%
rename from nbr-examples/src/test/resources/scripts/examples/doconly/extension_files.js
rename to nbr-demos/src/test/resources/scripts/examples/doconly/extension_files.js
diff --git a/nbr-examples/src/test/resources/scripts/examples/doconly/extension_globalstate.js b/nbr-demos/src/test/resources/scripts/examples/doconly/extension_globalstate.js
similarity index 100%
rename from nbr-examples/src/test/resources/scripts/examples/doconly/extension_globalstate.js
rename to nbr-demos/src/test/resources/scripts/examples/doconly/extension_globalstate.js
diff --git a/nbr-examples/src/test/resources/scripts/examples/doconly/extension_http.js b/nbr-demos/src/test/resources/scripts/examples/doconly/extension_http.js
similarity index 100%
rename from nbr-examples/src/test/resources/scripts/examples/doconly/extension_http.js
rename to nbr-demos/src/test/resources/scripts/examples/doconly/extension_http.js
diff --git a/nbr-examples/src/test/resources/scripts/examples/doconly/extension_s3.js b/nbr-demos/src/test/resources/scripts/examples/doconly/extension_s3.js
similarity index 100%
rename from nbr-examples/src/test/resources/scripts/examples/doconly/extension_s3.js
rename to nbr-demos/src/test/resources/scripts/examples/doconly/extension_s3.js
diff --git a/nbr-examples/src/test/resources/scripts/examples/extension_csvmetrics.js b/nbr-demos/src/test/resources/scripts/examples/extension_csvmetrics.js
similarity index 100%
rename from nbr-examples/src/test/resources/scripts/examples/extension_csvmetrics.js
rename to nbr-demos/src/test/resources/scripts/examples/extension_csvmetrics.js
diff --git a/nbr-examples/src/test/resources/scripts/examples/extension_csvoutput.js b/nbr-demos/src/test/resources/scripts/examples/extension_csvoutput.js
similarity index 100%
rename from nbr-examples/src/test/resources/scripts/examples/extension_csvoutput.js
rename to nbr-demos/src/test/resources/scripts/examples/extension_csvoutput.js
diff --git a/nbr-examples/src/test/resources/scripts/examples/extension_histologger.js b/nbr-demos/src/test/resources/scripts/examples/extension_histologger.js
similarity index 100%
rename from nbr-examples/src/test/resources/scripts/examples/extension_histologger.js
rename to nbr-demos/src/test/resources/scripts/examples/extension_histologger.js
diff --git a/nbr-examples/src/test/resources/scripts/examples/extension_histostatslogger.js b/nbr-demos/src/test/resources/scripts/examples/extension_histostatslogger.js
similarity index 100%
rename from nbr-examples/src/test/resources/scripts/examples/extension_histostatslogger.js
rename to nbr-demos/src/test/resources/scripts/examples/extension_histostatslogger.js
diff --git a/nbr-examples/src/test/resources/scripts/examples/extension_shutdown_hook.js b/nbr-demos/src/test/resources/scripts/examples/extension_shutdown_hook.js
similarity index 100%
rename from nbr-examples/src/test/resources/scripts/examples/extension_shutdown_hook.js
rename to nbr-demos/src/test/resources/scripts/examples/extension_shutdown_hook.js
diff --git a/nbr-examples/src/test/resources/scripts/examples/linkedinput.js b/nbr-demos/src/test/resources/scripts/examples/linkedinput.js
similarity index 100%
rename from nbr-examples/src/test/resources/scripts/examples/linkedinput.js
rename to nbr-demos/src/test/resources/scripts/examples/linkedinput.js
diff --git a/nbr-examples/src/test/resources/scripts/examples/optimo.js b/nbr-demos/src/test/resources/scripts/examples/optimo.js
similarity index 100%
rename from nbr-examples/src/test/resources/scripts/examples/optimo.js
rename to nbr-demos/src/test/resources/scripts/examples/optimo.js
diff --git a/nbr-examples/src/test/resources/scripts/examples/params_variable.js b/nbr-demos/src/test/resources/scripts/examples/params_variable.js
similarity index 100%
rename from nbr-examples/src/test/resources/scripts/examples/params_variable.js
rename to nbr-demos/src/test/resources/scripts/examples/params_variable.js
diff --git a/nbr-examples/src/test/resources/scripts/examples/readmetrics.js b/nbr-demos/src/test/resources/scripts/examples/readmetrics.js
similarity index 100%
rename from nbr-examples/src/test/resources/scripts/examples/readmetrics.js
rename to nbr-demos/src/test/resources/scripts/examples/readmetrics.js
diff --git a/nbr-examples/src/test/resources/scripts/examples/scripts/auto/autoscript.js b/nbr-demos/src/test/resources/scripts/examples/scripts/auto/autoscript.js
similarity index 100%
rename from nbr-examples/src/test/resources/scripts/examples/scripts/auto/autoscript.js
rename to nbr-demos/src/test/resources/scripts/examples/scripts/auto/autoscript.js
diff --git a/nbr-examples/src/test/resources/scripts/examples/speedcheck.js b/nbr-demos/src/test/resources/scripts/examples/speedcheck.js
similarity index 100%
rename from nbr-examples/src/test/resources/scripts/examples/speedcheck.js
rename to nbr-demos/src/test/resources/scripts/examples/speedcheck.js
diff --git a/nbr-examples/src/test/resources/scripts/examples/startstopdiag.js b/nbr-demos/src/test/resources/scripts/examples/startstopdiag.js
similarity index 100%
rename from nbr-examples/src/test/resources/scripts/examples/startstopdiag.js
rename to nbr-demos/src/test/resources/scripts/examples/startstopdiag.js
diff --git a/nbr-examples/src/test/resources/scripts/examples/threadchange.js b/nbr-demos/src/test/resources/scripts/examples/threadchange.js
similarity index 100%
rename from nbr-examples/src/test/resources/scripts/examples/threadchange.js
rename to nbr-demos/src/test/resources/scripts/examples/threadchange.js
diff --git a/nbr-examples/src/test/resources/scripts/examples/threadspeeds.js b/nbr-demos/src/test/resources/scripts/examples/threadspeeds.js
similarity index 100%
rename from nbr-examples/src/test/resources/scripts/examples/threadspeeds.js
rename to nbr-demos/src/test/resources/scripts/examples/threadspeeds.js
diff --git a/nbr-examples/src/test/resources/scripts/examples/undef_param.js b/nbr-demos/src/test/resources/scripts/examples/undef_param.js
similarity index 100%
rename from nbr-examples/src/test/resources/scripts/examples/undef_param.js
rename to nbr-demos/src/test/resources/scripts/examples/undef_param.js
diff --git a/nbr/nbr-scripts/link-jar-name.sh b/nbr/nbr-scripts/link-jar-name.sh
index 297c8b0ac0..d26ce0b951 100755
--- a/nbr/nbr-scripts/link-jar-name.sh
+++ b/nbr/nbr-scripts/link-jar-name.sh
@@ -2,6 +2,7 @@
set -e
set -x
+echo "PWD:" $(pwd)
NBJAR_VERSION=${NBJAR_VERSION:?NBJAR_VERSION must be specified}
echo "NBJAR_VERSION: ${NBJAR_VERSION}"
diff --git a/nbr/pom.xml b/nbr/pom.xml
index b30ddcbaa1..0f0f9975c3 100644
--- a/nbr/pom.xml
+++ b/nbr/pom.xml
@@ -14,7 +14,9 @@
~ limitations under the License.
-->
-
+
4.0.0
@@ -25,9 +27,9 @@
../mvn-defaults
+ nbr
nbr
jar
- ${project.artifactId}
Runtime-Only CLI for nosqlbench
@@ -39,19 +41,7 @@
io.nosqlbench
- engine-cli
- ${revision}
-
-
-
- io.nosqlbench
- engine-core
- ${revision}
-
-
-
- io.nosqlbench
- engine-extensions
+ nb-engine-all
${revision}
@@ -63,7 +53,7 @@
io.nosqlbench
- engine-clients
+ adapter-stdout
${revision}
@@ -175,32 +165,36 @@
-
- enforce
-
- false
-
-
-
-
-
-
-
- enforce
-
-
-
- org.apache.maven.plugins
- maven-enforcer-plugin
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pom.xml b/pom.xml
index 7ab7087066..117e5d5871 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,6 +21,11 @@
4.0.0
nosqlbench
pom
+ ${project.artifactId}
+ https://nosqlbench.io/
+ A reusable machine pattern for building dynamic load
+ testing systems
+
mvn-defaults
@@ -29,212 +34,75 @@
mvn-defaults
- ${project.artifactId}
- http://nosqlbench.io/
- A reusable machine pattern for building dynamic load
- testing systems
-
-
+ nb5
mvn-defaults
+
- nb5
+
+
nbr
- nbr-examples
- nb-api
+ nbr-demos
+ nb-apis
nb-annotations
nb-spectest
- engine-core
- engine-extensions
- engine-clients
- engine-cli
- adapters-api
-
- adapter-diag
- adapter-stdout
-
- adapter-cqld4
- adapter-http
- adapter-tcp
- adapter-dynamodb
- adapter-mongodb
- adapter-pulsar
- adapter-s4j
- adapter-kafka
- adapter-amqp
- adapter-jdbc
-
- adapter-aws-opensearch
-
+ nb-engine
+
+ nb-adapters
- virtdata-api
- virtdata-lang
- virtdata-realdata
- virtdata-lib-basics
- virtdata-lib-random
- virtdata-lib-curves4
- virtdata-lib-realer
- virtdata-lib-hdf5
- virtdata-lib-vectors
- virtdata-userlibs
+ nb-virtdata
- docsys
+ nb-docsys
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ converge-project
+
+ false
+
+
+
+
+
+
+
+
+ enforce
+
+
+
+ org.apache.maven.plugins
+ maven-enforcer-plugin
+
+
+
+
+ com.amazonaws:*
+
+
+
+ The reactor is not valid, modules are not converging
+
+ true
+
+
+
+
+
+
+
+
@@ -245,40 +113,24 @@
-
-
-
- maven-release-plugin
- org.apache.maven.plugins
-
- true
- release
- true
-
-
-
-
-
-
-
Jonathan Shook
jshook@gmail.com
nosqlbench.io
- http://nosqlbench.io/
+ https://nosqlbench.io/
Sebastián Estévez
estevezsebastian@gmail.com
nosqlbench.io
- http://nosqlbench.io/
+ https://nosqlbench.io/
Madhavan S.
https://github.com/msmygit
nosqlbench.io
- http://nosqlbench.io/
+ https://nosqlbench.io/
diff --git a/scripts/link-jar-name.sh b/scripts/link-jar-name.sh
new file mode 100755
index 0000000000..07bb1b61c1
--- /dev/null
+++ b/scripts/link-jar-name.sh
@@ -0,0 +1,52 @@
+#!/bin/bash
+#
+# Copyright (c) 2022-2024 nosqlbench
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+set -e
+set -x
+
+NBJAR_VERSION=${NBJAR_VERSION:?NBJAR_VERSION must be specified}
+JAR_NAME="nb5.jar"
+BIN_NAME="nb5"
+
+echo "NBJAR_VERSION: ${NBJAR_VERSION}"
+echo "NBJAR_NAME: ${JAR_NAME}"
+
+
+cd target
+if [ -e "${JAR_NAME}" ]
+then
+ echo "${JAR_NAME} link exists, skipping"
+ exit 0
+fi
+
+for qualifier in jar-with-dependencies
+do
+ FULL_JAR_NAME="${BIN_NAME}-${NBJAR_VERSION}-${qualifier}.jar"
+ if [ -e "$FULL_JAR_NAME" ]
+ then
+ echo "linking $FULL_JAR_NAME to ${BIN_NAME}.jar"
+ ln -s $FULL_JAR_NAME $JAR_NAME
+ echo "linked $FULL_JAR_NAME to $JAR_NAME, exiting"
+ exit 0
+ else
+ echo "$FULL_JAR_NAME does not exist, skipping"
+ fi
+done
+
+echo "Unable to find any jar to link to ${JAR_NAME} name.."
+exit 2
+
diff --git a/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/DNN_Symbolic_Tests.java b/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/DNN_Symbolic_Tests.java
deleted file mode 100644
index 3b7828fc27..0000000000
--- a/virtdata-lib-vectors/src/test/java/io/nosqlbench/virtdata/lib/vectors/dnn/DNN_Symbolic_Tests.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2024 nosqlbench
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.nosqlbench.virtdata.lib.vectors.dnn;
-
-import org.junit.jupiter.api.Test;
-import org.matheclipse.core.eval.ExprEvaluator;
-import org.matheclipse.core.expression.F;
-import org.matheclipse.core.interfaces.IExpr;
-import org.matheclipse.core.interfaces.ISymbol;
-import org.matheclipse.core.interfaces.IAST;
-
-public class DNN_Symbolic_Tests {
-
- @Test
- public void testExactRepresentation() {
- ExprEvaluator util = new ExprEvaluator(false, (short)10);
-
- // Convert an expression to the internal Java form:
- // Note: single character identifiers are case sensitive
- // (the "D()" function identifier must be written as upper case
- // character)
- String javaForm = util.toJavaForm("D(sin(x)*cos(x),x)");
- // prints: D(Times(Sin(x),Cos(x)),x)
- System.out.println("Out[1]: " + javaForm.toString());
-
- // Use the Java form to create an expression with F.* static
- // methods:
- ISymbol x = F.Dummy("x");
- IAST function = F.D(F.Times(F.Sin(x), F.Cos(x)), x);
- IExpr result = util.eval(function);
- // print: Cos(x)^2-Sin(x)^2
- System.out.println("Out[2]: " + result.toString());
-
- // Note "diff" is an alias for the "D" function
- result = util.eval("diff(sin(x)*cos(x),x)");
- // print: Cos(x)^2-Sin(x)^2
- System.out.println("Out[3]: " + result.toString());
-
- // evaluate the last result (% contains "last answer")
- result = util.eval("%+cos(x)^2");
- // print: 2*Cos(x)^2-Sin(x)^2
- System.out.println("Out[4]: " + result.toString());
-
- // evaluate an Integrate[] expression
- result = util.eval("integrate(sin(x)^5,x)");
- // print: 2/3*Cos(x)^3-1/5*Cos(x)^5-Cos(x)
- System.out.println("Out[5]: " + result.toString());
-
- // set the value of a variable "a" to 10
- result = util.eval("a=10");
- // print: 10
- System.out.println("Out[6]: " + result.toString());
-
- // do a calculation with variable "a"
- result = util.eval("a*3+b");
- // print: 30+b
- System.out.println("Out[7]: " + result.toString());
-
- // Do a calculation in "numeric mode" with the N() function
- // Note: single character identifiers are case sensistive
- // (the "N()" function identifier must be written as upper case
- // character)
- result = util.eval("N(sinh(5))");
- // print: 74.20321057778875
- System.out.println("Out[8]: " + result.toString());
-
- // define a function with a recursive factorial function definition.
- // Note: fac(0) is the stop condition.
- result = util.eval("fac(x_Integer):=x*fac(x-1);fac(0)=1");
- // now calculate factorial of 10:
- result = util.eval("fac(10)");
- // print: 3628800
- System.out.println("Out[9]: " + result.toString());
-
- function = F.Function(F.Divide(F.Gamma(F.Plus(F.C1, F.Slot1)), F.Gamma(F.Plus(F.C1, F.Slot2))));
- // eval function ( Gamma(1+#1)/Gamma(1+#2) ) & [23,20]
- result = util.evalFunction(function, "23", "20");
- // print: 10626
- System.out.println("Out[10]: " + result.toString());
- }
-}