diff --git a/nb-adapters/adapter-http/pom.xml b/nb-adapters/adapter-http/pom.xml
index 1e82188e44..7aae14da42 100644
--- a/nb-adapters/adapter-http/pom.xml
+++ b/nb-adapters/adapter-http/pom.xml
@@ -72,7 +72,7 @@
         <dependency>
             <groupId>io.swagger.core.v3</groupId>
             <artifactId>swagger-core</artifactId>
-            <version>2.2.20</version>
+            <version>2.2.21</version>
         </dependency>
     </dependencies>
 
diff --git a/adapter-neo4j/pom.xml b/nb-adapters/adapter-neo4j/pom.xml
similarity index 97%
rename from adapter-neo4j/pom.xml
rename to nb-adapters/adapter-neo4j/pom.xml
index 94bbdee00a..0e453cb049 100644
--- a/adapter-neo4j/pom.xml
+++ b/nb-adapters/adapter-neo4j/pom.xml
@@ -25,7 +25,7 @@
         <artifactId>mvn-defaults</artifactId>
         <groupId>io.nosqlbench</groupId>
         <version>${revision}</version>
-        <relativePath>../mvn-defaults</relativePath>
+        <relativePath>../../mvn-defaults</relativePath>
     </parent>
 
     <name>${project.artifactId}</name>
diff --git a/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JAdapterUtils.java b/nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JAdapterUtils.java
similarity index 100%
rename from adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JAdapterUtils.java
rename to nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JAdapterUtils.java
diff --git a/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JDriverAdapter.java b/nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JDriverAdapter.java
similarity index 100%
rename from adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JDriverAdapter.java
rename to nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JDriverAdapter.java
diff --git a/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JDriverAdapterLoader.java b/nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JDriverAdapterLoader.java
similarity index 100%
rename from adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JDriverAdapterLoader.java
rename to nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JDriverAdapterLoader.java
diff --git a/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JOpMapper.java b/nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JOpMapper.java
similarity index 100%
rename from adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JOpMapper.java
rename to nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JOpMapper.java
diff --git a/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JSpace.java b/nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JSpace.java
similarity index 100%
rename from adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JSpace.java
rename to nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/Neo4JSpace.java
diff --git a/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/opdispensers/Neo4JAutoCommitOpDispenser.java b/nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/opdispensers/Neo4JAutoCommitOpDispenser.java
similarity index 100%
rename from adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/opdispensers/Neo4JAutoCommitOpDispenser.java
rename to nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/opdispensers/Neo4JAutoCommitOpDispenser.java
diff --git a/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/opdispensers/Neo4JBaseOpDispenser.java b/nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/opdispensers/Neo4JBaseOpDispenser.java
similarity index 100%
rename from adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/opdispensers/Neo4JBaseOpDispenser.java
rename to nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/opdispensers/Neo4JBaseOpDispenser.java
diff --git a/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/opdispensers/Neo4JReadTxnOpDispenser.java b/nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/opdispensers/Neo4JReadTxnOpDispenser.java
similarity index 100%
rename from adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/opdispensers/Neo4JReadTxnOpDispenser.java
rename to nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/opdispensers/Neo4JReadTxnOpDispenser.java
diff --git a/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/opdispensers/Neo4JWriteTxnOpDispenser.java b/nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/opdispensers/Neo4JWriteTxnOpDispenser.java
similarity index 100%
rename from adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/opdispensers/Neo4JWriteTxnOpDispenser.java
rename to nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/opdispensers/Neo4JWriteTxnOpDispenser.java
diff --git a/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/NBExecutionException.java b/nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/NBExecutionException.java
similarity index 100%
rename from adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/NBExecutionException.java
rename to nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/NBExecutionException.java
diff --git a/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/NBInterruptedException.java b/nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/NBInterruptedException.java
similarity index 100%
rename from adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/NBInterruptedException.java
rename to nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/NBInterruptedException.java
diff --git a/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/NBTimeoutException.java b/nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/NBTimeoutException.java
similarity index 100%
rename from adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/NBTimeoutException.java
rename to nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/NBTimeoutException.java
diff --git a/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/Neo4JAutoCommitOp.java b/nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/Neo4JAutoCommitOp.java
similarity index 100%
rename from adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/Neo4JAutoCommitOp.java
rename to nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/Neo4JAutoCommitOp.java
diff --git a/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/Neo4JBaseOp.java b/nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/Neo4JBaseOp.java
similarity index 100%
rename from adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/Neo4JBaseOp.java
rename to nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/Neo4JBaseOp.java
diff --git a/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/Neo4JReadTxnOp.java b/nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/Neo4JReadTxnOp.java
similarity index 100%
rename from adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/Neo4JReadTxnOp.java
rename to nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/Neo4JReadTxnOp.java
diff --git a/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/Neo4JWriteTxnOp.java b/nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/Neo4JWriteTxnOp.java
similarity index 100%
rename from adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/Neo4JWriteTxnOp.java
rename to nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/ops/Neo4JWriteTxnOp.java
diff --git a/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/types/Neo4JOpType.java b/nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/types/Neo4JOpType.java
similarity index 100%
rename from adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/types/Neo4JOpType.java
rename to nb-adapters/adapter-neo4j/src/main/java/io/nosqlbench/adapter/neo4j/types/Neo4JOpType.java
diff --git a/adapter-neo4j/src/main/resources/activities/neo4j.yaml b/nb-adapters/adapter-neo4j/src/main/resources/activities/neo4j.yaml
similarity index 100%
rename from adapter-neo4j/src/main/resources/activities/neo4j.yaml
rename to nb-adapters/adapter-neo4j/src/main/resources/activities/neo4j.yaml
diff --git a/adapter-neo4j/src/main/resources/neo4j.md b/nb-adapters/adapter-neo4j/src/main/resources/neo4j.md
similarity index 100%
rename from adapter-neo4j/src/main/resources/neo4j.md
rename to nb-adapters/adapter-neo4j/src/main/resources/neo4j.md
diff --git a/nb-adapters/nb-adapters-included/pom.xml b/nb-adapters/nb-adapters-included/pom.xml
index f2dbd346aa..5c108177c6 100644
--- a/nb-adapters/nb-adapters-included/pom.xml
+++ b/nb-adapters/nb-adapters-included/pom.xml
@@ -197,6 +197,20 @@
             </dependencies>
         </profile>
 
