diff --git a/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/MongoOpMapper.java b/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/MongoOpMapper.java
index 9613e7e67..9a479ca61 100644
--- a/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/MongoOpMapper.java
+++ b/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/MongoOpMapper.java
@@ -16,6 +16,7 @@
 
 package io.nosqlbench.adapter.mongodb.core;
 
+import io.nosqlbench.adapter.mongodb.dispensers.MongoCommandOpDispenser;
 import io.nosqlbench.engine.api.activityimpl.OpDispenser;
 import io.nosqlbench.engine.api.activityimpl.OpMapper;
 import io.nosqlbench.engine.api.activityimpl.uniform.flowtypes.Op;
diff --git a/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/MongoCommandOpDispenser.java b/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/dispensers/MongoCommandOpDispenser.java
similarity index 95%
rename from adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/MongoCommandOpDispenser.java
rename to adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/dispensers/MongoCommandOpDispenser.java
index ed062aa1c..1e2bb82a9 100644
--- a/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/core/MongoCommandOpDispenser.java
+++ b/adapter-mongodb/src/main/java/io/nosqlbench/adapter/mongodb/dispensers/MongoCommandOpDispenser.java
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-package io.nosqlbench.adapter.mongodb.core;
+package io.nosqlbench.adapter.mongodb.dispensers;
 
 import com.mongodb.ReadPreference;
+import io.nosqlbench.adapter.mongodb.core.MongoSpace;
 import io.nosqlbench.adapter.mongodb.ops.MongoDirectCommandOp;
 import io.nosqlbench.engine.api.activityimpl.BaseOpDispenser;
 import io.nosqlbench.engine.api.activityimpl.uniform.DriverAdapter;
@@ -28,7 +29,7 @@ import org.bson.conversions.Bson;
 import java.util.Map;
 import java.util.function.LongFunction;
 
-public class MongoCommandOpDispenser extends BaseOpDispenser<Op,MongoSpace> {
+public class MongoCommandOpDispenser extends BaseOpDispenser<Op, MongoSpace> {
     private final LongFunction<MongoDirectCommandOp> opFunc;
     private final LongFunction<MongoDirectCommandOp> mongoOpF;