+        <profile>
+            <id>adapter-neo4j-include</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>io.nosqlbench</groupId>
+                    <artifactId>adapter-neo4j</artifactId>
+                    <version>${revision}</version>
+                </dependency>
+            </dependencies>
+        </profile>
+
         <profile>
             <id>adapter-kafka-include</id>
             <activation>
diff --git a/nb-adapters/pom.xml b/nb-adapters/pom.xml
index 193ae67b6b..08af473e8a 100644
--- a/nb-adapters/pom.xml
+++ b/nb-adapters/pom.xml
@@ -124,6 +124,16 @@
             </modules>
         </profile>
 
+        <profile>
+            <id>adapter-neo4j-module</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>adapter-neo4j</module>
+            </modules>
+        </profile>
+
         <profile>
             <id>adapter-pulsar-module</id>
             <activation>
diff --git a/nb-apis/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
index 80cc2a7c7f..886fe09da0 100644
--- a/nb-apis/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
@@ -21,10 +21,10 @@
 
 public class CycleFunctions {
     public static <T> CycleFunction<T> of(BinaryOperator<T> reducer, List<CycleFunction<T>> verifiers, T defaultResult) {
-        if (verifiers.size()==0) {
+        if (verifiers.isEmpty()) {
             return new NOOPVerifier<>(defaultResult);
         } else if (verifiers.size()==1) {
-            return verifiers.get(0);
+            return verifiers.getFirst();
         } else {
             return new CompoundCycleFunction<>(reducer, verifiers);
         }
@@ -53,7 +53,7 @@ public String getExpressionDetails() {
         }
 
         @Override
-        public <V> void setVariable(String name, V value) {
+        public <VT> void setVariable(String name, VT value) {
         }
 
         @Override