diff --git a/core/src/main/java/ai/timefold/solver/core/api/score/stream/Joiners.java b/core/src/main/java/ai/timefold/solver/core/api/score/stream/Joiners.java
index 72b737efbf..6f7183ef3d 100644
--- a/core/src/main/java/ai/timefold/solver/core/api/score/stream/Joiners.java
+++ b/core/src/main/java/ai/timefold/solver/core/api/score/stream/Joiners.java
@@ -15,15 +15,15 @@
 import ai.timefold.solver.core.api.score.stream.quad.QuadJoiner;
 import ai.timefold.solver.core.api.score.stream.tri.TriJoiner;
 import ai.timefold.solver.core.api.score.stream.uni.UniConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.JoinerType;
-import ai.timefold.solver.core.impl.score.stream.common.bi.DefaultBiJoiner;
-import ai.timefold.solver.core.impl.score.stream.common.bi.FilteringBiJoiner;
-import ai.timefold.solver.core.impl.score.stream.common.penta.DefaultPentaJoiner;
-import ai.timefold.solver.core.impl.score.stream.common.penta.FilteringPentaJoiner;
-import ai.timefold.solver.core.impl.score.stream.common.quad.DefaultQuadJoiner;
-import ai.timefold.solver.core.impl.score.stream.common.quad.FilteringQuadJoiner;
-import ai.timefold.solver.core.impl.score.stream.common.tri.DefaultTriJoiner;
-import ai.timefold.solver.core.impl.score.stream.common.tri.FilteringTriJoiner;
+import ai.timefold.solver.core.impl.bavet.common.index.joiner.DefaultBiJoiner;
+import ai.timefold.solver.core.impl.bavet.common.index.joiner.DefaultPentaJoiner;
+import ai.timefold.solver.core.impl.bavet.common.index.joiner.DefaultQuadJoiner;
+import ai.timefold.solver.core.impl.bavet.common.index.joiner.DefaultTriJoiner;
+import ai.timefold.solver.core.impl.bavet.common.index.joiner.FilteringBiJoiner;
+import ai.timefold.solver.core.impl.bavet.common.index.joiner.FilteringPentaJoiner;
+import ai.timefold.solver.core.impl.bavet.common.index.joiner.FilteringQuadJoiner;
+import ai.timefold.solver.core.impl.bavet.common.index.joiner.FilteringTriJoiner;
+import ai.timefold.solver.core.impl.bavet.common.index.joiner.JoinerType;
 import ai.timefold.solver.core.impl.util.ConstantLambdaUtils;
 
 import org.jspecify.annotations.NonNull;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/bavet/AbstractSession.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/AbstractSession.java
new file mode 100644
index 0000000000..a0eac1c62a
--- /dev/null
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/AbstractSession.java
@@ -0,0 +1,56 @@
+package ai.timefold.solver.core.impl.bavet;
+
+import java.util.IdentityHashMap;
+import java.util.Map;
+
+import ai.timefold.solver.core.impl.bavet.uni.AbstractForEachUniNode;
+
+public abstract class AbstractSession {
+
+    private final NodeNetwork nodeNetwork;
+    private final Map<Class<?>, AbstractForEachUniNode<Object>[]> effectiveClassToNodeArrayMap;
+
+    protected AbstractSession(NodeNetwork nodeNetwork) {
+        this.nodeNetwork = nodeNetwork;
+        this.effectiveClassToNodeArrayMap = new IdentityHashMap<>(nodeNetwork.forEachNodeCount());
+    }
+
+    public final void insert(Object fact) {
+        var factClass = fact.getClass();
+        for (var node : findNodes(factClass)) {
+            node.insert(fact);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private AbstractForEachUniNode<Object>[] findNodes(Class<?> factClass) {
+        // Map.computeIfAbsent() would have created lambdas on the hot path, this will not.
+        var nodeArray = effectiveClassToNodeArrayMap.get(factClass);
+        if (nodeArray == null) {
+            nodeArray = nodeNetwork.getForEachNodes(factClass)
+                    .filter(AbstractForEachUniNode::supportsIndividualUpdates)
+                    .toArray(AbstractForEachUniNode[]::new);
+            effectiveClassToNodeArrayMap.put(factClass, nodeArray);
+        }
+        return nodeArray;
+    }
+
+    public final void update(Object fact) {
+        var factClass = fact.getClass();
+        for (var node : findNodes(factClass)) {
+            node.update(fact);
+        }
+    }
+
+    public final void retract(Object fact) {
+        var factClass = fact.getClass();
+        for (var node : findNodes(factClass)) {
+            node.retract(fact);
+        }
+    }
+
+    protected void settle() {
+        nodeNetwork.settle();
+    }
+
+}
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/NodeNetwork.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/NodeNetwork.java
similarity index 73%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/NodeNetwork.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/NodeNetwork.java
index 83511b5ecf..63fec53a90 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/NodeNetwork.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/NodeNetwork.java
@@ -1,12 +1,13 @@
-package ai.timefold.solver.core.impl.score.stream.bavet;
+package ai.timefold.solver.core.impl.bavet;
 
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.stream.Stream;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.Propagator;
-import ai.timefold.solver.core.impl.score.stream.bavet.uni.AbstractForEachUniNode;
+import ai.timefold.solver.core.impl.bavet.common.Propagator;
+import ai.timefold.solver.core.impl.bavet.uni.AbstractForEachUniNode;
 
 /**
  * Represents Bavet's network of nodes, specific to a particular session.
@@ -17,7 +18,7 @@
  * @param layeredNodes nodes grouped first by their layer, then by their index within the layer;
  *        propagation needs to happen in this order.
  */
-record NodeNetwork(Map<Class<?>, List<AbstractForEachUniNode<Object>>> declaredClassToNodeMap, Propagator[][] layeredNodes) {
+public record NodeNetwork(Map<Class<?>, List<AbstractForEachUniNode<?>>> declaredClassToNodeMap, Propagator[][] layeredNodes) {
 
     public static final NodeNetwork EMPTY = new NodeNetwork(Map.of(), new Propagator[0][0]);
 
@@ -29,23 +30,27 @@ public int layerCount() {
         return layeredNodes.length;
     }
 
-    @SuppressWarnings("unchecked")
-    public AbstractForEachUniNode<Object>[] getApplicableForEachNodes(Class<?> factClass) {
+    public Stream<AbstractForEachUniNode<?>> getForEachNodes() {
+        return declaredClassToNodeMap.values()
+                .stream()
+                .flatMap(List::stream);
+    }
+
+    public Stream<AbstractForEachUniNode<?>> getForEachNodes(Class<?> factClass) {
         return declaredClassToNodeMap.entrySet()
                 .stream()
                 .filter(entry -> entry.getKey().isAssignableFrom(factClass))
                 .map(Map.Entry::getValue)
-                .flatMap(List::stream)
-                .toArray(AbstractForEachUniNode[]::new);
+                .flatMap(List::stream);
     }
 
-    public void propagate() {
+    public void settle() {
         for (var layerIndex = 0; layerIndex < layerCount(); layerIndex++) {
-            propagateInLayer(layeredNodes[layerIndex]);
+            settleLayer(layeredNodes[layerIndex]);
         }
     }
 
-    private static void propagateInLayer(Propagator[] nodesInLayer) {
+    private static void settleLayer(Propagator[] nodesInLayer) {
         var nodeCount = nodesInLayer.length;
         if (nodeCount == 1) {
             nodesInLayer[0].propagateEverything();
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/AbstractGroupBiNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/AbstractGroupBiNode.java
similarity index 82%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/AbstractGroupBiNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/AbstractGroupBiNode.java
index 974e4959ac..425fba808c 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/AbstractGroupBiNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/AbstractGroupBiNode.java
@@ -1,14 +1,14 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.bi;
+package ai.timefold.solver.core.impl.bavet.bi;
 
 import java.util.function.Function;
 
 import ai.timefold.solver.core.api.function.TriFunction;
 import ai.timefold.solver.core.api.score.stream.bi.BiConstraintCollector;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractGroupNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.AbstractTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.AbstractGroupNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.AbstractTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 
 abstract class AbstractGroupBiNode<OldA, OldB, OutTuple_ extends AbstractTuple, GroupKey_, ResultContainer_, Result_>
         extends AbstractGroupNode<BiTuple<OldA, OldB>, OutTuple_, GroupKey_, ResultContainer_, Result_> {
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/ConcatBiBiNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/ConcatBiBiNode.java
similarity index 72%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/ConcatBiBiNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/ConcatBiBiNode.java
index d885bc9bbe..27dcbaf79a 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/ConcatBiBiNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/ConcatBiBiNode.java
@@ -1,13 +1,13 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.bi;
+package ai.timefold.solver.core.impl.bavet.bi;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractConcatNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.AbstractConcatNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 
-final class ConcatBiBiNode<A, B>
+public final class ConcatBiBiNode<A, B>
         extends AbstractConcatNode<BiTuple<A, B>, BiTuple<A, B>, BiTuple<A, B>> {
 
-    ConcatBiBiNode(TupleLifecycle<BiTuple<A, B>> nextNodesTupleLifecycle,
+    public ConcatBiBiNode(TupleLifecycle<BiTuple<A, B>> nextNodesTupleLifecycle,
             int inputStoreIndexLeftOutTupleList, int inputStoreIndexRightOutTupleList,
             int outputStoreSize) {
         super(nextNodesTupleLifecycle, inputStoreIndexLeftOutTupleList, inputStoreIndexRightOutTupleList, outputStoreSize);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/ConcatBiUniNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/ConcatBiUniNode.java
similarity index 70%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/ConcatBiUniNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/ConcatBiUniNode.java
index ced700f1f7..02e37019c0 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/ConcatBiUniNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/ConcatBiUniNode.java
@@ -1,18 +1,18 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.bi;
+package ai.timefold.solver.core.impl.bavet.bi;
 
 import java.util.function.Function;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractConcatNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.common.AbstractConcatNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 
-final class ConcatBiUniNode<A, B>
+public final class ConcatBiUniNode<A, B>
         extends AbstractConcatNode<BiTuple<A, B>, UniTuple<A>, BiTuple<A, B>> {
 
     private final Function<A, B> paddingFunction;
 
-    ConcatBiUniNode(Function<A, B> paddingFunction, TupleLifecycle<BiTuple<A, B>> nextNodesTupleLifecycle,
+    public ConcatBiUniNode(Function<A, B> paddingFunction, TupleLifecycle<BiTuple<A, B>> nextNodesTupleLifecycle,
             int inputStoreIndexLeftOutTupleList, int inputStoreIndexRightOutTupleList,
             int outputStoreSize) {
         super(nextNodesTupleLifecycle, inputStoreIndexLeftOutTupleList, inputStoreIndexRightOutTupleList, outputStoreSize);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/ConcatUniBiNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/ConcatUniBiNode.java
similarity index 70%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/ConcatUniBiNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/ConcatUniBiNode.java
index b36377bf25..700ad1c2cc 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/ConcatUniBiNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/ConcatUniBiNode.java
@@ -1,18 +1,18 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.bi;
+package ai.timefold.solver.core.impl.bavet.bi;
 
 import java.util.function.Function;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractConcatNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.common.AbstractConcatNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 
-final class ConcatUniBiNode<A, B>
+public final class ConcatUniBiNode<A, B>
         extends AbstractConcatNode<UniTuple<A>, BiTuple<A, B>, BiTuple<A, B>> {
 
     private final Function<A, B> paddingFunction;
 
-    ConcatUniBiNode(Function<A, B> paddingFunction, TupleLifecycle<BiTuple<A, B>> nextNodesTupleLifecycle,
+    public ConcatUniBiNode(Function<A, B> paddingFunction, TupleLifecycle<BiTuple<A, B>> nextNodesTupleLifecycle,
             int inputStoreIndexLeftOutTupleList, int inputStoreIndexRightOutTupleList,
             int outputStoreSize) {
         super(nextNodesTupleLifecycle, inputStoreIndexLeftOutTupleList, inputStoreIndexRightOutTupleList,
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/ConditionalBiTupleLifecycle.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/ConditionalBiTupleLifecycle.java
new file mode 100644
index 0000000000..0c29475c44
--- /dev/null
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/ConditionalBiTupleLifecycle.java
@@ -0,0 +1,22 @@
+package ai.timefold.solver.core.impl.bavet.bi;
+
+import java.util.function.BiPredicate;
+
+import ai.timefold.solver.core.impl.bavet.common.tuple.AbstractConditionalTupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+
+public final class ConditionalBiTupleLifecycle<A, B> extends AbstractConditionalTupleLifecycle<BiTuple<A, B>> {
+    private final BiPredicate<A, B> predicate;
+
+    public ConditionalBiTupleLifecycle(BiPredicate<A, B> predicate, TupleLifecycle<BiTuple<A, B>> tupleLifecycle) {
+        super(tupleLifecycle);
+        this.predicate = predicate;
+    }
+
+    @Override
+    protected boolean test(BiTuple<A, B> tuple) {
+        return predicate.test(tuple.factA, tuple.factB);
+    }
+
+}
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/FlattenLastBiNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/FlattenLastBiNode.java
similarity index 57%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/FlattenLastBiNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/FlattenLastBiNode.java
index 412fa6ed17..a6a18c6667 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/FlattenLastBiNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/FlattenLastBiNode.java
@@ -1,16 +1,16 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.bi;
+package ai.timefold.solver.core.impl.bavet.bi;
 
 import java.util.function.Function;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractFlattenLastNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.AbstractFlattenLastNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 
-final class FlattenLastBiNode<A, B, NewB> extends AbstractFlattenLastNode<BiTuple<A, B>, BiTuple<A, NewB>, B, NewB> {
+public final class FlattenLastBiNode<A, B, NewB> extends AbstractFlattenLastNode<BiTuple<A, B>, BiTuple<A, NewB>, B, NewB> {
 
     private final int outputStoreSize;
 
-    FlattenLastBiNode(int flattenLastStoreIndex, Function<B, Iterable<NewB>> mappingFunction,
+    public FlattenLastBiNode(int flattenLastStoreIndex, Function<B, Iterable<NewB>> mappingFunction,
             TupleLifecycle<BiTuple<A, NewB>> nextNodesTupleLifecycle, int outputStoreSize) {
         super(flattenLastStoreIndex, mappingFunction, nextNodesTupleLifecycle);
         this.outputStoreSize = outputStoreSize;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/Group0Mapping1CollectorBiNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/Group0Mapping1CollectorBiNode.java
similarity index 76%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/Group0Mapping1CollectorBiNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/Group0Mapping1CollectorBiNode.java
index dcfb799ddf..2fff40a8e1 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/Group0Mapping1CollectorBiNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/Group0Mapping1CollectorBiNode.java
@@ -1,11 +1,11 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.bi;
+package ai.timefold.solver.core.impl.bavet.bi;
 
 import ai.timefold.solver.core.api.score.stream.bi.BiConstraintCollector;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 
-final class Group0Mapping1CollectorBiNode<OldA, OldB, A, ResultContainer_>
+public final class Group0Mapping1CollectorBiNode<OldA, OldB, A, ResultContainer_>
         extends AbstractGroupBiNode<OldA, OldB, UniTuple<A>, Void, ResultContainer_, A> {
 
     private final int outputStoreSize;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/Group0Mapping2CollectorBiNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/Group0Mapping2CollectorBiNode.java
similarity index 84%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/Group0Mapping2CollectorBiNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/Group0Mapping2CollectorBiNode.java
index fd9a12fea7..28493700fa 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/Group0Mapping2CollectorBiNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/Group0Mapping2CollectorBiNode.java
@@ -1,13 +1,13 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.bi;
+package ai.timefold.solver.core.impl.bavet.bi;
 
 import ai.timefold.solver.core.api.score.stream.ConstraintCollectors;
 import ai.timefold.solver.core.api.score.stream.bi.BiConstraintCollector;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 import ai.timefold.solver.core.impl.util.Pair;
 
-final class Group0Mapping2CollectorBiNode<OldA, OldB, A, B, ResultContainerA_, ResultContainerB_>
+public final class Group0Mapping2CollectorBiNode<OldA, OldB, A, B, ResultContainerA_, ResultContainerB_>
         extends AbstractGroupBiNode<OldA, OldB, BiTuple<A, B>, Void, Object, Pair<A, B>> {
 
     private final int outputStoreSize;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/Group0Mapping3CollectorBiNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/Group0Mapping3CollectorBiNode.java
similarity index 85%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/Group0Mapping3CollectorBiNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/Group0Mapping3CollectorBiNode.java
index d0f6ea2cce..4c2e3d86fd 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/Group0Mapping3CollectorBiNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/Group0Mapping3CollectorBiNode.java
@@ -1,13 +1,13 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.bi;
+package ai.timefold.solver.core.impl.bavet.bi;
 
 import ai.timefold.solver.core.api.score.stream.ConstraintCollectors;
 import ai.timefold.solver.core.api.score.stream.bi.BiConstraintCollector;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 import ai.timefold.solver.core.impl.util.Triple;
 
-final class Group0Mapping3CollectorBiNode<OldA, OldB, A, B, C, ResultContainerA_, ResultContainerB_, ResultContainerC_>
+public final class Group0Mapping3CollectorBiNode<OldA, OldB, A, B, C, ResultContainerA_, ResultContainerB_, ResultContainerC_>
         extends AbstractGroupBiNode<OldA, OldB, TriTuple<A, B, C>, Void, Object, Triple<A, B, C>> {
 
     private final int outputStoreSize;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/Group0Mapping4CollectorBiNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/Group0Mapping4CollectorBiNode.java
similarity index 86%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/Group0Mapping4CollectorBiNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/Group0Mapping4CollectorBiNode.java
index a4dcea39dd..8d369e2f6c 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/Group0Mapping4CollectorBiNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/Group0Mapping4CollectorBiNode.java
@@ -1,13 +1,13 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.bi;
+package ai.timefold.solver.core.impl.bavet.bi;
 
 import ai.timefold.solver.core.api.score.stream.ConstraintCollectors;
 import ai.timefold.solver.core.api.score.stream.bi.BiConstraintCollector;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 import ai.timefold.solver.core.impl.util.Quadruple;
 
-final class Group0Mapping4CollectorBiNode<OldA, OldB, A, B, C, D, ResultContainerA_, ResultContainerB_, ResultContainerC_, ResultContainerD_>
+public final class Group0Mapping4CollectorBiNode<OldA, OldB, A, B, C, D, ResultContainerA_, ResultContainerB_, ResultContainerC_, ResultContainerD_>
         extends
         AbstractGroupBiNode<OldA, OldB, QuadTuple<A, B, C, D>, Void, Object, Quadruple<A, B, C, D>> {
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/Group1Mapping0CollectorBiNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/Group1Mapping0CollectorBiNode.java
similarity index 76%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/Group1Mapping0CollectorBiNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/Group1Mapping0CollectorBiNode.java
index 2aebf6017a..8da5045ac1 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/Group1Mapping0CollectorBiNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/Group1Mapping0CollectorBiNode.java
@@ -1,13 +1,13 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.bi;
+package ai.timefold.solver.core.impl.bavet.bi;
 
 import java.util.function.BiFunction;
 
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 
-final class Group1Mapping0CollectorBiNode<OldA, OldB, A>
+public final class Group1Mapping0CollectorBiNode<OldA, OldB, A>
         extends AbstractGroupBiNode<OldA, OldB, UniTuple<A>, A, Void, Void> {
 
     private final int outputStoreSize;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/Group1Mapping1CollectorBiNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/Group1Mapping1CollectorBiNode.java
similarity index 73%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/Group1Mapping1CollectorBiNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/Group1Mapping1CollectorBiNode.java
index 181471360f..17f13c6e3c 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/Group1Mapping1CollectorBiNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/Group1Mapping1CollectorBiNode.java
@@ -1,15 +1,15 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.bi;
+package ai.timefold.solver.core.impl.bavet.bi;
 
-import static ai.timefold.solver.core.impl.score.stream.bavet.bi.Group1Mapping0CollectorBiNode.createGroupKey;
+import static ai.timefold.solver.core.impl.bavet.bi.Group1Mapping0CollectorBiNode.createGroupKey;
 
 import java.util.function.BiFunction;
 
 import ai.timefold.solver.core.api.score.stream.bi.BiConstraintCollector;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 
-final class Group1Mapping1CollectorBiNode<OldA, OldB, A, B, ResultContainer_>
+public final class Group1Mapping1CollectorBiNode<OldA, OldB, A, B, ResultContainer_>
         extends AbstractGroupBiNode<OldA, OldB, BiTuple<A, B>, A, ResultContainer_, B> {
 
     private final int outputStoreSize;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/Group1Mapping2CollectorBiNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/Group1Mapping2CollectorBiNode.java
similarity index 76%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/Group1Mapping2CollectorBiNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/Group1Mapping2CollectorBiNode.java
index 0f7a558993..8a95f69eb2 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/Group1Mapping2CollectorBiNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/Group1Mapping2CollectorBiNode.java
@@ -1,16 +1,16 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.bi;
+package ai.timefold.solver.core.impl.bavet.bi;
 
-import static ai.timefold.solver.core.impl.score.stream.bavet.bi.Group1Mapping0CollectorBiNode.createGroupKey;
+import static ai.timefold.solver.core.impl.bavet.bi.Group1Mapping0CollectorBiNode.createGroupKey;
 
 import java.util.function.BiFunction;
 
 import ai.timefold.solver.core.api.score.stream.bi.BiConstraintCollector;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 import ai.timefold.solver.core.impl.util.Pair;
 
-final class Group1Mapping2CollectorBiNode<OldA, OldB, A, B, C, ResultContainerB_, ResultContainerC_>
+public final class Group1Mapping2CollectorBiNode<OldA, OldB, A, B, C, ResultContainerB_, ResultContainerC_>
         extends AbstractGroupBiNode<OldA, OldB, TriTuple<A, B, C>, A, Object, Pair<B, C>> {
 
     private final int outputStoreSize;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/Group1Mapping3CollectorBiNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/Group1Mapping3CollectorBiNode.java
similarity index 73%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/Group1Mapping3CollectorBiNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/Group1Mapping3CollectorBiNode.java
index 3850eae451..62f5ae9b64 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/Group1Mapping3CollectorBiNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/Group1Mapping3CollectorBiNode.java
@@ -1,17 +1,17 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.bi;
+package ai.timefold.solver.core.impl.bavet.bi;
 
-import static ai.timefold.solver.core.impl.score.stream.bavet.bi.Group0Mapping3CollectorBiNode.mergeCollectors;
-import static ai.timefold.solver.core.impl.score.stream.bavet.bi.Group1Mapping0CollectorBiNode.createGroupKey;
+import static ai.timefold.solver.core.impl.bavet.bi.Group0Mapping3CollectorBiNode.mergeCollectors;
+import static ai.timefold.solver.core.impl.bavet.bi.Group1Mapping0CollectorBiNode.createGroupKey;
 
 import java.util.function.BiFunction;
 
 import ai.timefold.solver.core.api.score.stream.bi.BiConstraintCollector;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 import ai.timefold.solver.core.impl.util.Triple;
 
-final class Group1Mapping3CollectorBiNode<OldA, OldB, A, B, C, D, ResultContainerB_, ResultContainerC_, ResultContainerD_>
+public final class Group1Mapping3CollectorBiNode<OldA, OldB, A, B, C, D, ResultContainerB_, ResultContainerC_, ResultContainerD_>
         extends AbstractGroupBiNode<OldA, OldB, QuadTuple<A, B, C, D>, A, Object, Triple<B, C, D>> {
 
     private final int outputStoreSize;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/Group2Mapping0CollectorBiNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/Group2Mapping0CollectorBiNode.java
similarity index 84%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/Group2Mapping0CollectorBiNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/Group2Mapping0CollectorBiNode.java
index 8ee27566f2..f567f84639 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/Group2Mapping0CollectorBiNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/Group2Mapping0CollectorBiNode.java
@@ -1,13 +1,13 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.bi;
+package ai.timefold.solver.core.impl.bavet.bi;
 
 import java.util.function.BiFunction;
 
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 import ai.timefold.solver.core.impl.util.Pair;
 
-final class Group2Mapping0CollectorBiNode<OldA, OldB, A, B>
+public final class Group2Mapping0CollectorBiNode<OldA, OldB, A, B>
         extends AbstractGroupBiNode<OldA, OldB, BiTuple<A, B>, Pair<A, B>, Void, Void> {
 
     private final int outputStoreSize;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/Group2Mapping1CollectorBiNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/Group2Mapping1CollectorBiNode.java
similarity index 81%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/Group2Mapping1CollectorBiNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/Group2Mapping1CollectorBiNode.java
index d47d6819c7..d18b55c937 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/Group2Mapping1CollectorBiNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/Group2Mapping1CollectorBiNode.java
@@ -1,14 +1,14 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.bi;
+package ai.timefold.solver.core.impl.bavet.bi;
 
 import java.util.function.BiFunction;
 
 import ai.timefold.solver.core.api.score.stream.bi.BiConstraintCollector;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 import ai.timefold.solver.core.impl.util.Pair;
 
-final class Group2Mapping1CollectorBiNode<OldA, OldB, A, B, C, ResultContainer_>
+public final class Group2Mapping1CollectorBiNode<OldA, OldB, A, B, C, ResultContainer_>
         extends AbstractGroupBiNode<OldA, OldB, TriTuple<A, B, C>, Pair<A, B>, ResultContainer_, C> {
 
     private final int outputStoreSize;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/Group2Mapping2CollectorBiNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/Group2Mapping2CollectorBiNode.java
similarity index 83%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/Group2Mapping2CollectorBiNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/Group2Mapping2CollectorBiNode.java
index 5ee56b9925..0d07488ce4 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/Group2Mapping2CollectorBiNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/Group2Mapping2CollectorBiNode.java
@@ -1,14 +1,14 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.bi;
+package ai.timefold.solver.core.impl.bavet.bi;
 
 import java.util.function.BiFunction;
 
 import ai.timefold.solver.core.api.score.stream.bi.BiConstraintCollector;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 import ai.timefold.solver.core.impl.util.Pair;
 
-final class Group2Mapping2CollectorBiNode<OldA, OldB, A, B, C, D, ResultContainerC_, ResultContainerD_>
+public final class Group2Mapping2CollectorBiNode<OldA, OldB, A, B, C, D, ResultContainerC_, ResultContainerD_>
         extends
         AbstractGroupBiNode<OldA, OldB, QuadTuple<A, B, C, D>, Pair<A, B>, Object, Pair<C, D>> {
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/Group3Mapping0CollectorBiNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/Group3Mapping0CollectorBiNode.java
similarity index 82%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/Group3Mapping0CollectorBiNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/Group3Mapping0CollectorBiNode.java
index 306cfc077e..ea313a7dd0 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/Group3Mapping0CollectorBiNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/Group3Mapping0CollectorBiNode.java
@@ -1,14 +1,14 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.bi;
+package ai.timefold.solver.core.impl.bavet.bi;
 
 import java.util.function.BiFunction;
 
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 import ai.timefold.solver.core.impl.util.Triple;
 
-final class Group3Mapping0CollectorBiNode<OldA, OldB, A, B, C>
+public final class Group3Mapping0CollectorBiNode<OldA, OldB, A, B, C>
         extends AbstractGroupBiNode<OldA, OldB, TriTuple<A, B, C>, Triple<A, B, C>, Void, Void> {
 
     private final int outputStoreSize;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/Group3Mapping1CollectorBiNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/Group3Mapping1CollectorBiNode.java
similarity index 83%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/Group3Mapping1CollectorBiNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/Group3Mapping1CollectorBiNode.java
index e5fbf370dc..3d768ee557 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/Group3Mapping1CollectorBiNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/Group3Mapping1CollectorBiNode.java
@@ -1,14 +1,14 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.bi;
+package ai.timefold.solver.core.impl.bavet.bi;
 
 import java.util.function.BiFunction;
 
 import ai.timefold.solver.core.api.score.stream.bi.BiConstraintCollector;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 import ai.timefold.solver.core.impl.util.Triple;
 
-final class Group3Mapping1CollectorBiNode<OldA, OldB, A, B, C, D, ResultContainer_>
+public final class Group3Mapping1CollectorBiNode<OldA, OldB, A, B, C, D, ResultContainer_>
         extends
         AbstractGroupBiNode<OldA, OldB, QuadTuple<A, B, C, D>, Triple<A, B, C>, ResultContainer_, D> {
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/Group4Mapping0CollectorBiNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/Group4Mapping0CollectorBiNode.java
similarity index 84%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/Group4Mapping0CollectorBiNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/Group4Mapping0CollectorBiNode.java
index 76dafa42b2..7220bdacd9 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/Group4Mapping0CollectorBiNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/Group4Mapping0CollectorBiNode.java
@@ -1,14 +1,14 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.bi;
+package ai.timefold.solver.core.impl.bavet.bi;
 
 import java.util.function.BiFunction;
 
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 import ai.timefold.solver.core.impl.util.Quadruple;
 
-final class Group4Mapping0CollectorBiNode<OldA, OldB, A, B, C, D>
+public final class Group4Mapping0CollectorBiNode<OldA, OldB, A, B, C, D>
         extends
         AbstractGroupBiNode<OldA, OldB, QuadTuple<A, B, C, D>, Quadruple<A, B, C, D>, Void, Void> {
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/IndexedIfExistsBiNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/IndexedIfExistsBiNode.java
similarity index 76%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/IndexedIfExistsBiNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/IndexedIfExistsBiNode.java
index 5a6fcff1d2..1cdcc2a14f 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/IndexedIfExistsBiNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/IndexedIfExistsBiNode.java
@@ -1,18 +1,18 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.bi;
+package ai.timefold.solver.core.impl.bavet.bi;
 
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
 import ai.timefold.solver.core.api.function.TriPredicate;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractIndexedIfExistsNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.ExistsCounter;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.index.IndexProperties;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.index.Indexer;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
-
-final class IndexedIfExistsBiNode<A, B, C> extends AbstractIndexedIfExistsNode<BiTuple<A, B>, C> {
+import ai.timefold.solver.core.impl.bavet.common.AbstractIndexedIfExistsNode;
+import ai.timefold.solver.core.impl.bavet.common.ExistsCounter;
+import ai.timefold.solver.core.impl.bavet.common.index.IndexProperties;
+import ai.timefold.solver.core.impl.bavet.common.index.Indexer;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
+
+public final class IndexedIfExistsBiNode<A, B, C> extends AbstractIndexedIfExistsNode<BiTuple<A, B>, C> {
 
     private final BiFunction<A, B, IndexProperties> mappingAB;
     private final TriPredicate<A, B, C> filtering;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/IndexedJoinBiNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/IndexedJoinBiNode.java
similarity index 76%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/IndexedJoinBiNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/IndexedJoinBiNode.java
index c3916cbfe8..7050b0a182 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/IndexedJoinBiNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/IndexedJoinBiNode.java
@@ -1,16 +1,16 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.bi;
+package ai.timefold.solver.core.impl.bavet.bi;
 
 import java.util.function.BiPredicate;
 import java.util.function.Function;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractIndexedJoinNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.index.IndexProperties;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.index.Indexer;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.common.AbstractIndexedJoinNode;
+import ai.timefold.solver.core.impl.bavet.common.index.IndexProperties;
+import ai.timefold.solver.core.impl.bavet.common.index.Indexer;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 
-final class IndexedJoinBiNode<A, B> extends AbstractIndexedJoinNode<UniTuple<A>, B, BiTuple<A, B>> {
+public final class IndexedJoinBiNode<A, B> extends AbstractIndexedJoinNode<UniTuple<A>, B, BiTuple<A, B>> {
 
     private final Function<A, IndexProperties> mappingA;
     private final BiPredicate<A, B> filtering;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/MapBiToBiNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/MapBiToBiNode.java
similarity index 69%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/MapBiToBiNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/MapBiToBiNode.java
index afb24481f1..63bf37bfc6 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/MapBiToBiNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/MapBiToBiNode.java
@@ -1,18 +1,18 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.bi;
+package ai.timefold.solver.core.impl.bavet.bi;
 
 import java.util.Objects;
 import java.util.function.BiFunction;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractMapNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.AbstractMapNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 
-final class MapBiToBiNode<A, B, NewA, NewB> extends AbstractMapNode<BiTuple<A, B>, BiTuple<NewA, NewB>> {
+public final class MapBiToBiNode<A, B, NewA, NewB> extends AbstractMapNode<BiTuple<A, B>, BiTuple<NewA, NewB>> {
 
     private final BiFunction<A, B, NewA> mappingFunctionA;
     private final BiFunction<A, B, NewB> mappingFunctionB;
 
-    MapBiToBiNode(int mapStoreIndex, BiFunction<A, B, NewA> mappingFunctionA, BiFunction<A, B, NewB> mappingFunctionB,
+    public MapBiToBiNode(int mapStoreIndex, BiFunction<A, B, NewA> mappingFunctionA, BiFunction<A, B, NewB> mappingFunctionB,
             TupleLifecycle<BiTuple<NewA, NewB>> nextNodesTupleLifecycle, int outputStoreSize) {
         super(mapStoreIndex, nextNodesTupleLifecycle, outputStoreSize);
         this.mappingFunctionA = Objects.requireNonNull(mappingFunctionA);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/MapBiToQuadNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/MapBiToQuadNode.java
similarity index 77%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/MapBiToQuadNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/MapBiToQuadNode.java
index 28d12ab08a..42e314f411 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/MapBiToQuadNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/MapBiToQuadNode.java
@@ -1,14 +1,14 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.bi;
+package ai.timefold.solver.core.impl.bavet.bi;
 
 import java.util.Objects;
 import java.util.function.BiFunction;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractMapNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.AbstractMapNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 
-final class MapBiToQuadNode<A, B, NewA, NewB, NewC, NewD>
+public final class MapBiToQuadNode<A, B, NewA, NewB, NewC, NewD>
         extends AbstractMapNode<BiTuple<A, B>, QuadTuple<NewA, NewB, NewC, NewD>> {
 
     private final BiFunction<A, B, NewA> mappingFunctionA;
@@ -16,7 +16,7 @@ final class MapBiToQuadNode<A, B, NewA, NewB, NewC, NewD>
     private final BiFunction<A, B, NewC> mappingFunctionC;
     private final BiFunction<A, B, NewD> mappingFunctionD;
 
-    MapBiToQuadNode(int mapStoreIndex, BiFunction<A, B, NewA> mappingFunctionA, BiFunction<A, B, NewB> mappingFunctionB,
+    public MapBiToQuadNode(int mapStoreIndex, BiFunction<A, B, NewA> mappingFunctionA, BiFunction<A, B, NewB> mappingFunctionB,
             BiFunction<A, B, NewC> mappingFunctionC, BiFunction<A, B, NewD> mappingFunctionD,
             TupleLifecycle<QuadTuple<NewA, NewB, NewC, NewD>> nextNodesTupleLifecycle, int outputStoreSize) {
         super(mapStoreIndex, nextNodesTupleLifecycle, outputStoreSize);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/MapBiToTriNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/MapBiToTriNode.java
similarity index 71%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/MapBiToTriNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/MapBiToTriNode.java
index 01519f102f..e745fd8338 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/MapBiToTriNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/MapBiToTriNode.java
@@ -1,20 +1,20 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.bi;
+package ai.timefold.solver.core.impl.bavet.bi;
 
 import java.util.Objects;
 import java.util.function.BiFunction;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractMapNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.AbstractMapNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 
-final class MapBiToTriNode<A, B, NewA, NewB, NewC> extends AbstractMapNode<BiTuple<A, B>, TriTuple<NewA, NewB, NewC>> {
+public final class MapBiToTriNode<A, B, NewA, NewB, NewC> extends AbstractMapNode<BiTuple<A, B>, TriTuple<NewA, NewB, NewC>> {
 
     private final BiFunction<A, B, NewA> mappingFunctionA;
     private final BiFunction<A, B, NewB> mappingFunctionB;
     private final BiFunction<A, B, NewC> mappingFunctionC;
 
-    MapBiToTriNode(int mapStoreIndex, BiFunction<A, B, NewA> mappingFunctionA, BiFunction<A, B, NewB> mappingFunctionB,
+    public MapBiToTriNode(int mapStoreIndex, BiFunction<A, B, NewA> mappingFunctionA, BiFunction<A, B, NewB> mappingFunctionB,
             BiFunction<A, B, NewC> mappingFunctionC,
             TupleLifecycle<TriTuple<NewA, NewB, NewC>> nextNodesTupleLifecycle, int outputStoreSize) {
         super(mapStoreIndex, nextNodesTupleLifecycle, outputStoreSize);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/MapBiToUniNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/MapBiToUniNode.java
similarity index 61%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/MapBiToUniNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/MapBiToUniNode.java
index 7254443bd6..1462b7ce36 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/MapBiToUniNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/MapBiToUniNode.java
@@ -1,18 +1,18 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.bi;
+package ai.timefold.solver.core.impl.bavet.bi;
 
 import java.util.Objects;
 import java.util.function.BiFunction;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractMapNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.common.AbstractMapNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 
-final class MapBiToUniNode<A, B, NewA> extends AbstractMapNode<BiTuple<A, B>, UniTuple<NewA>> {
+public final class MapBiToUniNode<A, B, NewA> extends AbstractMapNode<BiTuple<A, B>, UniTuple<NewA>> {
 
     private final BiFunction<A, B, NewA> mappingFunction;
 
-    MapBiToUniNode(int mapStoreIndex, BiFunction<A, B, NewA> mappingFunction,
+    public MapBiToUniNode(int mapStoreIndex, BiFunction<A, B, NewA> mappingFunction,
             TupleLifecycle<UniTuple<NewA>> nextNodesTupleLifecycle, int outputStoreSize) {
         super(mapStoreIndex, nextNodesTupleLifecycle, outputStoreSize);
         this.mappingFunction = Objects.requireNonNull(mappingFunction);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/UnindexedIfExistsBiNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/UnindexedIfExistsBiNode.java
similarity index 72%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/UnindexedIfExistsBiNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/UnindexedIfExistsBiNode.java
index 56266da801..7316766738 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/UnindexedIfExistsBiNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/UnindexedIfExistsBiNode.java
@@ -1,12 +1,12 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.bi;
+package ai.timefold.solver.core.impl.bavet.bi;
 
 import ai.timefold.solver.core.api.function.TriPredicate;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractUnindexedIfExistsNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.common.AbstractUnindexedIfExistsNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 
-final class UnindexedIfExistsBiNode<A, B, C> extends AbstractUnindexedIfExistsNode<BiTuple<A, B>, C> {
+public final class UnindexedIfExistsBiNode<A, B, C> extends AbstractUnindexedIfExistsNode<BiTuple<A, B>, C> {
 
     private final TriPredicate<A, B, C> filtering;
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/UnindexedJoinBiNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/UnindexedJoinBiNode.java
similarity index 79%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/UnindexedJoinBiNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/UnindexedJoinBiNode.java
index 1e572325d6..ebd0cd9c72 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/UnindexedJoinBiNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/bi/UnindexedJoinBiNode.java
@@ -1,13 +1,13 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.bi;
+package ai.timefold.solver.core.impl.bavet.bi;
 
 import java.util.function.BiPredicate;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractUnindexedJoinNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.common.AbstractUnindexedJoinNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 
-final class UnindexedJoinBiNode<A, B>
+public final class UnindexedJoinBiNode<A, B>
         extends AbstractUnindexedJoinNode<UniTuple<A>, B, BiTuple<A, B>> {
 
     private final BiPredicate<A, B> filtering;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/AbstractConcatNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/AbstractConcatNode.java
similarity index 92%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/AbstractConcatNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/AbstractConcatNode.java
index f6307c5b23..3f470f8759 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/AbstractConcatNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/AbstractConcatNode.java
@@ -1,10 +1,10 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common;
+package ai.timefold.solver.core.impl.bavet.common;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.AbstractTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.LeftTupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.RightTupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleState;
+import ai.timefold.solver.core.impl.bavet.common.tuple.AbstractTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.LeftTupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.RightTupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleState;
 
 /**
  * Implements the concat operation. Concat cannot be implemented as a pass-through operation because of two caveats:
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/AbstractFlattenLastNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/AbstractFlattenLastNode.java
similarity index 95%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/AbstractFlattenLastNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/AbstractFlattenLastNode.java
index a6e47a4833..f9b1e7310c 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/AbstractFlattenLastNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/AbstractFlattenLastNode.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common;
+package ai.timefold.solver.core.impl.bavet.common;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -8,9 +8,9 @@
 import java.util.Objects;
 import java.util.function.Function;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.AbstractTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleState;
+import ai.timefold.solver.core.impl.bavet.common.tuple.AbstractTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleState;
 
 public abstract class AbstractFlattenLastNode<InTuple_ extends AbstractTuple, OutTuple_ extends AbstractTuple, EffectiveItem_, FlattenedItem_>
         extends AbstractNode
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/AbstractGroupNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/AbstractGroupNode.java
similarity index 97%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/AbstractGroupNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/AbstractGroupNode.java
index 84084f97bb..70683f359e 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/AbstractGroupNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/AbstractGroupNode.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common;
+package ai.timefold.solver.core.impl.bavet.common;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -7,9 +7,9 @@
 import java.util.function.Supplier;
 
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.AbstractTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleState;
+import ai.timefold.solver.core.impl.bavet.common.tuple.AbstractTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleState;
 
 public abstract class AbstractGroupNode<InTuple_ extends AbstractTuple, OutTuple_ extends AbstractTuple, GroupKey_, ResultContainer_, Result_>
         extends AbstractNode
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/AbstractIfExistsNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/AbstractIfExistsNode.java
similarity index 93%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/AbstractIfExistsNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/AbstractIfExistsNode.java
index 775055c78f..37b4b73700 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/AbstractIfExistsNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/AbstractIfExistsNode.java
@@ -1,11 +1,11 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common;
-
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.AbstractTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.LeftTupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.RightTupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleState;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+package ai.timefold.solver.core.impl.bavet.common;
+
+import ai.timefold.solver.core.impl.bavet.common.tuple.AbstractTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.LeftTupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.RightTupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleState;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 import ai.timefold.solver.core.impl.util.ElementAwareList;
 import ai.timefold.solver.core.impl.util.ElementAwareListEntry;
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/AbstractIndexedIfExistsNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/AbstractIndexedIfExistsNode.java
similarity index 94%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/AbstractIndexedIfExistsNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/AbstractIndexedIfExistsNode.java
index a6830ab0d8..a4f93e1ff9 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/AbstractIndexedIfExistsNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/AbstractIndexedIfExistsNode.java
@@ -1,14 +1,14 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common;
+package ai.timefold.solver.core.impl.bavet.common;
 
 import java.util.function.Function;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.index.IndexProperties;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.index.Indexer;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.AbstractTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.LeftTupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.RightTupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.common.index.IndexProperties;
+import ai.timefold.solver.core.impl.bavet.common.index.Indexer;
+import ai.timefold.solver.core.impl.bavet.common.tuple.AbstractTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.LeftTupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.RightTupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 import ai.timefold.solver.core.impl.util.ElementAwareList;
 import ai.timefold.solver.core.impl.util.ElementAwareListEntry;
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/AbstractIndexedJoinNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/AbstractIndexedJoinNode.java
similarity index 92%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/AbstractIndexedJoinNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/AbstractIndexedJoinNode.java
index cfa1ccc8c1..0d21a6d0d8 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/AbstractIndexedJoinNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/AbstractIndexedJoinNode.java
@@ -1,14 +1,14 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common;
+package ai.timefold.solver.core.impl.bavet.common;
 
 import java.util.function.Function;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.index.IndexProperties;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.index.Indexer;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.AbstractTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.LeftTupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.RightTupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.common.index.IndexProperties;
+import ai.timefold.solver.core.impl.bavet.common.index.Indexer;
+import ai.timefold.solver.core.impl.bavet.common.tuple.AbstractTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.LeftTupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.RightTupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 import ai.timefold.solver.core.impl.util.ElementAwareList;
 import ai.timefold.solver.core.impl.util.ElementAwareListEntry;
 
@@ -28,9 +28,6 @@ public abstract class AbstractIndexedJoinNode<LeftTuple_ extends AbstractTuple,
     private final int inputStoreIndexLeftEntry;
     private final int inputStoreIndexRightProperties;
     private final int inputStoreIndexRightEntry;
-    /**
-     * Calls for example {@link AbstractScorer#insert(AbstractTuple)} and/or ...
-     */
     private final Indexer<LeftTuple_> indexerLeft;
     private final Indexer<UniTuple<Right_>> indexerRight;
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/AbstractJoinNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/AbstractJoinNode.java
similarity index 93%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/AbstractJoinNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/AbstractJoinNode.java
index 2c9baabe9d..e4a73b837a 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/AbstractJoinNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/AbstractJoinNode.java
@@ -1,13 +1,13 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common;
+package ai.timefold.solver.core.impl.bavet.common;
 
 import java.util.function.Consumer;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.AbstractTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.LeftTupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.RightTupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleState;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.AbstractTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.LeftTupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.RightTupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleState;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 import ai.timefold.solver.core.impl.util.ElementAwareList;
 import ai.timefold.solver.core.impl.util.ElementAwareListEntry;
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/AbstractMapNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/AbstractMapNode.java
similarity index 89%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/AbstractMapNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/AbstractMapNode.java
index eb45063319..16e0cbfde7 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/AbstractMapNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/AbstractMapNode.java
@@ -1,8 +1,8 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common;
+package ai.timefold.solver.core.impl.bavet.common;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.AbstractTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleState;
+import ai.timefold.solver.core.impl.bavet.common.tuple.AbstractTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleState;
 
 public abstract class AbstractMapNode<InTuple_ extends AbstractTuple, OutTuple_ extends AbstractTuple>
         extends AbstractNode
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/AbstractNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/AbstractNode.java
similarity index 96%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/AbstractNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/AbstractNode.java
index 3fb7a0b759..f218a22520 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/AbstractNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/AbstractNode.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common;
+package ai.timefold.solver.core.impl.bavet.common;
 
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintSession;
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/NodeBuildHelper.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/AbstractNodeBuildHelper.java
similarity index 55%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/NodeBuildHelper.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/AbstractNodeBuildHelper.java
index b4663acab6..141c0f5e27 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/NodeBuildHelper.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/AbstractNodeBuildHelper.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common;
+package ai.timefold.solver.core.impl.bavet.common;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -8,30 +8,24 @@
 import java.util.Set;
 import java.util.function.Function;
 
-import ai.timefold.solver.core.api.score.Score;
-import ai.timefold.solver.core.api.score.stream.ConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.AbstractConditionalTupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.AbstractTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.LeftTupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.RightTupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.uni.AbstractForEachUniNode;
-import ai.timefold.solver.core.impl.score.stream.common.AbstractConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.common.inliner.AbstractScoreInliner;
-
-public final class NodeBuildHelper<Score_ extends Score<Score_>> {
-
-    private final Set<? extends ConstraintStream> activeStreamSet;
-    private final AbstractScoreInliner<Score_> scoreInliner;
-    private final Map<AbstractNode, BavetAbstractConstraintStream<?>> nodeCreatorMap;
-    private final Map<ConstraintStream, TupleLifecycle<? extends AbstractTuple>> tupleLifecycleMap;
-    private final Map<ConstraintStream, Integer> storeIndexMap;
+import ai.timefold.solver.core.impl.bavet.common.tuple.AbstractConditionalTupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.AbstractTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.LeftTupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.RightTupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.uni.AbstractForEachUniNode;
+
+public abstract class AbstractNodeBuildHelper<Stream_ extends BavetStream> {
+
+    private final Set<Stream_> activeStreamSet;
+    private final Map<AbstractNode, Stream_> nodeCreatorMap;
+    private final Map<Stream_, TupleLifecycle<? extends AbstractTuple>> tupleLifecycleMap;
+    private final Map<Stream_, Integer> storeIndexMap;
 
     private List<AbstractNode> reversedNodeList;
 
-    public NodeBuildHelper(Set<? extends ConstraintStream> activeStreamSet, AbstractScoreInliner<Score_> scoreInliner) {
+    public AbstractNodeBuildHelper(Set<Stream_> activeStreamSet) {
         this.activeStreamSet = activeStreamSet;
-        this.scoreInliner = scoreInliner;
         int activeStreamSetSize = activeStreamSet.size();
         this.nodeCreatorMap = new HashMap<>(Math.max(16, activeStreamSetSize));
         this.tupleLifecycleMap = new HashMap<>(Math.max(16, activeStreamSetSize));
@@ -39,19 +33,15 @@ public NodeBuildHelper(Set<? extends ConstraintStream> activeStreamSet, Abstract
         this.reversedNodeList = new ArrayList<>(activeStreamSetSize);
     }
 
-    public boolean isStreamActive(ConstraintStream stream) {
+    public boolean isStreamActive(Stream_ stream) {
         return activeStreamSet.contains(stream);
     }
 
-    public AbstractScoreInliner<Score_> getScoreInliner() {
-        return scoreInliner;
-    }
-
-    public void addNode(AbstractNode node, BavetAbstractConstraintStream<?> creator) {
+    public void addNode(AbstractNode node, Stream_ creator) {
         addNode(node, creator, creator);
     }
 
-    public void addNode(AbstractNode node, BavetAbstractConstraintStream<?> creator, BavetAbstractConstraintStream<?> parent) {
+    public void addNode(AbstractNode node, Stream_ creator, Stream_ parent) {
         reversedNodeList.add(node);
         nodeCreatorMap.put(node, creator);
         if (!(node instanceof AbstractForEachUniNode<?>)) {
@@ -62,54 +52,50 @@ public void addNode(AbstractNode node, BavetAbstractConstraintStream<?> creator,
         }
     }
 
-    public void addNode(AbstractNode node, BavetAbstractConstraintStream<?> creator,
-            BavetAbstractConstraintStream<?> leftParent,
-            BavetAbstractConstraintStream<?> rightParent) {
+    public void addNode(AbstractNode node, Stream_ creator, Stream_ leftParent, Stream_ rightParent) {
         reversedNodeList.add(node);
         nodeCreatorMap.put(node, creator);
         putInsertUpdateRetract(leftParent, TupleLifecycle.ofLeft((LeftTupleLifecycle<? extends AbstractTuple>) node));
         putInsertUpdateRetract(rightParent, TupleLifecycle.ofRight((RightTupleLifecycle<? extends AbstractTuple>) node));
     }
 
-    public <Tuple_ extends AbstractTuple> void putInsertUpdateRetract(ConstraintStream stream,
+    public <Tuple_ extends AbstractTuple> void putInsertUpdateRetract(Stream_ stream,
             TupleLifecycle<Tuple_> tupleLifecycle) {
         tupleLifecycleMap.put(stream, tupleLifecycle);
     }
 
-    public <Tuple_ extends AbstractTuple> void putInsertUpdateRetract(ConstraintStream stream,
-            List<? extends AbstractConstraintStream<?>> childStreamList,
+    public <Tuple_ extends AbstractTuple> void putInsertUpdateRetract(Stream_ stream, List<? extends Stream_> childStreamList,
             Function<TupleLifecycle<Tuple_>, AbstractConditionalTupleLifecycle<Tuple_>> tupleLifecycleFunction) {
         TupleLifecycle<Tuple_> tupleLifecycle = getAggregatedTupleLifecycle(childStreamList);
         putInsertUpdateRetract(stream, tupleLifecycleFunction.apply(tupleLifecycle));
     }
 
+    @SuppressWarnings("unchecked")
     public <Tuple_ extends AbstractTuple> TupleLifecycle<Tuple_> getAggregatedTupleLifecycle(
-            List<? extends ConstraintStream> streamList) {
-        TupleLifecycle<Tuple_>[] tupleLifecycles = streamList.stream()
+            List<? extends Stream_> streamList) {
+        var tupleLifecycles = streamList.stream()
                 .filter(this::isStreamActive)
                 .map(s -> getTupleLifecycle(s, tupleLifecycleMap))
                 .toArray(TupleLifecycle[]::new);
-        switch (tupleLifecycles.length) {
-            case 0:
-                throw new IllegalStateException("Impossible state: None of the streamList (" + streamList
-                        + ") are active.");
-            case 1:
-                return tupleLifecycles[0];
-            default:
-                return TupleLifecycle.of(tupleLifecycles);
-        }
+        return switch (tupleLifecycles.length) {
+            case 0 ->
+                throw new IllegalStateException("Impossible state: None of the streamList (" + streamList + ") are active.");
+            case 1 -> tupleLifecycles[0];
+            default -> TupleLifecycle.of(tupleLifecycles);
+        };
     }
 
-    private static <Tuple_ extends AbstractTuple> TupleLifecycle<Tuple_> getTupleLifecycle(ConstraintStream stream,
-            Map<ConstraintStream, TupleLifecycle<? extends AbstractTuple>> tupleLifecycleMap) {
-        TupleLifecycle<Tuple_> tupleLifecycle = (TupleLifecycle<Tuple_>) tupleLifecycleMap.get(stream);
+    @SuppressWarnings("unchecked")
+    private static <Stream_, Tuple_ extends AbstractTuple> TupleLifecycle<Tuple_> getTupleLifecycle(Stream_ stream,
+            Map<Stream_, TupleLifecycle<? extends AbstractTuple>> tupleLifecycleMap) {
+        var tupleLifecycle = (TupleLifecycle<Tuple_>) tupleLifecycleMap.get(stream);
         if (tupleLifecycle == null) {
             throw new IllegalStateException("Impossible state: the stream (" + stream + ") hasn't built a node yet.");
         }
         return tupleLifecycle;
     }
 
-    public int reserveTupleStoreIndex(ConstraintStream tupleSourceStream) {
+    public int reserveTupleStoreIndex(Stream_ tupleSourceStream) {
         return storeIndexMap.compute(tupleSourceStream, (k, index) -> {
             if (index == null) {
                 return 0;
@@ -122,7 +108,7 @@ public int reserveTupleStoreIndex(ConstraintStream tupleSourceStream) {
         });
     }
 
-    public int extractTupleStoreSize(ConstraintStream tupleSourceStream) {
+    public int extractTupleStoreSize(Stream_ tupleSourceStream) {
         Integer lastIndex = storeIndexMap.put(tupleSourceStream, Integer.MIN_VALUE);
         return (lastIndex == null) ? 0 : lastIndex + 1;
     }
@@ -134,17 +120,17 @@ public List<AbstractNode> destroyAndGetNodeList() {
         return nodeList;
     }
 
-    public BavetAbstractConstraintStream<?> getNodeCreatingStream(AbstractNode node) {
+    public Stream_ getNodeCreatingStream(AbstractNode node) {
         return nodeCreatorMap.get(node);
     }
 
-    public AbstractNode findParentNode(BavetAbstractConstraintStream<?> childNodeCreator) {
+    public AbstractNode findParentNode(Stream_ childNodeCreator) {
         if (childNodeCreator == null) { // We've recursed to the bottom without finding a parent node.
             throw new IllegalStateException(
                     "Impossible state: node-creating stream (" + childNodeCreator + ") has no parent node.");
         }
         // Look the stream up among node creators and if found, the node is the parent node.
-        for (Map.Entry<AbstractNode, BavetAbstractConstraintStream<?>> entry : this.nodeCreatorMap.entrySet()) {
+        for (Map.Entry<AbstractNode, Stream_> entry : this.nodeCreatorMap.entrySet()) {
             if (entry.getValue() == childNodeCreator) {
                 return entry.getKey();
             }
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/AbstractPropagationMetadataCarrier.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/AbstractPropagationMetadataCarrier.java
similarity index 69%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/AbstractPropagationMetadataCarrier.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/AbstractPropagationMetadataCarrier.java
index ce7d115c9a..32b0116738 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/AbstractPropagationMetadataCarrier.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/AbstractPropagationMetadataCarrier.java
@@ -1,7 +1,7 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common;
+package ai.timefold.solver.core.impl.bavet.common;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.AbstractTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleState;
+import ai.timefold.solver.core.impl.bavet.common.tuple.AbstractTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleState;
 
 /**
  * {@link DynamicPropagationQueue} requires the items it carries to extend this class,
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/AbstractUnindexedIfExistsNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/AbstractUnindexedIfExistsNode.java
similarity index 93%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/AbstractUnindexedIfExistsNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/AbstractUnindexedIfExistsNode.java
index da48361acb..05c00744bd 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/AbstractUnindexedIfExistsNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/AbstractUnindexedIfExistsNode.java
@@ -1,10 +1,10 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common;
+package ai.timefold.solver.core.impl.bavet.common;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.AbstractTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.LeftTupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.RightTupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.AbstractTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.LeftTupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.RightTupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 import ai.timefold.solver.core.impl.util.ElementAwareList;
 import ai.timefold.solver.core.impl.util.ElementAwareListEntry;
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/AbstractUnindexedJoinNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/AbstractUnindexedJoinNode.java
similarity index 91%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/AbstractUnindexedJoinNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/AbstractUnindexedJoinNode.java
index c2e447e066..29970a1e69 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/AbstractUnindexedJoinNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/AbstractUnindexedJoinNode.java
@@ -1,10 +1,10 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common;
+package ai.timefold.solver.core.impl.bavet.common;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.AbstractTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.LeftTupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.RightTupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.AbstractTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.LeftTupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.RightTupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 import ai.timefold.solver.core.impl.util.ElementAwareList;
 import ai.timefold.solver.core.impl.util.ElementAwareListEntry;
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/BavetStream.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/BavetStream.java
new file mode 100644
index 0000000000..5866eefdb8
--- /dev/null
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/BavetStream.java
@@ -0,0 +1,7 @@
+package ai.timefold.solver.core.impl.bavet.common;
+
+public interface BavetStream {
+
+    <Stream_> Stream_ getParent();
+
+}
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/BavetStreamBinaryOperation.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/BavetStreamBinaryOperation.java
new file mode 100644
index 0000000000..592af1c7bc
--- /dev/null
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/BavetStreamBinaryOperation.java
@@ -0,0 +1,15 @@
+package ai.timefold.solver.core.impl.bavet.common;
+
+public interface BavetStreamBinaryOperation<Stream_ extends BavetStream> {
+
+    /**
+     * @return An instance of fore bridge.
+     */
+    Stream_ getLeftParent();
+
+    /**
+     * @return An instance of fore bridge.
+     */
+    Stream_ getRightParent();
+
+}
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/DynamicPropagationQueue.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/DynamicPropagationQueue.java
similarity index 96%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/DynamicPropagationQueue.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/DynamicPropagationQueue.java
index ed08103e81..2554b4e5cb 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/DynamicPropagationQueue.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/DynamicPropagationQueue.java
@@ -1,13 +1,13 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common;
+package ai.timefold.solver.core.impl.bavet.common;
 
 import java.util.ArrayList;
 import java.util.BitSet;
 import java.util.List;
 import java.util.function.Consumer;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.AbstractTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleState;
+import ai.timefold.solver.core.impl.bavet.common.tuple.AbstractTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleState;
 
 /**
  * This implementation has the capability to move tuples between the individual propagation queues.
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/ExistsCounter.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/ExistsCounter.java
similarity index 75%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/ExistsCounter.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/ExistsCounter.java
index 43ff7f0f6c..a47bdd2910 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/ExistsCounter.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/ExistsCounter.java
@@ -1,7 +1,7 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common;
+package ai.timefold.solver.core.impl.bavet.common;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.AbstractTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleState;
+import ai.timefold.solver.core.impl.bavet.common.tuple.AbstractTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleState;
 
 public final class ExistsCounter<Tuple_ extends AbstractTuple>
         extends AbstractPropagationMetadataCarrier<Tuple_> {
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/Group.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/Group.java
similarity index 92%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/Group.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/Group.java
index cbe02c73bd..dd2c33affa 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/Group.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/Group.java
@@ -1,7 +1,7 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common;
+package ai.timefold.solver.core.impl.bavet.common;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.AbstractTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleState;
+import ai.timefold.solver.core.impl.bavet.common.tuple.AbstractTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleState;
 
 final class Group<OutTuple_ extends AbstractTuple, ResultContainer_>
         extends AbstractPropagationMetadataCarrier<OutTuple_> {
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/GroupNodeConstructor.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/GroupNodeConstructor.java
similarity index 90%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/GroupNodeConstructor.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/GroupNodeConstructor.java
index 3722e6f613..bbe8b66f35 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/GroupNodeConstructor.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/GroupNodeConstructor.java
@@ -1,17 +1,16 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common;
+package ai.timefold.solver.core.impl.bavet.common;
 
 import java.util.List;
 
-import ai.timefold.solver.core.api.score.Score;
-import ai.timefold.solver.core.api.score.stream.ConstraintStream;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.AbstractTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.AbstractTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 import ai.timefold.solver.core.impl.util.Pair;
 import ai.timefold.solver.core.impl.util.Quadruple;
 import ai.timefold.solver.core.impl.util.Triple;
 
-public interface GroupNodeConstructor<Tuple_ extends AbstractTuple> {
+public sealed interface GroupNodeConstructor<Tuple_ extends AbstractTuple>
+        permits GroupNodeConstructorWithAccumulate, GroupNodeConstructorWithoutAccumulate {
     // Although Tuple_ is unused in GroupNodeConstructor,
     // it is used in its two implementations: GroupNodeConstructorWithAccumulate
     // and GroupNodeConstructorWithoutAccumulate. The Tuple_ here serves as a type hint
@@ -57,7 +56,7 @@ public interface GroupNodeConstructor<Tuple_ extends AbstractTuple> {
             zeroKeysGroupBy(CollectorA_ collectorA, CollectorB_ collectorB, CollectorC_ collectorC,
                     GroupBy0Mapping3CollectorNodeBuilder<CollectorA_, CollectorB_, CollectorC_, Tuple_> builder) {
         return new GroupNodeConstructorWithAccumulate<>(
-                new Triple<CollectorA_, CollectorB_, CollectorC_>(collectorA, collectorB, collectorC),
+                new Triple<>(collectorA, collectorB, collectorC),
                 (groupStoreIndex, undoStoreIndex, nextNodesTupleLifecycle, outputStoreSize, environmentMode) -> builder.build(
                         groupStoreIndex, undoStoreIndex, collectorA, collectorB, collectorC,
                         nextNodesTupleLifecycle, outputStoreSize, environmentMode));
@@ -67,7 +66,7 @@ public interface GroupNodeConstructor<Tuple_ extends AbstractTuple> {
             zeroKeysGroupBy(CollectorA_ collectorA, CollectorB_ collectorB, CollectorC_ collectorC, CollectorD_ collectorD,
                     GroupBy0Mapping4CollectorNodeBuilder<CollectorA_, CollectorB_, CollectorC_, CollectorD_, Tuple_> builder) {
         return new GroupNodeConstructorWithAccumulate<>(
-                new Quadruple<CollectorA_, CollectorB_, CollectorC_, CollectorD_>(collectorA, collectorB, collectorC,
+                new Quadruple<>(collectorA, collectorB, collectorC,
                         collectorD),
                 (groupStoreIndex, undoStoreIndex, nextNodesTupleLifecycle, outputStoreSize, environmentMode) -> builder.build(
                         groupStoreIndex, undoStoreIndex, collectorA, collectorB, collectorC, collectorD,
@@ -94,7 +93,7 @@ public interface GroupNodeConstructor<Tuple_ extends AbstractTuple> {
             oneKeyGroupBy(KeyA_ keyMappingA, CollectorB_ collectorB, CollectorC_ collectorC,
                     GroupBy1Mapping2CollectorNodeBuilder<KeyA_, CollectorB_, CollectorC_, Tuple_> builder) {
         return new GroupNodeConstructorWithAccumulate<>(
-                new Triple<KeyA_, CollectorB_, CollectorC_>(keyMappingA, collectorB, collectorC),
+                new Triple<>(keyMappingA, collectorB, collectorC),
                 (groupStoreIndex, undoStoreIndex, nextNodesTupleLifecycle, outputStoreSize, environmentMode) -> builder.build(
                         keyMappingA, groupStoreIndex, undoStoreIndex, collectorB, collectorC,
                         nextNodesTupleLifecycle,
@@ -105,7 +104,7 @@ public interface GroupNodeConstructor<Tuple_ extends AbstractTuple> {
             oneKeyGroupBy(KeyA_ keyMappingA, CollectorB_ collectorB, CollectorC_ collectorC, CollectorD_ collectorD,
                     GroupBy1Mapping3CollectorNodeBuilder<KeyA_, CollectorB_, CollectorC_, CollectorD_, Tuple_> builder) {
         return new GroupNodeConstructorWithAccumulate<>(
-                new Quadruple<KeyA_, CollectorB_, CollectorC_, CollectorD_>(keyMappingA, collectorB, collectorC, collectorD),
+                new Quadruple<>(keyMappingA, collectorB, collectorC, collectorD),
                 (groupStoreIndex, undoStoreIndex, nextNodesTupleLifecycle, outputStoreSize, environmentMode) -> builder.build(
                         keyMappingA, groupStoreIndex, undoStoreIndex, collectorB, collectorC, collectorD,
                         nextNodesTupleLifecycle,
@@ -125,7 +124,7 @@ public interface GroupNodeConstructor<Tuple_ extends AbstractTuple> {
             twoKeysGroupBy(KeyA_ keyMappingA, KeyB_ keyMappingB, CollectorC_ collectorC,
                     GroupBy2Mapping1CollectorNodeBuilder<KeyA_, KeyB_, CollectorC_, Tuple_> builder) {
         return new GroupNodeConstructorWithAccumulate<>(
-                new Triple<KeyA_, KeyB_, CollectorC_>(keyMappingA, keyMappingB, collectorC),
+                new Triple<>(keyMappingA, keyMappingB, collectorC),
                 (groupStoreIndex, undoStoreIndex, nextNodesTupleLifecycle, outputStoreSize, environmentMode) -> builder.build(
                         keyMappingA, keyMappingB, groupStoreIndex, undoStoreIndex, collectorC,
                         nextNodesTupleLifecycle,
@@ -136,7 +135,7 @@ public interface GroupNodeConstructor<Tuple_ extends AbstractTuple> {
             twoKeysGroupBy(KeyA_ keyMappingA, KeyB_ keyMappingB, CollectorC_ collectorC, CollectorD_ collectorD,
                     GroupBy2Mapping2CollectorNodeBuilder<KeyA_, KeyB_, CollectorC_, CollectorD_, Tuple_> builder) {
         return new GroupNodeConstructorWithAccumulate<>(
-                new Quadruple<KeyA_, KeyB_, CollectorC_, CollectorD_>(keyMappingA, keyMappingB, collectorC, collectorD),
+                new Quadruple<>(keyMappingA, keyMappingB, collectorC, collectorD),
                 (groupStoreIndex, undoStoreIndex, nextNodesTupleLifecycle, outputStoreSize, environmentMode) -> builder.build(
                         keyMappingA, keyMappingB, groupStoreIndex, undoStoreIndex, collectorC, collectorD,
                         nextNodesTupleLifecycle,
@@ -147,7 +146,7 @@ public interface GroupNodeConstructor<Tuple_ extends AbstractTuple> {
             threeKeysGroupBy(KeyA_ keyMappingA, KeyB_ keyMappingB, KeyC_ keyMappingC,
                     GroupBy3Mapping0CollectorNodeBuilder<KeyA_, KeyB_, KeyC_, Tuple_> builder) {
         return new GroupNodeConstructorWithoutAccumulate<>(
-                new Triple<KeyA_, KeyB_, KeyC_>(keyMappingA, keyMappingB, keyMappingC),
+                new Triple<>(keyMappingA, keyMappingB, keyMappingC),
                 (groupStoreIndex, nextNodesTupleLifecycle, outputStoreSize, environmentMode) -> builder.build(keyMappingA,
                         keyMappingB, keyMappingC, groupStoreIndex, nextNodesTupleLifecycle,
                         outputStoreSize, environmentMode));
@@ -157,7 +156,7 @@ public interface GroupNodeConstructor<Tuple_ extends AbstractTuple> {
             threeKeysGroupBy(KeyA_ keyMappingA, KeyB_ keyMappingB, KeyC_ keyMappingC, CollectorD_ collectorD,
                     GroupBy3Mapping1CollectorNodeBuilder<KeyA_, KeyB_, KeyC_, CollectorD_, Tuple_> builder) {
         return new GroupNodeConstructorWithAccumulate<>(
-                new Quadruple<KeyA_, KeyB_, KeyC_, CollectorD_>(keyMappingA, keyMappingB, keyMappingC, collectorD),
+                new Quadruple<>(keyMappingA, keyMappingB, keyMappingC, collectorD),
                 (groupStoreIndex, undoStoreIndex, nextNodesTupleLifecycle, outputStoreSize, environmentMode) -> builder.build(
                         keyMappingA, keyMappingB, keyMappingC, groupStoreIndex, undoStoreIndex, collectorD,
                         nextNodesTupleLifecycle,
@@ -168,7 +167,7 @@ public interface GroupNodeConstructor<Tuple_ extends AbstractTuple> {
             fourKeysGroupBy(KeyA_ keyMappingA, KeyB_ keyMappingB, KeyC_ keyMappingC, KeyD_ keyMappingD,
                     GroupBy4Mapping0CollectorNodeBuilder<KeyA_, KeyB_, KeyC_, KeyD_, Tuple_> builder) {
         return new GroupNodeConstructorWithoutAccumulate<>(
-                new Quadruple<KeyA_, KeyB_, KeyC_, KeyD_>(keyMappingA, keyMappingB, keyMappingC, keyMappingD),
+                new Quadruple<>(keyMappingA, keyMappingB, keyMappingC, keyMappingD),
                 (groupStoreIndex, nextNodesTupleLifecycle, outputStoreSize, environmentMode) -> builder.build(keyMappingA,
                         keyMappingB, keyMappingC, keyMappingD, groupStoreIndex,
                         nextNodesTupleLifecycle, outputStoreSize, environmentMode));
@@ -312,10 +311,8 @@ AbstractNode build(KeyA_ keyMappingA,
                 TupleLifecycle<Tuple_> nextNodesTupleLifecycle, int outputStoreSize, EnvironmentMode environmentMode);
     }
 
-    <Solution_, Score_ extends Score<Score_>> void build(NodeBuildHelper<Score_> buildHelper,
-            BavetAbstractConstraintStream<Solution_> parentTupleSource,
-            BavetAbstractConstraintStream<Solution_> aftStream, List<? extends ConstraintStream> aftStreamChildList,
-            BavetAbstractConstraintStream<Solution_> thisStream,
-            List<? extends ConstraintStream> thisStreamChildList, EnvironmentMode environmentMode);
+    <Stream_ extends BavetStream> void build(AbstractNodeBuildHelper<Stream_> buildHelper, Stream_ parentTupleSource,
+            Stream_ aftStream, List<Stream_> aftStreamChildList, Stream_ thisStream, List<Stream_> thisStreamChildList,
+            EnvironmentMode environmentMode);
 
 }
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/GroupNodeConstructorWithAccumulate.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/GroupNodeConstructorWithAccumulate.java
similarity index 61%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/GroupNodeConstructorWithAccumulate.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/GroupNodeConstructorWithAccumulate.java
index 79529d91d9..8ea0e87de2 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/GroupNodeConstructorWithAccumulate.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/GroupNodeConstructorWithAccumulate.java
@@ -1,13 +1,11 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common;
+package ai.timefold.solver.core.impl.bavet.common;
 
 import java.util.List;
 import java.util.Objects;
 
-import ai.timefold.solver.core.api.score.Score;
-import ai.timefold.solver.core.api.score.stream.ConstraintStream;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.AbstractTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.AbstractTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 
 final class GroupNodeConstructorWithAccumulate<Tuple_ extends AbstractTuple> implements GroupNodeConstructor<Tuple_> {
 
@@ -21,19 +19,17 @@ public GroupNodeConstructorWithAccumulate(Object equalityKey,
     }
 
     @Override
-    public <Solution_, Score_ extends Score<Score_>> void build(NodeBuildHelper<Score_> buildHelper,
-            BavetAbstractConstraintStream<Solution_> parentTupleSource,
-            BavetAbstractConstraintStream<Solution_> aftStream, List<? extends ConstraintStream> aftStreamChildList,
-            BavetAbstractConstraintStream<Solution_> bridgeStream, List<? extends ConstraintStream> bridgeStreamChildList,
+    public <Stream_ extends BavetStream> void build(AbstractNodeBuildHelper<Stream_> buildHelper, Stream_ parentTupleSource,
+            Stream_ aftStream, List<Stream_> aftStreamChildList, Stream_ bridgeStream, List<Stream_> bridgeStreamChildList,
             EnvironmentMode environmentMode) {
         if (!bridgeStreamChildList.isEmpty()) {
             throw new IllegalStateException("Impossible state: the stream (" + bridgeStream
                     + ") has an non-empty childStreamList (" + bridgeStreamChildList + ") but it's a groupBy bridge.");
         }
-        int groupStoreIndex = buildHelper.reserveTupleStoreIndex(parentTupleSource);
-        int undoStoreIndex = buildHelper.reserveTupleStoreIndex(parentTupleSource);
+        var groupStoreIndex = buildHelper.reserveTupleStoreIndex(parentTupleSource);
+        var undoStoreIndex = buildHelper.reserveTupleStoreIndex(parentTupleSource);
         TupleLifecycle<Tuple_> tupleLifecycle = buildHelper.getAggregatedTupleLifecycle(aftStreamChildList);
-        int outputStoreSize = buildHelper.extractTupleStoreSize(aftStream);
+        var outputStoreSize = buildHelper.extractTupleStoreSize(aftStream);
         var node = nodeConstructorFunction.apply(groupStoreIndex, undoStoreIndex, tupleLifecycle, outputStoreSize,
                 environmentMode);
         buildHelper.addNode(node, bridgeStream);
@@ -45,7 +41,7 @@ public boolean equals(Object object) {
             return true;
         if (object == null || getClass() != object.getClass())
             return false;
-        GroupNodeConstructorWithAccumulate<?> that = (GroupNodeConstructorWithAccumulate<?>) object;
+        var that = (GroupNodeConstructorWithAccumulate<?>) object;
         return Objects.equals(equalityKey, that.equalityKey);
     }
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/GroupNodeConstructorWithoutAccumulate.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/GroupNodeConstructorWithoutAccumulate.java
similarity index 62%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/GroupNodeConstructorWithoutAccumulate.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/GroupNodeConstructorWithoutAccumulate.java
index b2f5783f72..4a462d0715 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/GroupNodeConstructorWithoutAccumulate.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/GroupNodeConstructorWithoutAccumulate.java
@@ -1,13 +1,11 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common;
+package ai.timefold.solver.core.impl.bavet.common;
 
 import java.util.List;
 import java.util.Objects;
 
-import ai.timefold.solver.core.api.score.Score;
-import ai.timefold.solver.core.api.score.stream.ConstraintStream;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.AbstractTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.AbstractTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 
 final class GroupNodeConstructorWithoutAccumulate<Tuple_ extends AbstractTuple> implements GroupNodeConstructor<Tuple_> {
 
@@ -21,18 +19,16 @@ public GroupNodeConstructorWithoutAccumulate(Object equalityKey,
     }
 
     @Override
-    public <Solution_, Score_ extends Score<Score_>> void build(NodeBuildHelper<Score_> buildHelper,
-            BavetAbstractConstraintStream<Solution_> parentTupleSource,
-            BavetAbstractConstraintStream<Solution_> aftStream, List<? extends ConstraintStream> aftStreamChildList,
-            BavetAbstractConstraintStream<Solution_> bridgeStream, List<? extends ConstraintStream> bridgeStreamChildList,
+    public <Stream_ extends BavetStream> void build(AbstractNodeBuildHelper<Stream_> buildHelper, Stream_ parentTupleSource,
+            Stream_ aftStream, List<Stream_> aftStreamChildList, Stream_ bridgeStream, List<Stream_> bridgeStreamChildList,
             EnvironmentMode environmentMode) {
         if (!bridgeStreamChildList.isEmpty()) {
             throw new IllegalStateException("Impossible state: the stream (" + bridgeStream
                     + ") has an non-empty childStreamList (" + bridgeStreamChildList + ") but it's a groupBy bridge.");
         }
-        int groupStoreIndex = buildHelper.reserveTupleStoreIndex(parentTupleSource);
+        var groupStoreIndex = buildHelper.reserveTupleStoreIndex(parentTupleSource);
         TupleLifecycle<Tuple_> tupleLifecycle = buildHelper.getAggregatedTupleLifecycle(aftStreamChildList);
-        int outputStoreSize = buildHelper.extractTupleStoreSize(aftStream);
+        var outputStoreSize = buildHelper.extractTupleStoreSize(aftStream);
         var node = nodeConstructorFunction.apply(groupStoreIndex, tupleLifecycle, outputStoreSize, environmentMode);
         buildHelper.addNode(node, bridgeStream);
     }
@@ -43,7 +39,7 @@ public boolean equals(Object object) {
             return true;
         if (object == null || getClass() != object.getClass())
             return false;
-        GroupNodeConstructorWithoutAccumulate<?> that = (GroupNodeConstructorWithoutAccumulate<?>) object;
+        var that = (GroupNodeConstructorWithoutAccumulate<?>) object;
         return Objects.equals(equalityKey, that.equalityKey);
     }
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/PropagationQueue.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/PropagationQueue.java
similarity index 91%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/PropagationQueue.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/PropagationQueue.java
index 4d0d38d998..695661e0ac 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/PropagationQueue.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/PropagationQueue.java
@@ -1,6 +1,6 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common;
+package ai.timefold.solver.core.impl.bavet.common;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleState;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleState;
 
 /**
  * A propagation queue is an ordered collection of items that need to be sent to the next node.
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/Propagator.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/Propagator.java
similarity index 98%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/Propagator.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/Propagator.java
index b18d1d92b4..ba0dfd9fe7 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/Propagator.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/Propagator.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common;
+package ai.timefold.solver.core.impl.bavet.common;
 
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintSession;
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/StaticPropagationQueue.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/StaticPropagationQueue.java
similarity index 93%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/StaticPropagationQueue.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/StaticPropagationQueue.java
index 05012d74ef..f43ed6a96c 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/StaticPropagationQueue.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/StaticPropagationQueue.java
@@ -1,12 +1,12 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common;
+package ai.timefold.solver.core.impl.bavet.common;
 
 import java.util.ArrayDeque;
 import java.util.Deque;
 import java.util.function.Consumer;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.AbstractTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleState;
+import ai.timefold.solver.core.impl.bavet.common.tuple.AbstractTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleState;
 
 /**
  * The implementation moves tuples directly into an either retract, update or insert queue,
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/TupleSource.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/TupleSource.java
new file mode 100644
index 0000000000..b2324c5f26
--- /dev/null
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/TupleSource.java
@@ -0,0 +1,4 @@
+package ai.timefold.solver.core.impl.bavet.common;
+
+public interface TupleSource {
+}
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/ComparisonIndexer.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/ComparisonIndexer.java
similarity index 98%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/ComparisonIndexer.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/ComparisonIndexer.java
index f5db0db071..1706a39b9d 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/ComparisonIndexer.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/ComparisonIndexer.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common.index;
+package ai.timefold.solver.core.impl.bavet.common.index;
 
 import java.util.Comparator;
 import java.util.Map;
@@ -8,7 +8,7 @@
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
-import ai.timefold.solver.core.impl.score.stream.JoinerType;
+import ai.timefold.solver.core.impl.bavet.common.index.joiner.JoinerType;
 import ai.timefold.solver.core.impl.util.ElementAwareListEntry;
 
 final class ComparisonIndexer<T, Key_ extends Comparable<Key_>>
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/EqualsIndexer.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/EqualsIndexer.java
similarity index 97%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/EqualsIndexer.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/EqualsIndexer.java
index d9e9bc20d1..df1b2d9332 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/EqualsIndexer.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/EqualsIndexer.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common.index;
+package ai.timefold.solver.core.impl.bavet.common.index;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/IndexProperties.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/IndexProperties.java
similarity index 92%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/IndexProperties.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/IndexProperties.java
index 2da212869c..fab4c43fc1 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/IndexProperties.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/IndexProperties.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common.index;
+package ai.timefold.solver.core.impl.bavet.common.index;
 
 /**
  * Cached in tuples; each tuple carries its unique instance.
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/Indexer.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/Indexer.java
similarity index 90%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/Indexer.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/Indexer.java
index 1c90af0781..97932d6a82 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/Indexer.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/Indexer.java
@@ -1,8 +1,8 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common.index;
+package ai.timefold.solver.core.impl.bavet.common.index;
 
 import java.util.function.Consumer;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleState;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleState;
 import ai.timefold.solver.core.impl.util.ElementAwareListEntry;
 
 /**
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/IndexerFactory.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/IndexerFactory.java
similarity index 74%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/IndexerFactory.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/IndexerFactory.java
index 31b18a762f..67a5b5cfcd 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/IndexerFactory.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/IndexerFactory.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common.index;
+package ai.timefold.solver.core.impl.bavet.common.index;
 
 import java.util.ArrayList;
 import java.util.NavigableMap;
@@ -9,14 +9,14 @@
 
 import ai.timefold.solver.core.api.function.QuadFunction;
 import ai.timefold.solver.core.api.function.TriFunction;
-import ai.timefold.solver.core.impl.score.stream.JoinerType;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.AbstractTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.common.AbstractJoiner;
-import ai.timefold.solver.core.impl.score.stream.common.bi.DefaultBiJoiner;
-import ai.timefold.solver.core.impl.score.stream.common.penta.DefaultPentaJoiner;
-import ai.timefold.solver.core.impl.score.stream.common.quad.DefaultQuadJoiner;
-import ai.timefold.solver.core.impl.score.stream.common.tri.DefaultTriJoiner;
+import ai.timefold.solver.core.impl.bavet.common.index.joiner.AbstractJoiner;
+import ai.timefold.solver.core.impl.bavet.common.index.joiner.DefaultBiJoiner;
+import ai.timefold.solver.core.impl.bavet.common.index.joiner.DefaultPentaJoiner;
+import ai.timefold.solver.core.impl.bavet.common.index.joiner.DefaultQuadJoiner;
+import ai.timefold.solver.core.impl.bavet.common.index.joiner.DefaultTriJoiner;
+import ai.timefold.solver.core.impl.bavet.common.index.joiner.JoinerType;
+import ai.timefold.solver.core.impl.bavet.common.tuple.AbstractTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
 import ai.timefold.solver.core.impl.util.Pair;
 import ai.timefold.solver.core.impl.util.Quadruple;
 import ai.timefold.solver.core.impl.util.Triple;
@@ -24,32 +24,27 @@
 /**
  * {@link Indexer Indexers} form a parent-child hierarchy,
  * each child has exactly one parent.
- * {@link ai.timefold.solver.core.impl.score.stream.bavet.common.index.NoneIndexer} is always at the bottom of the hierarchy,
+ * {@link NoneIndexer} is always at the bottom of the hierarchy,
  * never a parent unless it is the only indexer.
  * Parent indexers delegate to their children,
- * until they reach the ultimate {@link ai.timefold.solver.core.impl.score.stream.bavet.common.index.NoneIndexer}.
+ * until they reach the ultimate {@link NoneIndexer}.
  * <p>
  * Example 1: EQUAL+LESS_THAN joiner will become EqualsIndexer -> ComparisonIndexer -> NoneIndexer.
  * <p>
  * Indexers have an id, which is the position of the indexer in the chain.
  * Top-most indexer has id 0, and the id increases as we go down the hierarchy.
- * Each {@link AbstractTuple tuple} is assigned an
- * {@link ai.timefold.solver.core.impl.score.stream.bavet.common.index.IndexProperties} instance,
+ * Each {@link AbstractTuple tuple} is assigned an {@link IndexProperties} instance,
  * which determines its location in the index.
- * {@link ai.timefold.solver.core.impl.score.stream.bavet.common.index.IndexProperties} instances are built from
- * {@link AbstractJoiner joiners}
+ * {@link IndexProperties} instances are built from {@link AbstractJoiner joiners}
  * using methods such as {@link #buildUniLeftMapping()} and {@link #buildRightMapping()}.
- * Each {@link ai.timefold.solver.core.impl.score.stream.bavet.common.index.IndexProperties#toKey(int) index keyFunction} has an
- * id,
+ * Each {@link IndexProperties#toKey(int) index keyFunction} has an id,
  * and this id matches the id of the indexer;
- * each keyFunction in {@link ai.timefold.solver.core.impl.score.stream.bavet.common.index.IndexProperties} is associated with a
- * single indexer.
+ * each keyFunction in {@link IndexProperties} is associated with a single indexer.
  * <p>
  * Comparison joiners result in a single indexer each,
  * whereas equal joiners will be merged into a single indexer if they are consecutive.
  * In the latter case,
- * a composite keyFunction is created of type {@link Pair}, {@link TriTuple},
- * {@link Quadruple} or {@link ai.timefold.solver.core.impl.score.stream.bavet.common.index.IndexerKey},
+ * a composite keyFunction is created of type {@link Pair}, {@link TriTuple}, {@link Quadruple} or {@link IndexerKey},
  * based on the length of the composite keyFunction (number of equals joiners in sequence).
  *
  * <ul>
@@ -95,15 +90,14 @@ public boolean hasJoiners() {
         return joiner.getJoinerCount() > 0;
     }
 
-    public <A> Function<A, ai.timefold.solver.core.impl.score.stream.bavet.common.index.IndexProperties> buildUniLeftMapping() {
+    public <A> Function<A, IndexProperties> buildUniLeftMapping() {
         var joinerCount = joiner.getJoinerCount();
         var castJoiner = (DefaultBiJoiner<A, Right_>) joiner;
         return switch (joinerCount) {
             case 0 -> a -> NoneIndexProperties.INSTANCE;
             case 1 -> {
                 var mapping = castJoiner.getLeftMapping(0);
-                yield a -> new ai.timefold.solver.core.impl.score.stream.bavet.common.index.SingleIndexProperties<>(
-                        mapping.apply(a));
+                yield a -> new SingleIndexProperties<>(mapping.apply(a));
             }
             default -> {
                 var startIndexInclusive = 0;
@@ -145,7 +139,7 @@ public <A> Function<A, ai.timefold.solver.core.impl.score.stream.bavet.common.in
                                 for (int i = 0; i < mappingCount; i++) {
                                     result[i] = mappings[i].apply(a);
                                 }
-                                return new ai.timefold.solver.core.impl.score.stream.bavet.common.index.IndexerKey(result);
+                                return new IndexerKey(result);
                             };
                         }
                     };
@@ -156,21 +150,18 @@ public <A> Function<A, ai.timefold.solver.core.impl.score.stream.bavet.common.in
                 switch (keyFunctionCount) {
                     case 1 -> {
                         var keyFunction = keyFunctionList.get(0);
-                        yield a -> new ai.timefold.solver.core.impl.score.stream.bavet.common.index.SingleIndexProperties<>(
-                                keyFunction.apply(a));
+                        yield a -> new SingleIndexProperties<>(keyFunction.apply(a));
                     }
                     case 2 -> {
                         var keyFunction1 = keyFunctionList.get(0);
                         var keyFunction2 = keyFunctionList.get(1);
-                        yield a -> new ai.timefold.solver.core.impl.score.stream.bavet.common.index.TwoIndexProperties<>(
-                                keyFunction1.apply(a), keyFunction2.apply(a));
+                        yield a -> new TwoIndexProperties<>(keyFunction1.apply(a), keyFunction2.apply(a));
                     }
                     case 3 -> {
                         var keyFunction1 = keyFunctionList.get(0);
                         var keyFunction2 = keyFunctionList.get(1);
                         var keyFunction3 = keyFunctionList.get(2);
-                        yield a -> new ai.timefold.solver.core.impl.score.stream.bavet.common.index.ThreeIndexProperties<>(
-                                keyFunction1.apply(a), keyFunction2.apply(a),
+                        yield a -> new ThreeIndexProperties<>(keyFunction1.apply(a), keyFunction2.apply(a),
                                 keyFunction3.apply(a));
                     }
                     default -> {
@@ -179,7 +170,7 @@ public <A> Function<A, ai.timefold.solver.core.impl.score.stream.bavet.common.in
                             for (int i = 0; i < keyFunctionCount; i++) {
                                 arr[i] = keyFunctionList.get(i).apply(a);
                             }
-                            return new ai.timefold.solver.core.impl.score.stream.bavet.common.index.ManyIndexProperties(arr);
+                            return new ManyIndexProperties(arr);
                         };
                     }
                 }
@@ -187,16 +178,14 @@ public <A> Function<A, ai.timefold.solver.core.impl.score.stream.bavet.common.in
         };
     }
 
-    public <A, B> BiFunction<A, B, ai.timefold.solver.core.impl.score.stream.bavet.common.index.IndexProperties>
-            buildBiLeftMapping() {
+    public <A, B> BiFunction<A, B, IndexProperties> buildBiLeftMapping() {
         var joinerCount = joiner.getJoinerCount();
         var castJoiner = (DefaultTriJoiner<A, B, Right_>) joiner;
         return switch (joinerCount) {
             case 0 -> (a, b) -> NoneIndexProperties.INSTANCE;
             case 1 -> {
                 var mapping = castJoiner.getLeftMapping(0);
-                yield (a, b) -> new ai.timefold.solver.core.impl.score.stream.bavet.common.index.SingleIndexProperties<>(
-                        mapping.apply(a, b));
+                yield (a, b) -> new SingleIndexProperties<>(mapping.apply(a, b));
             }
             default -> {
                 var startIndexInclusive = 0;
@@ -238,7 +227,7 @@ public <A> Function<A, ai.timefold.solver.core.impl.score.stream.bavet.common.in
                                 for (int i = 0; i < mappingCount; i++) {
                                     result[i] = mappings[i].apply(a, b);
                                 }
-                                return new ai.timefold.solver.core.impl.score.stream.bavet.common.index.IndexerKey(result);
+                                return new IndexerKey(result);
                             };
                         }
                     };
@@ -249,22 +238,18 @@ public <A> Function<A, ai.timefold.solver.core.impl.score.stream.bavet.common.in
                 switch (keyFunctionCount) {
                     case 1 -> {
                         var keyFunction = keyFunctionList.get(0);
-                        yield (a,
-                                b) -> new ai.timefold.solver.core.impl.score.stream.bavet.common.index.SingleIndexProperties<>(
-                                        keyFunction.apply(a, b));
+                        yield (a, b) -> new SingleIndexProperties<>(keyFunction.apply(a, b));
                     }
                     case 2 -> {
                         var keyFunction1 = keyFunctionList.get(0);
                         var keyFunction2 = keyFunctionList.get(1);
-                        yield (a, b) -> new ai.timefold.solver.core.impl.score.stream.bavet.common.index.TwoIndexProperties<>(
-                                keyFunction1.apply(a, b), keyFunction2.apply(a, b));
+                        yield (a, b) -> new TwoIndexProperties<>(keyFunction1.apply(a, b), keyFunction2.apply(a, b));
                     }
                     case 3 -> {
                         var keyFunction1 = keyFunctionList.get(0);
                         var keyFunction2 = keyFunctionList.get(1);
                         var keyFunction3 = keyFunctionList.get(2);
-                        yield (a, b) -> new ai.timefold.solver.core.impl.score.stream.bavet.common.index.ThreeIndexProperties<>(
-                                keyFunction1.apply(a, b), keyFunction2.apply(a, b),
+                        yield (a, b) -> new ThreeIndexProperties<>(keyFunction1.apply(a, b), keyFunction2.apply(a, b),
                                 keyFunction3.apply(a, b));
                     }
                     default -> {
@@ -273,7 +258,7 @@ public <A> Function<A, ai.timefold.solver.core.impl.score.stream.bavet.common.in
                             for (int i = 0; i < keyFunctionCount; i++) {
                                 arr[i] = keyFunctionList.get(i).apply(a, b);
                             }
-                            return new ai.timefold.solver.core.impl.score.stream.bavet.common.index.ManyIndexProperties(arr);
+                            return new ManyIndexProperties(arr);
                         };
                     }
                 }
@@ -281,16 +266,14 @@ public <A> Function<A, ai.timefold.solver.core.impl.score.stream.bavet.common.in
         };
     }
 
-    public <A, B, C> TriFunction<A, B, C, ai.timefold.solver.core.impl.score.stream.bavet.common.index.IndexProperties>
-            buildTriLeftMapping() {
+    public <A, B, C> TriFunction<A, B, C, IndexProperties> buildTriLeftMapping() {
         var joinerCount = joiner.getJoinerCount();
         var castJoiner = (DefaultQuadJoiner<A, B, C, Right_>) joiner;
         return switch (joinerCount) {
             case 0 -> (a, b, c) -> NoneIndexProperties.INSTANCE;
             case 1 -> {
                 var mapping = castJoiner.getLeftMapping(0);
-                yield (a, b, c) -> new ai.timefold.solver.core.impl.score.stream.bavet.common.index.SingleIndexProperties<>(
-                        mapping.apply(a, b, c));
+                yield (a, b, c) -> new SingleIndexProperties<>(mapping.apply(a, b, c));
             }
             default -> {
                 var startIndexInclusive = 0;
@@ -333,7 +316,7 @@ public <A> Function<A, ai.timefold.solver.core.impl.score.stream.bavet.common.in
                                 for (int i = 0; i < mappingCount; i++) {
                                     result[i] = mappings[i].apply(a, b, c);
                                 }
-                                return new ai.timefold.solver.core.impl.score.stream.bavet.common.index.IndexerKey(result);
+                                return new IndexerKey(result);
                             };
                         }
                     };
@@ -344,25 +327,19 @@ public <A> Function<A, ai.timefold.solver.core.impl.score.stream.bavet.common.in
                 switch (keyFunctionCount) {
                     case 1 -> {
                         var keyFunction = keyFunctionList.get(0);
-                        yield (a, b,
-                                c) -> new ai.timefold.solver.core.impl.score.stream.bavet.common.index.SingleIndexProperties<>(
-                                        keyFunction.apply(a, b, c));
+                        yield (a, b, c) -> new SingleIndexProperties<>(keyFunction.apply(a, b, c));
                     }
                     case 2 -> {
                         var keyFunction1 = keyFunctionList.get(0);
                         var keyFunction2 = keyFunctionList.get(1);
-                        yield (a, b,
-                                c) -> new ai.timefold.solver.core.impl.score.stream.bavet.common.index.TwoIndexProperties<>(
-                                        keyFunction1.apply(a, b, c), keyFunction2.apply(a, b, c));
+                        yield (a, b, c) -> new TwoIndexProperties<>(keyFunction1.apply(a, b, c), keyFunction2.apply(a, b, c));
                     }
                     case 3 -> {
                         var keyFunction1 = keyFunctionList.get(0);
                         var keyFunction2 = keyFunctionList.get(1);
                         var keyFunction3 = keyFunctionList.get(2);
-                        yield (a, b,
-                                c) -> new ai.timefold.solver.core.impl.score.stream.bavet.common.index.ThreeIndexProperties<>(
-                                        keyFunction1.apply(a, b, c), keyFunction2.apply(a, b, c),
-                                        keyFunction3.apply(a, b, c));
+                        yield (a, b, c) -> new ThreeIndexProperties<>(keyFunction1.apply(a, b, c), keyFunction2.apply(a, b, c),
+                                keyFunction3.apply(a, b, c));
                     }
                     default -> {
                         yield (a, b, c) -> {
@@ -370,7 +347,7 @@ public <A> Function<A, ai.timefold.solver.core.impl.score.stream.bavet.common.in
                             for (int i = 0; i < keyFunctionCount; i++) {
                                 arr[i] = keyFunctionList.get(i).apply(a, b, c);
                             }
-                            return new ai.timefold.solver.core.impl.score.stream.bavet.common.index.ManyIndexProperties(arr);
+                            return new ManyIndexProperties(arr);
                         };
                     }
                 }
@@ -378,16 +355,14 @@ public <A> Function<A, ai.timefold.solver.core.impl.score.stream.bavet.common.in
         };
     }
 
-    public <A, B, C, D> QuadFunction<A, B, C, D, ai.timefold.solver.core.impl.score.stream.bavet.common.index.IndexProperties>
-            buildQuadLeftMapping() {
+    public <A, B, C, D> QuadFunction<A, B, C, D, IndexProperties> buildQuadLeftMapping() {
         var joinerCount = joiner.getJoinerCount();
         var castJoiner = (DefaultPentaJoiner<A, B, C, D, Right_>) joiner;
         return switch (joinerCount) {
             case 0 -> (a, b, c, d) -> NoneIndexProperties.INSTANCE;
             case 1 -> {
                 var mapping = castJoiner.getLeftMapping(0);
-                yield (a, b, c, d) -> new ai.timefold.solver.core.impl.score.stream.bavet.common.index.SingleIndexProperties<>(
-                        mapping.apply(a, b, c, d));
+                yield (a, b, c, d) -> new SingleIndexProperties<>(mapping.apply(a, b, c, d));
             }
             default -> {
                 var startIndexInclusive = 0;
@@ -430,7 +405,7 @@ public <A> Function<A, ai.timefold.solver.core.impl.score.stream.bavet.common.in
                                 for (int i = 0; i < mappingCount; i++) {
                                     result[i] = mappings[i].apply(a, b, c, d);
                                 }
-                                return new ai.timefold.solver.core.impl.score.stream.bavet.common.index.IndexerKey(result);
+                                return new IndexerKey(result);
                             };
                         }
                     };
@@ -441,27 +416,20 @@ public <A> Function<A, ai.timefold.solver.core.impl.score.stream.bavet.common.in
                 switch (keyFunctionList.size()) {
                     case 1 -> {
                         var keyFunction = keyFunctionList.get(0);
-                        yield (a, b, c,
-                                d) -> new ai.timefold.solver.core.impl.score.stream.bavet.common.index.SingleIndexProperties<>(
-                                        keyFunction.apply(a, b, c, d));
+                        yield (a, b, c, d) -> new SingleIndexProperties<>(keyFunction.apply(a, b, c, d));
                     }
                     case 2 -> {
                         var keyFunction1 = keyFunctionList.get(0);
                         var keyFunction2 = keyFunctionList.get(1);
-                        yield (a, b, c,
-                                d) -> new ai.timefold.solver.core.impl.score.stream.bavet.common.index.TwoIndexProperties<>(
-                                        keyFunction1.apply(a, b, c, d),
-                                        keyFunction2.apply(a, b, c, d));
+                        yield (a, b, c, d) -> new TwoIndexProperties<>(keyFunction1.apply(a, b, c, d),
+                                keyFunction2.apply(a, b, c, d));
                     }
                     case 3 -> {
                         var keyFunction1 = keyFunctionList.get(0);
                         var keyFunction2 = keyFunctionList.get(1);
                         var keyFunction3 = keyFunctionList.get(2);
-                        yield (a, b, c,
-                                d) -> new ai.timefold.solver.core.impl.score.stream.bavet.common.index.ThreeIndexProperties<>(
-                                        keyFunction1.apply(a, b, c, d),
-                                        keyFunction2.apply(a, b, c, d),
-                                        keyFunction3.apply(a, b, c, d));
+                        yield (a, b, c, d) -> new ThreeIndexProperties<>(keyFunction1.apply(a, b, c, d),
+                                keyFunction2.apply(a, b, c, d), keyFunction3.apply(a, b, c, d));
                     }
                     default -> {
                         yield (a, b, c, d) -> {
@@ -469,7 +437,7 @@ public <A> Function<A, ai.timefold.solver.core.impl.score.stream.bavet.common.in
                             for (int i = 0; i < keyFunctionCount; i++) {
                                 arr[i] = keyFunctionList.get(i).apply(a, b, c, d);
                             }
-                            return new ai.timefold.solver.core.impl.score.stream.bavet.common.index.ManyIndexProperties(arr);
+                            return new ManyIndexProperties(arr);
                         };
                     }
                 }
@@ -477,14 +445,13 @@ public <A> Function<A, ai.timefold.solver.core.impl.score.stream.bavet.common.in
         };
     }
 
-    public Function<Right_, ai.timefold.solver.core.impl.score.stream.bavet.common.index.IndexProperties> buildRightMapping() {
+    public Function<Right_, IndexProperties> buildRightMapping() {
         var joinerCount = joiner.getJoinerCount();
         return switch (joinerCount) {
             case 0 -> a -> NoneIndexProperties.INSTANCE;
             case 1 -> {
                 var mapping = joiner.getRightMapping(0);
-                yield a -> new ai.timefold.solver.core.impl.score.stream.bavet.common.index.SingleIndexProperties<>(
-                        mapping.apply(a));
+                yield a -> new SingleIndexProperties<>(mapping.apply(a));
             }
             default -> {
                 var startIndexInclusive = 0;
@@ -526,7 +493,7 @@ public Function<Right_, ai.timefold.solver.core.impl.score.stream.bavet.common.i
                                 for (int i = 0; i < mappingCount; i++) {
                                     result[i] = mappings[i].apply(a);
                                 }
-                                return new ai.timefold.solver.core.impl.score.stream.bavet.common.index.IndexerKey(result);
+                                return new IndexerKey(result);
                             };
                         }
                     };
@@ -537,21 +504,18 @@ public Function<Right_, ai.timefold.solver.core.impl.score.stream.bavet.common.i
                 switch (keyFunctionCount) {
                     case 1 -> {
                         var keyFunction = keyFunctionList.get(0);
-                        yield a -> new ai.timefold.solver.core.impl.score.stream.bavet.common.index.SingleIndexProperties<>(
-                                keyFunction.apply(a));
+                        yield a -> new SingleIndexProperties<>(keyFunction.apply(a));
                     }
                     case 2 -> {
                         var keyFunction1 = keyFunctionList.get(0);
                         var keyFunction2 = keyFunctionList.get(1);
-                        yield a -> new ai.timefold.solver.core.impl.score.stream.bavet.common.index.TwoIndexProperties<>(
-                                keyFunction1.apply(a), keyFunction2.apply(a));
+                        yield a -> new TwoIndexProperties<>(keyFunction1.apply(a), keyFunction2.apply(a));
                     }
                     case 3 -> {
                         var keyFunction1 = keyFunctionList.get(0);
                         var keyFunction2 = keyFunctionList.get(1);
                         var keyFunction3 = keyFunctionList.get(2);
-                        yield a -> new ai.timefold.solver.core.impl.score.stream.bavet.common.index.ThreeIndexProperties<>(
-                                keyFunction1.apply(a), keyFunction2.apply(a),
+                        yield a -> new ThreeIndexProperties<>(keyFunction1.apply(a), keyFunction2.apply(a),
                                 keyFunction3.apply(a));
                     }
                     default -> {
@@ -560,7 +524,7 @@ public Function<Right_, ai.timefold.solver.core.impl.score.stream.bavet.common.i
                             for (int i = 0; i < keyFunctionCount; i++) {
                                 arr[i] = keyFunctionList.get(i).apply(a);
                             }
-                            return new ai.timefold.solver.core.impl.score.stream.bavet.common.index.ManyIndexProperties(arr);
+                            return new ManyIndexProperties(arr);
                         };
                     }
                 }
@@ -568,26 +532,24 @@ public Function<Right_, ai.timefold.solver.core.impl.score.stream.bavet.common.i
         };
     }
 
-    public <T> ai.timefold.solver.core.impl.score.stream.bavet.common.index.Indexer<T> buildIndexer(boolean isLeftBridge) {
+    public <T> Indexer<T> buildIndexer(boolean isLeftBridge) {
         /*
          * Note that if creating indexer for a right bridge node, the joiner type has to be flipped.
          * (<A, B> becomes <B, A>.)
          */
         if (!hasJoiners()) { // NoneJoiner results in NoneIndexer.
-            return new ai.timefold.solver.core.impl.score.stream.bavet.common.index.NoneIndexer<>();
+            return new NoneIndexer<>();
         } else if (joiner.getJoinerCount() == 1) { // Single joiner maps directly to EqualsIndexer or ComparisonIndexer.
             var joinerType = joiner.getJoinerType(0);
             if (joinerType == JoinerType.EQUAL) {
-                return new ai.timefold.solver.core.impl.score.stream.bavet.common.index.EqualsIndexer<>(NoneIndexer::new);
+                return new EqualsIndexer<>(NoneIndexer::new);
             } else {
-                return new ai.timefold.solver.core.impl.score.stream.bavet.common.index.ComparisonIndexer<>(
-                        isLeftBridge ? joinerType : joinerType.flip(), NoneIndexer::new);
+                return new ComparisonIndexer<>(isLeftBridge ? joinerType : joinerType.flip(), NoneIndexer::new);
             }
         }
         // The following code builds the children first, so it needs to iterate over the joiners in reverse order.
         var descendingJoinerTypeMap = joinerTypeMap.descendingMap();
-        Supplier<ai.timefold.solver.core.impl.score.stream.bavet.common.index.Indexer<T>> downstreamIndexerSupplier =
-                NoneIndexer::new;
+        Supplier<Indexer<T>> downstreamIndexerSupplier = NoneIndexer::new;
         var indexPropertyId = descendingJoinerTypeMap.size() - 1;
         for (var entry : descendingJoinerTypeMap.entrySet()) {
             var joinerType = entry.getValue();
@@ -595,14 +557,11 @@ public <T> ai.timefold.solver.core.impl.score.stream.bavet.common.index.Indexer<
             var effectivelyFinalIndexPropertyId = indexPropertyId;
             if (joinerType == JoinerType.EQUAL) {
                 downstreamIndexerSupplier =
-                        () -> new ai.timefold.solver.core.impl.score.stream.bavet.common.index.EqualsIndexer<>(
-                                effectivelyFinalIndexPropertyId, actualDownstreamIndexerSupplier);
+                        () -> new EqualsIndexer<>(effectivelyFinalIndexPropertyId, actualDownstreamIndexerSupplier);
             } else {
                 var actualJoinerType = isLeftBridge ? joinerType : joinerType.flip();
-                downstreamIndexerSupplier =
-                        () -> new ai.timefold.solver.core.impl.score.stream.bavet.common.index.ComparisonIndexer<>(
-                                actualJoinerType, effectivelyFinalIndexPropertyId,
-                                actualDownstreamIndexerSupplier);
+                downstreamIndexerSupplier = () -> new ComparisonIndexer<>(actualJoinerType, effectivelyFinalIndexPropertyId,
+                        actualDownstreamIndexerSupplier);
             }
             indexPropertyId--;
         }
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/IndexerKey.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/IndexerKey.java
similarity index 91%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/IndexerKey.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/IndexerKey.java
index 4d386fa7d6..2ad96d5825 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/IndexerKey.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/IndexerKey.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common.index;
+package ai.timefold.solver.core.impl.bavet.common.index;
 
 import java.util.Arrays;
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/ManyIndexProperties.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/ManyIndexProperties.java
similarity index 89%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/ManyIndexProperties.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/ManyIndexProperties.java
index 169225e70f..17998de23c 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/ManyIndexProperties.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/ManyIndexProperties.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common.index;
+package ai.timefold.solver.core.impl.bavet.common.index;
 
 import java.util.Arrays;
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/NoneIndexProperties.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/NoneIndexProperties.java
similarity index 82%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/NoneIndexProperties.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/NoneIndexProperties.java
index d505e216e7..c44216fb1f 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/NoneIndexProperties.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/NoneIndexProperties.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common.index;
+package ai.timefold.solver.core.impl.bavet.common.index;
 
 final class NoneIndexProperties implements IndexProperties {
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/NoneIndexer.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/NoneIndexer.java
similarity index 93%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/NoneIndexer.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/NoneIndexer.java
index e0d0be6e0d..6fae515523 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/NoneIndexer.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/NoneIndexer.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common.index;
+package ai.timefold.solver.core.impl.bavet.common.index;
 
 import java.util.function.Consumer;
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/SingleIndexProperties.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/SingleIndexProperties.java
similarity index 80%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/SingleIndexProperties.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/SingleIndexProperties.java
index a78391967b..56ca47a7db 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/SingleIndexProperties.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/SingleIndexProperties.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common.index;
+package ai.timefold.solver.core.impl.bavet.common.index;
 
 record SingleIndexProperties<A>(A property) implements IndexProperties {
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/ThreeIndexProperties.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/ThreeIndexProperties.java
similarity index 85%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/ThreeIndexProperties.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/ThreeIndexProperties.java
index f6e8891014..85c7f3f617 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/ThreeIndexProperties.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/ThreeIndexProperties.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common.index;
+package ai.timefold.solver.core.impl.bavet.common.index;
 
 record ThreeIndexProperties<A, B, C>(A propertyA, B propertyB, C propertyC) implements IndexProperties {
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/TwoIndexProperties.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/TwoIndexProperties.java
similarity index 84%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/TwoIndexProperties.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/TwoIndexProperties.java
index b5585d28c2..a5c24dfd9d 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/TwoIndexProperties.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/TwoIndexProperties.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common.index;
+package ai.timefold.solver.core.impl.bavet.common.index;
 
 record TwoIndexProperties<A, B>(A propertyA, B propertyB) implements IndexProperties {
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/AbstractJoiner.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/AbstractJoiner.java
similarity index 82%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/AbstractJoiner.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/AbstractJoiner.java
index 572516d1b2..e949ec6ba5 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/AbstractJoiner.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/AbstractJoiner.java
@@ -1,11 +1,10 @@
-package ai.timefold.solver.core.impl.score.stream.common;
+package ai.timefold.solver.core.impl.bavet.common.index.joiner;
 
 import java.util.Objects;
 import java.util.function.Function;
 
-import ai.timefold.solver.core.impl.score.stream.JoinerType;
-
-public abstract class AbstractJoiner<Right_> {
+public sealed abstract class AbstractJoiner<Right_>
+        permits DefaultBiJoiner, DefaultPentaJoiner, DefaultQuadJoiner, DefaultTriJoiner {
 
     protected final Function<Right_, Object>[] rightMappings;
     protected final JoinerType[] joinerTypes;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/bi/BiJoinerComber.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/BiJoinerComber.java
similarity index 98%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/bi/BiJoinerComber.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/BiJoinerComber.java
index c7c5f4e2c8..e260c64c7e 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/bi/BiJoinerComber.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/BiJoinerComber.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.score.stream.common.bi;
+package ai.timefold.solver.core.impl.bavet.common.index.joiner;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/bi/DefaultBiJoiner.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/DefaultBiJoiner.java
similarity index 94%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/bi/DefaultBiJoiner.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/DefaultBiJoiner.java
index bbcb517f82..2939ea7ffa 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/bi/DefaultBiJoiner.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/DefaultBiJoiner.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.score.stream.common.bi;
+package ai.timefold.solver.core.impl.bavet.common.index.joiner;
 
 import java.util.Arrays;
 import java.util.List;
@@ -6,8 +6,6 @@
 import java.util.function.Function;
 
 import ai.timefold.solver.core.api.score.stream.bi.BiJoiner;
-import ai.timefold.solver.core.impl.score.stream.JoinerType;
-import ai.timefold.solver.core.impl.score.stream.common.AbstractJoiner;
 
 import org.jspecify.annotations.NonNull;
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/penta/DefaultPentaJoiner.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/DefaultPentaJoiner.java
similarity index 94%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/penta/DefaultPentaJoiner.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/DefaultPentaJoiner.java
index 31241a2148..8f03a25540 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/penta/DefaultPentaJoiner.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/DefaultPentaJoiner.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.score.stream.common.penta;
+package ai.timefold.solver.core.impl.bavet.common.index.joiner;
 
 import java.util.Arrays;
 import java.util.List;
@@ -7,8 +7,6 @@
 
 import ai.timefold.solver.core.api.function.QuadFunction;
 import ai.timefold.solver.core.api.score.stream.penta.PentaJoiner;
-import ai.timefold.solver.core.impl.score.stream.JoinerType;
-import ai.timefold.solver.core.impl.score.stream.common.AbstractJoiner;
 
 import org.jspecify.annotations.NonNull;
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/quad/DefaultQuadJoiner.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/DefaultQuadJoiner.java
similarity index 94%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/quad/DefaultQuadJoiner.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/DefaultQuadJoiner.java
index 3cf0048deb..01314d6bec 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/quad/DefaultQuadJoiner.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/DefaultQuadJoiner.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.score.stream.common.quad;
+package ai.timefold.solver.core.impl.bavet.common.index.joiner;
 
 import java.util.Arrays;
 import java.util.List;
@@ -7,8 +7,6 @@
 
 import ai.timefold.solver.core.api.function.TriFunction;
 import ai.timefold.solver.core.api.score.stream.quad.QuadJoiner;
-import ai.timefold.solver.core.impl.score.stream.JoinerType;
-import ai.timefold.solver.core.impl.score.stream.common.AbstractJoiner;
 
 import org.jspecify.annotations.NonNull;
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/tri/DefaultTriJoiner.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/DefaultTriJoiner.java
similarity index 94%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/tri/DefaultTriJoiner.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/DefaultTriJoiner.java
index 2f9d5acb0d..ce99ffd945 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/tri/DefaultTriJoiner.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/DefaultTriJoiner.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.score.stream.common.tri;
+package ai.timefold.solver.core.impl.bavet.common.index.joiner;
 
 import java.util.Arrays;
 import java.util.List;
@@ -7,8 +7,6 @@
 import java.util.function.Function;
 
 import ai.timefold.solver.core.api.score.stream.tri.TriJoiner;
-import ai.timefold.solver.core.impl.score.stream.JoinerType;
-import ai.timefold.solver.core.impl.score.stream.common.AbstractJoiner;
 
 import org.jspecify.annotations.NonNull;
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/bi/FilteringBiJoiner.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/FilteringBiJoiner.java
similarity index 94%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/bi/FilteringBiJoiner.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/FilteringBiJoiner.java
index 3b4b8cd3b5..515b8c8658 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/bi/FilteringBiJoiner.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/FilteringBiJoiner.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.score.stream.common.bi;
+package ai.timefold.solver.core.impl.bavet.common.index.joiner;
 
 import java.util.Objects;
 import java.util.function.BiPredicate;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/penta/FilteringPentaJoiner.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/FilteringPentaJoiner.java
similarity index 95%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/penta/FilteringPentaJoiner.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/FilteringPentaJoiner.java
index f9518e39c4..c4555dc1f5 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/penta/FilteringPentaJoiner.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/FilteringPentaJoiner.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.score.stream.common.penta;
+package ai.timefold.solver.core.impl.bavet.common.index.joiner;
 
 import java.util.Objects;
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/quad/FilteringQuadJoiner.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/FilteringQuadJoiner.java
similarity index 95%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/quad/FilteringQuadJoiner.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/FilteringQuadJoiner.java
index 73c3461858..e0057d04d0 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/quad/FilteringQuadJoiner.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/FilteringQuadJoiner.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.score.stream.common.quad;
+package ai.timefold.solver.core.impl.bavet.common.index.joiner;
 
 import java.util.Objects;
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/tri/FilteringTriJoiner.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/FilteringTriJoiner.java
similarity index 94%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/tri/FilteringTriJoiner.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/FilteringTriJoiner.java
index 567fa4d937..7c57863b62 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/tri/FilteringTriJoiner.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/FilteringTriJoiner.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.score.stream.common.tri;
+package ai.timefold.solver.core.impl.bavet.common.index.joiner;
 
 import java.util.Objects;
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/JoinerType.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/JoinerType.java
similarity index 77%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/JoinerType.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/JoinerType.java
index 5e31cca730..eec3668871 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/JoinerType.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/JoinerType.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.score.stream;
+package ai.timefold.solver.core.impl.bavet.common.index.joiner;
 
 import java.util.Collection;
 import java.util.Objects;
@@ -21,18 +21,13 @@ public enum JoinerType {
     }
 
     public JoinerType flip() {
-        switch (this) {
-            case LESS_THAN:
-                return GREATER_THAN;
-            case LESS_THAN_OR_EQUAL:
-                return GREATER_THAN_OR_EQUAL;
-            case GREATER_THAN:
-                return LESS_THAN;
-            case GREATER_THAN_OR_EQUAL:
-                return LESS_THAN_OR_EQUAL;
-            default:
-                throw new IllegalStateException("The joinerType (" + this + ") cannot be flipped.");
-        }
+        return switch (this) {
+            case LESS_THAN -> GREATER_THAN;
+            case LESS_THAN_OR_EQUAL -> GREATER_THAN_OR_EQUAL;
+            case GREATER_THAN -> LESS_THAN;
+            case GREATER_THAN_OR_EQUAL -> LESS_THAN_OR_EQUAL;
+            default -> throw new IllegalStateException("The joinerType (" + this + ") cannot be flipped.");
+        };
     }
 
     public boolean matches(Object left, Object right) {
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/penta/PentaJoinerComber.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/PentaJoinerComber.java
similarity index 98%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/penta/PentaJoinerComber.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/PentaJoinerComber.java
index 0cffc1ecfb..3fb67219e9 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/penta/PentaJoinerComber.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/PentaJoinerComber.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.score.stream.common.penta;
+package ai.timefold.solver.core.impl.bavet.common.index.joiner;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/quad/QuadJoinerComber.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/QuadJoinerComber.java
similarity index 98%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/quad/QuadJoinerComber.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/QuadJoinerComber.java
index ebd7f3df28..57b047b0a4 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/quad/QuadJoinerComber.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/QuadJoinerComber.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.score.stream.common.quad;
+package ai.timefold.solver.core.impl.bavet.common.index.joiner;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/tri/TriJoinerComber.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/TriJoinerComber.java
similarity index 98%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/tri/TriJoinerComber.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/TriJoinerComber.java
index 235fc0706b..5624635211 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/tri/TriJoinerComber.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/TriJoinerComber.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.score.stream.common.tri;
+package ai.timefold.solver.core.impl.bavet.common.index.joiner;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/package-info.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/package-info.java
new file mode 100644
index 0000000000..707308e027
--- /dev/null
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/index/package-info.java
@@ -0,0 +1,6 @@
+/**
+ * This package contains code that deals with indexing of tuples.
+ * The entry point is {@link ai.timefold.solver.core.impl.bavet.common.index.IndexerFactory},
+ * which also contains a description of the entire mechanism.
+ */
+package ai.timefold.solver.core.impl.bavet.common.index;
\ No newline at end of file
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/package-info.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/package-info.java
similarity index 87%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/package-info.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/package-info.java
index 2c7855d08e..24db22f83e 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/package-info.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/package-info.java
@@ -5,4 +5,4 @@
  * When it comes to this code, assumptions and pre-conceived notions of JVM performance should not be trusted.
  * Instead, any likely performance-altering modifications to this code should be carefully benchmarked.
  */
-package ai.timefold.solver.core.impl.score.stream.bavet.common;
\ No newline at end of file
+package ai.timefold.solver.core.impl.bavet.common;
\ No newline at end of file
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/tuple/AbstractConditionalTupleLifecycle.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/tuple/AbstractConditionalTupleLifecycle.java
similarity index 93%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/tuple/AbstractConditionalTupleLifecycle.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/tuple/AbstractConditionalTupleLifecycle.java
index 8d3b61f14f..01d300d62a 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/tuple/AbstractConditionalTupleLifecycle.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/tuple/AbstractConditionalTupleLifecycle.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common.tuple;
+package ai.timefold.solver.core.impl.bavet.common.tuple;
 
 import java.util.Objects;
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/tuple/AbstractTuple.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/tuple/AbstractTuple.java
similarity index 96%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/tuple/AbstractTuple.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/tuple/AbstractTuple.java
index 8bf8788f3a..34284e3b65 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/tuple/AbstractTuple.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/tuple/AbstractTuple.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common.tuple;
+package ai.timefold.solver.core.impl.bavet.common.tuple;
 
 import java.util.function.Function;
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/tuple/AggregatedTupleLifecycle.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/tuple/AggregatedTupleLifecycle.java
similarity index 92%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/tuple/AggregatedTupleLifecycle.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/tuple/AggregatedTupleLifecycle.java
index 9d9d95251c..70f626c401 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/tuple/AggregatedTupleLifecycle.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/tuple/AggregatedTupleLifecycle.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common.tuple;
+package ai.timefold.solver.core.impl.bavet.common.tuple;
 
 final class AggregatedTupleLifecycle<Tuple_ extends AbstractTuple> implements TupleLifecycle<Tuple_> {
     private final TupleLifecycle<Tuple_>[] lifecycles;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/tuple/BiTuple.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/tuple/BiTuple.java
similarity index 85%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/tuple/BiTuple.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/tuple/BiTuple.java
index d0d2babf29..80fe6fd712 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/tuple/BiTuple.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/tuple/BiTuple.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common.tuple;
+package ai.timefold.solver.core.impl.bavet.common.tuple;
 
 public final class BiTuple<A, B> extends AbstractTuple {
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/tuple/LeftTupleLifecycle.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/tuple/LeftTupleLifecycle.java
similarity index 72%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/tuple/LeftTupleLifecycle.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/tuple/LeftTupleLifecycle.java
index 42759da7e8..c6b6d9c9d0 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/tuple/LeftTupleLifecycle.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/tuple/LeftTupleLifecycle.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common.tuple;
+package ai.timefold.solver.core.impl.bavet.common.tuple;
 
 public interface LeftTupleLifecycle<Tuple_ extends AbstractTuple> {
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/tuple/LeftTupleLifecycleImpl.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/tuple/LeftTupleLifecycleImpl.java
similarity index 91%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/tuple/LeftTupleLifecycleImpl.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/tuple/LeftTupleLifecycleImpl.java
index a1ee8dda2a..125c5e762d 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/tuple/LeftTupleLifecycleImpl.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/tuple/LeftTupleLifecycleImpl.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common.tuple;
+package ai.timefold.solver.core.impl.bavet.common.tuple;
 
 import java.util.Objects;
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/tuple/QuadTuple.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/tuple/QuadTuple.java
similarity index 88%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/tuple/QuadTuple.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/tuple/QuadTuple.java
index 898e789fde..7176d628b2 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/tuple/QuadTuple.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/tuple/QuadTuple.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common.tuple;
+package ai.timefold.solver.core.impl.bavet.common.tuple;
 
 public final class QuadTuple<A, B, C, D> extends AbstractTuple {
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/tuple/RightTupleLifecycle.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/tuple/RightTupleLifecycle.java
similarity index 72%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/tuple/RightTupleLifecycle.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/tuple/RightTupleLifecycle.java
index 49fee84de8..3b4020918f 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/tuple/RightTupleLifecycle.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/tuple/RightTupleLifecycle.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common.tuple;
+package ai.timefold.solver.core.impl.bavet.common.tuple;
 
 public interface RightTupleLifecycle<Tuple_ extends AbstractTuple> {
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/tuple/RightTupleLifecycleImpl.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/tuple/RightTupleLifecycleImpl.java
similarity index 91%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/tuple/RightTupleLifecycleImpl.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/tuple/RightTupleLifecycleImpl.java
index 24119a9f53..49ac89bfee 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/tuple/RightTupleLifecycleImpl.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/tuple/RightTupleLifecycleImpl.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common.tuple;
+package ai.timefold.solver.core.impl.bavet.common.tuple;
 
 import java.util.Objects;
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/tuple/TriTuple.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/tuple/TriTuple.java
similarity index 87%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/tuple/TriTuple.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/tuple/TriTuple.java
index e647af4967..b279d59c1b 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/tuple/TriTuple.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/tuple/TriTuple.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common.tuple;
+package ai.timefold.solver.core.impl.bavet.common.tuple;
 
 public final class TriTuple<A, B, C> extends AbstractTuple {
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/tuple/TupleLifecycle.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/tuple/TupleLifecycle.java
similarity index 91%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/tuple/TupleLifecycle.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/tuple/TupleLifecycle.java
index 3ac17c22d7..c4dc8f3594 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/tuple/TupleLifecycle.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/tuple/TupleLifecycle.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common.tuple;
+package ai.timefold.solver.core.impl.bavet.common.tuple;
 
 public interface TupleLifecycle<Tuple_ extends AbstractTuple> {
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/tuple/TupleState.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/tuple/TupleState.java
similarity index 91%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/tuple/TupleState.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/tuple/TupleState.java
index 9e44a50688..3ce6124acf 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/tuple/TupleState.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/tuple/TupleState.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common.tuple;
+package ai.timefold.solver.core.impl.bavet.common.tuple;
 
 public enum TupleState {
     CREATING(true, true),
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/tuple/UniTuple.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/tuple/UniTuple.java
similarity index 82%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/tuple/UniTuple.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/common/tuple/UniTuple.java
index 6e81eb024d..7cd1e40bc5 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/tuple/UniTuple.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/common/tuple/UniTuple.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common.tuple;
+package ai.timefold.solver.core.impl.bavet.common.tuple;
 
 public final class UniTuple<A> extends AbstractTuple {
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/AbstractGroupQuadNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/AbstractGroupQuadNode.java
similarity index 83%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/AbstractGroupQuadNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/AbstractGroupQuadNode.java
index 931d87b2f2..2f800928a3 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/AbstractGroupQuadNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/AbstractGroupQuadNode.java
@@ -1,14 +1,14 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.quad;
+package ai.timefold.solver.core.impl.bavet.quad;
 
 import java.util.function.Function;
 
 import ai.timefold.solver.core.api.function.PentaFunction;
 import ai.timefold.solver.core.api.score.stream.quad.QuadConstraintCollector;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractGroupNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.AbstractTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.AbstractGroupNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.AbstractTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 
 abstract class AbstractGroupQuadNode<OldA, OldB, OldC, OldD, OutTuple_ extends AbstractTuple, GroupKey_, ResultContainer_, Result_>
         extends AbstractGroupNode<QuadTuple<OldA, OldB, OldC, OldD>, OutTuple_, GroupKey_, ResultContainer_, Result_> {
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/ConcatBiQuadNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/ConcatBiQuadNode.java
similarity index 77%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/ConcatBiQuadNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/ConcatBiQuadNode.java
index dd0b7edf5e..7b859b7145 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/ConcatBiQuadNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/ConcatBiQuadNode.java
@@ -1,19 +1,19 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.quad;
+package ai.timefold.solver.core.impl.bavet.quad;
 
 import java.util.function.BiFunction;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractConcatNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.AbstractConcatNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 
-final class ConcatBiQuadNode<A, B, C, D>
+public final class ConcatBiQuadNode<A, B, C, D>
         extends AbstractConcatNode<BiTuple<A, B>, QuadTuple<A, B, C, D>, QuadTuple<A, B, C, D>> {
 
     private final BiFunction<A, B, C> paddingFunctionC;
     private final BiFunction<A, B, D> paddingFunctionD;
 
-    ConcatBiQuadNode(BiFunction<A, B, C> paddingFunctionC, BiFunction<A, B, D> paddingFunctionD,
+    public ConcatBiQuadNode(BiFunction<A, B, C> paddingFunctionC, BiFunction<A, B, D> paddingFunctionD,
             TupleLifecycle<QuadTuple<A, B, C, D>> nextNodesTupleLifecycle,
             int inputStoreIndexLeftOutTupleList, int inputStoreIndexRightOutTupleList,
             int outputStoreSize) {
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/ConcatQuadBiNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/ConcatQuadBiNode.java
similarity index 77%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/ConcatQuadBiNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/ConcatQuadBiNode.java
index 0603fe74e9..f9d1dd40b2 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/ConcatQuadBiNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/ConcatQuadBiNode.java
@@ -1,19 +1,19 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.quad;
+package ai.timefold.solver.core.impl.bavet.quad;
 
 import java.util.function.BiFunction;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractConcatNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.AbstractConcatNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 
-final class ConcatQuadBiNode<A, B, C, D>
+public final class ConcatQuadBiNode<A, B, C, D>
         extends AbstractConcatNode<QuadTuple<A, B, C, D>, BiTuple<A, B>, QuadTuple<A, B, C, D>> {
 
     private final BiFunction<A, B, C> paddingFunctionC;
     private final BiFunction<A, B, D> paddingFunctionD;
 
-    ConcatQuadBiNode(BiFunction<A, B, C> paddingFunctionC, BiFunction<A, B, D> paddingFunctionD,
+    public ConcatQuadBiNode(BiFunction<A, B, C> paddingFunctionC, BiFunction<A, B, D> paddingFunctionD,
             TupleLifecycle<QuadTuple<A, B, C, D>> nextNodesTupleLifecycle,
             int inputStoreIndexLeftOutTupleList, int inputStoreIndexRightOutTupleList,
             int outputStoreSize) {
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/ConcatQuadQuadNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/ConcatQuadQuadNode.java
similarity index 76%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/ConcatQuadQuadNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/ConcatQuadQuadNode.java
index 60b74025af..e12add2e73 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/ConcatQuadQuadNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/ConcatQuadQuadNode.java
@@ -1,13 +1,13 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.quad;
+package ai.timefold.solver.core.impl.bavet.quad;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractConcatNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.AbstractConcatNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 
-final class ConcatQuadQuadNode<A, B, C, D>
+public final class ConcatQuadQuadNode<A, B, C, D>
         extends AbstractConcatNode<QuadTuple<A, B, C, D>, QuadTuple<A, B, C, D>, QuadTuple<A, B, C, D>> {
 
-    ConcatQuadQuadNode(TupleLifecycle<QuadTuple<A, B, C, D>> nextNodesTupleLifecycle,
+    public ConcatQuadQuadNode(TupleLifecycle<QuadTuple<A, B, C, D>> nextNodesTupleLifecycle,
             int inputStoreIndexLeftOutTupleList, int inputStoreIndexRightOutTupleList,
             int outputStoreSize) {
         super(nextNodesTupleLifecycle, inputStoreIndexLeftOutTupleList, inputStoreIndexRightOutTupleList, outputStoreSize);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/ConcatQuadTriNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/ConcatQuadTriNode.java
similarity index 75%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/ConcatQuadTriNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/ConcatQuadTriNode.java
index 9247ab59fd..31a3f87e58 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/ConcatQuadTriNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/ConcatQuadTriNode.java
@@ -1,17 +1,18 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.quad;
+package ai.timefold.solver.core.impl.bavet.quad;
 
 import ai.timefold.solver.core.api.function.TriFunction;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractConcatNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.AbstractConcatNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 
-final class ConcatQuadTriNode<A, B, C, D>
+public final class ConcatQuadTriNode<A, B, C, D>
         extends AbstractConcatNode<QuadTuple<A, B, C, D>, TriTuple<A, B, C>, QuadTuple<A, B, C, D>> {
 
     private final TriFunction<A, B, C, D> paddingFunction;
 
-    ConcatQuadTriNode(TriFunction<A, B, C, D> paddingFunction, TupleLifecycle<QuadTuple<A, B, C, D>> nextNodesTupleLifecycle,
+    public ConcatQuadTriNode(TriFunction<A, B, C, D> paddingFunction,
+            TupleLifecycle<QuadTuple<A, B, C, D>> nextNodesTupleLifecycle,
             int inputStoreIndexLeftOutTupleList, int inputStoreIndexRightOutTupleList,
             int outputStoreSize) {
         super(nextNodesTupleLifecycle, inputStoreIndexLeftOutTupleList, inputStoreIndexRightOutTupleList, outputStoreSize);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/ConcatQuadUniNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/ConcatQuadUniNode.java
similarity index 76%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/ConcatQuadUniNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/ConcatQuadUniNode.java
index db5ab93e7b..3007886129 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/ConcatQuadUniNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/ConcatQuadUniNode.java
@@ -1,20 +1,20 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.quad;
+package ai.timefold.solver.core.impl.bavet.quad;
 
 import java.util.function.Function;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractConcatNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.common.AbstractConcatNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 
-final class ConcatQuadUniNode<A, B, C, D>
+public final class ConcatQuadUniNode<A, B, C, D>
         extends AbstractConcatNode<QuadTuple<A, B, C, D>, UniTuple<A>, QuadTuple<A, B, C, D>> {
 
     private final Function<A, B> paddingFunctionB;
     private final Function<A, C> paddingFunctionC;
     private final Function<A, D> paddingFunctionD;
 
-    ConcatQuadUniNode(Function<A, B> paddingFunctionB, Function<A, C> paddingFunctionC, Function<A, D> paddingFunctionD,
+    public ConcatQuadUniNode(Function<A, B> paddingFunctionB, Function<A, C> paddingFunctionC, Function<A, D> paddingFunctionD,
             TupleLifecycle<QuadTuple<A, B, C, D>> nextNodesTupleLifecycle,
             int inputStoreIndexLeftOutTupleList, int inputStoreIndexRightOutTupleList,
             int outputStoreSize) {
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/ConcatTriQuadNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/ConcatTriQuadNode.java
similarity index 75%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/ConcatTriQuadNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/ConcatTriQuadNode.java
index abd45c1f98..d9d237994b 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/ConcatTriQuadNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/ConcatTriQuadNode.java
@@ -1,17 +1,18 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.quad;
+package ai.timefold.solver.core.impl.bavet.quad;
 
 import ai.timefold.solver.core.api.function.TriFunction;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractConcatNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.AbstractConcatNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 
-final class ConcatTriQuadNode<A, B, C, D>
+public final class ConcatTriQuadNode<A, B, C, D>
         extends AbstractConcatNode<TriTuple<A, B, C>, QuadTuple<A, B, C, D>, QuadTuple<A, B, C, D>> {
 
     private final TriFunction<A, B, C, D> paddingFunction;
 
-    ConcatTriQuadNode(TriFunction<A, B, C, D> paddingFunction, TupleLifecycle<QuadTuple<A, B, C, D>> nextNodesTupleLifecycle,
+    public ConcatTriQuadNode(TriFunction<A, B, C, D> paddingFunction,
+            TupleLifecycle<QuadTuple<A, B, C, D>> nextNodesTupleLifecycle,
             int inputStoreIndexLeftOutTupleList, int inputStoreIndexRightOutTupleList,
             int outputStoreSize) {
         super(nextNodesTupleLifecycle, inputStoreIndexLeftOutTupleList, inputStoreIndexRightOutTupleList, outputStoreSize);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/ConcatUniQuadNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/ConcatUniQuadNode.java
similarity index 76%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/ConcatUniQuadNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/ConcatUniQuadNode.java
index ca6ca88fab..7ecf3c9123 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/ConcatUniQuadNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/ConcatUniQuadNode.java
@@ -1,20 +1,20 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.quad;
+package ai.timefold.solver.core.impl.bavet.quad;
 
 import java.util.function.Function;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractConcatNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.common.AbstractConcatNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 
-final class ConcatUniQuadNode<A, B, C, D>
+public final class ConcatUniQuadNode<A, B, C, D>
         extends AbstractConcatNode<UniTuple<A>, QuadTuple<A, B, C, D>, QuadTuple<A, B, C, D>> {
 
     private final Function<A, B> paddingFunctionB;
     private final Function<A, C> paddingFunctionC;
     private final Function<A, D> paddingFunctionD;
 
-    ConcatUniQuadNode(Function<A, B> paddingFunctionB, Function<A, C> paddingFunctionC, Function<A, D> paddingFunctionD,
+    public ConcatUniQuadNode(Function<A, B> paddingFunctionB, Function<A, C> paddingFunctionC, Function<A, D> paddingFunctionD,
             TupleLifecycle<QuadTuple<A, B, C, D>> nextNodesTupleLifecycle,
             int inputStoreIndexLeftOutTupleList, int inputStoreIndexRightOutTupleList,
             int outputStoreSize) {
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/ConditionalQuadTupleLifecycle.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/ConditionalQuadTupleLifecycle.java
similarity index 52%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/ConditionalQuadTupleLifecycle.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/ConditionalQuadTupleLifecycle.java
index 1fabeea5f1..d72cfdb9f4 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/ConditionalQuadTupleLifecycle.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/ConditionalQuadTupleLifecycle.java
@@ -1,11 +1,11 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.quad;
+package ai.timefold.solver.core.impl.bavet.quad;
 
 import ai.timefold.solver.core.api.function.QuadPredicate;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.AbstractConditionalTupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.AbstractConditionalTupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 
-final class ConditionalQuadTupleLifecycle<A, B, C, D> extends AbstractConditionalTupleLifecycle<QuadTuple<A, B, C, D>> {
+public final class ConditionalQuadTupleLifecycle<A, B, C, D> extends AbstractConditionalTupleLifecycle<QuadTuple<A, B, C, D>> {
     private final QuadPredicate<A, B, C, D> predicate;
 
     public ConditionalQuadTupleLifecycle(QuadPredicate<A, B, C, D> predicate,
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/FlattenLastQuadNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/FlattenLastQuadNode.java
similarity index 66%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/FlattenLastQuadNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/FlattenLastQuadNode.java
index 35b39ef4e3..80295a9413 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/FlattenLastQuadNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/FlattenLastQuadNode.java
@@ -1,17 +1,17 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.quad;
+package ai.timefold.solver.core.impl.bavet.quad;
 
 import java.util.function.Function;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractFlattenLastNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.AbstractFlattenLastNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 
-final class FlattenLastQuadNode<A, B, C, D, NewD>
+public final class FlattenLastQuadNode<A, B, C, D, NewD>
         extends AbstractFlattenLastNode<QuadTuple<A, B, C, D>, QuadTuple<A, B, C, NewD>, D, NewD> {
 
     private final int outputStoreSize;
 
-    FlattenLastQuadNode(int flattenLastStoreIndex, Function<D, Iterable<NewD>> mappingFunction,
+    public FlattenLastQuadNode(int flattenLastStoreIndex, Function<D, Iterable<NewD>> mappingFunction,
             TupleLifecycle<QuadTuple<A, B, C, NewD>> nextNodesTupleLifecycle, int outputStoreSize) {
         super(flattenLastStoreIndex, mappingFunction, nextNodesTupleLifecycle);
         this.outputStoreSize = outputStoreSize;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/Group0Mapping1CollectorQuadNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/Group0Mapping1CollectorQuadNode.java
similarity index 76%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/Group0Mapping1CollectorQuadNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/Group0Mapping1CollectorQuadNode.java
index 2ef9210b14..c728e2a749 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/Group0Mapping1CollectorQuadNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/Group0Mapping1CollectorQuadNode.java
@@ -1,11 +1,11 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.quad;
+package ai.timefold.solver.core.impl.bavet.quad;
 
 import ai.timefold.solver.core.api.score.stream.quad.QuadConstraintCollector;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 
-final class Group0Mapping1CollectorQuadNode<OldA, OldB, OldC, OldD, A, ResultContainer_>
+public final class Group0Mapping1CollectorQuadNode<OldA, OldB, OldC, OldD, A, ResultContainer_>
         extends AbstractGroupQuadNode<OldA, OldB, OldC, OldD, UniTuple<A>, Void, ResultContainer_, A> {
 
     private final int outputStoreSize;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/Group0Mapping2CollectorQuadNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/Group0Mapping2CollectorQuadNode.java
similarity index 85%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/Group0Mapping2CollectorQuadNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/Group0Mapping2CollectorQuadNode.java
index b741ac2914..4464a52d6d 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/Group0Mapping2CollectorQuadNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/Group0Mapping2CollectorQuadNode.java
@@ -1,13 +1,13 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.quad;
+package ai.timefold.solver.core.impl.bavet.quad;
 
 import ai.timefold.solver.core.api.score.stream.ConstraintCollectors;
 import ai.timefold.solver.core.api.score.stream.quad.QuadConstraintCollector;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 import ai.timefold.solver.core.impl.util.Pair;
 
-final class Group0Mapping2CollectorQuadNode<OldA, OldB, OldC, OldD, A, B, ResultContainerA_, ResultContainerB_>
+public final class Group0Mapping2CollectorQuadNode<OldA, OldB, OldC, OldD, A, B, ResultContainerA_, ResultContainerB_>
         extends AbstractGroupQuadNode<OldA, OldB, OldC, OldD, BiTuple<A, B>, Void, Object, Pair<A, B>> {
 
     private final int outputStoreSize;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/Group0Mapping3CollectorQuadNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/Group0Mapping3CollectorQuadNode.java
similarity index 86%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/Group0Mapping3CollectorQuadNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/Group0Mapping3CollectorQuadNode.java
index 605e3f3f90..1cb82ab0d0 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/Group0Mapping3CollectorQuadNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/Group0Mapping3CollectorQuadNode.java
@@ -1,13 +1,13 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.quad;
+package ai.timefold.solver.core.impl.bavet.quad;
 
 import ai.timefold.solver.core.api.score.stream.ConstraintCollectors;
 import ai.timefold.solver.core.api.score.stream.quad.QuadConstraintCollector;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 import ai.timefold.solver.core.impl.util.Triple;
 
-final class Group0Mapping3CollectorQuadNode<OldA, OldB, OldC, OldD, A, B, C, ResultContainerA_, ResultContainerB_, ResultContainerC_>
+public final class Group0Mapping3CollectorQuadNode<OldA, OldB, OldC, OldD, A, B, C, ResultContainerA_, ResultContainerB_, ResultContainerC_>
         extends
         AbstractGroupQuadNode<OldA, OldB, OldC, OldD, TriTuple<A, B, C>, Void, Object, Triple<A, B, C>> {
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/Group0Mapping4CollectorQuadNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/Group0Mapping4CollectorQuadNode.java
similarity index 87%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/Group0Mapping4CollectorQuadNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/Group0Mapping4CollectorQuadNode.java
index 1a63b8c3ac..07d8d54356 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/Group0Mapping4CollectorQuadNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/Group0Mapping4CollectorQuadNode.java
@@ -1,13 +1,13 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.quad;
+package ai.timefold.solver.core.impl.bavet.quad;
 
 import ai.timefold.solver.core.api.score.stream.ConstraintCollectors;
 import ai.timefold.solver.core.api.score.stream.quad.QuadConstraintCollector;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 import ai.timefold.solver.core.impl.util.Quadruple;
 
-final class Group0Mapping4CollectorQuadNode<OldA, OldB, OldC, OldD, A, B, C, D, ResultContainerA_, ResultContainerB_, ResultContainerC_, ResultContainerD_>
+public final class Group0Mapping4CollectorQuadNode<OldA, OldB, OldC, OldD, A, B, C, D, ResultContainerA_, ResultContainerB_, ResultContainerC_, ResultContainerD_>
         extends
         AbstractGroupQuadNode<OldA, OldB, OldC, OldD, QuadTuple<A, B, C, D>, Void, Object, Quadruple<A, B, C, D>> {
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/Group1Mapping0CollectorQuadNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/Group1Mapping0CollectorQuadNode.java
similarity index 77%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/Group1Mapping0CollectorQuadNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/Group1Mapping0CollectorQuadNode.java
index 25b1973e83..35a99189b8 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/Group1Mapping0CollectorQuadNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/Group1Mapping0CollectorQuadNode.java
@@ -1,12 +1,12 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.quad;
+package ai.timefold.solver.core.impl.bavet.quad;
 
 import ai.timefold.solver.core.api.function.QuadFunction;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 
-final class Group1Mapping0CollectorQuadNode<OldA, OldB, OldC, OldD, A>
+public final class Group1Mapping0CollectorQuadNode<OldA, OldB, OldC, OldD, A>
         extends AbstractGroupQuadNode<OldA, OldB, OldC, OldD, UniTuple<A>, A, Void, Void> {
 
     private final int outputStoreSize;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/Group1Mapping1CollectorQuadNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/Group1Mapping1CollectorQuadNode.java
similarity index 79%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/Group1Mapping1CollectorQuadNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/Group1Mapping1CollectorQuadNode.java
index eb68ffddb7..f4e71ec459 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/Group1Mapping1CollectorQuadNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/Group1Mapping1CollectorQuadNode.java
@@ -1,12 +1,12 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.quad;
+package ai.timefold.solver.core.impl.bavet.quad;
 
 import ai.timefold.solver.core.api.function.QuadFunction;
 import ai.timefold.solver.core.api.score.stream.quad.QuadConstraintCollector;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 
-final class Group1Mapping1CollectorQuadNode<OldA, OldB, OldC, OldD, A, B, ResultContainer_>
+public final class Group1Mapping1CollectorQuadNode<OldA, OldB, OldC, OldD, A, B, ResultContainer_>
         extends AbstractGroupQuadNode<OldA, OldB, OldC, OldD, BiTuple<A, B>, A, ResultContainer_, B> {
 
     private final int outputStoreSize;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/Group1Mapping2CollectorQuadNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/Group1Mapping2CollectorQuadNode.java
similarity index 81%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/Group1Mapping2CollectorQuadNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/Group1Mapping2CollectorQuadNode.java
index 62c69fcc6e..135d6396a4 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/Group1Mapping2CollectorQuadNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/Group1Mapping2CollectorQuadNode.java
@@ -1,13 +1,13 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.quad;
+package ai.timefold.solver.core.impl.bavet.quad;
 
 import ai.timefold.solver.core.api.function.QuadFunction;
 import ai.timefold.solver.core.api.score.stream.quad.QuadConstraintCollector;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 import ai.timefold.solver.core.impl.util.Pair;
 
-final class Group1Mapping2CollectorQuadNode<OldA, OldB, OldC, OldD, A, B, C, ResultContainerB_, ResultContainerC_>
+public final class Group1Mapping2CollectorQuadNode<OldA, OldB, OldC, OldD, A, B, C, ResultContainerB_, ResultContainerC_>
         extends AbstractGroupQuadNode<OldA, OldB, OldC, OldD, TriTuple<A, B, C>, A, Object, Pair<B, C>> {
 
     private final int outputStoreSize;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/Group1Mapping3CollectorQuadNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/Group1Mapping3CollectorQuadNode.java
similarity index 82%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/Group1Mapping3CollectorQuadNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/Group1Mapping3CollectorQuadNode.java
index 439ae6db8a..741b478b17 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/Group1Mapping3CollectorQuadNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/Group1Mapping3CollectorQuadNode.java
@@ -1,13 +1,13 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.quad;
+package ai.timefold.solver.core.impl.bavet.quad;
 
 import ai.timefold.solver.core.api.function.QuadFunction;
 import ai.timefold.solver.core.api.score.stream.quad.QuadConstraintCollector;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 import ai.timefold.solver.core.impl.util.Triple;
 
-final class Group1Mapping3CollectorQuadNode<OldA, OldB, OldC, OldD, A, B, C, D, ResultContainerB_, ResultContainerC_, ResultContainerD_>
+public final class Group1Mapping3CollectorQuadNode<OldA, OldB, OldC, OldD, A, B, C, D, ResultContainerB_, ResultContainerC_, ResultContainerD_>
         extends
         AbstractGroupQuadNode<OldA, OldB, OldC, OldD, QuadTuple<A, B, C, D>, A, Object, Triple<B, C, D>> {
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/Group2Mapping0CollectorQuadNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/Group2Mapping0CollectorQuadNode.java
similarity index 82%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/Group2Mapping0CollectorQuadNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/Group2Mapping0CollectorQuadNode.java
index b975dde879..fd668a5543 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/Group2Mapping0CollectorQuadNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/Group2Mapping0CollectorQuadNode.java
@@ -1,13 +1,13 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.quad;
+package ai.timefold.solver.core.impl.bavet.quad;
 
 import ai.timefold.solver.core.api.function.QuadFunction;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 import ai.timefold.solver.core.impl.util.Pair;
 
-final class Group2Mapping0CollectorQuadNode<OldA, OldB, OldC, OldD, A, B>
+public final class Group2Mapping0CollectorQuadNode<OldA, OldB, OldC, OldD, A, B>
         extends AbstractGroupQuadNode<OldA, OldB, OldC, OldD, BiTuple<A, B>, Pair<A, B>, Void, Void> {
 
     private final int outputStoreSize;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/Group2Mapping1CollectorQuadNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/Group2Mapping1CollectorQuadNode.java
similarity index 81%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/Group2Mapping1CollectorQuadNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/Group2Mapping1CollectorQuadNode.java
index 2ef56cf018..87979bc88a 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/Group2Mapping1CollectorQuadNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/Group2Mapping1CollectorQuadNode.java
@@ -1,13 +1,13 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.quad;
+package ai.timefold.solver.core.impl.bavet.quad;
 
 import ai.timefold.solver.core.api.function.QuadFunction;
 import ai.timefold.solver.core.api.score.stream.quad.QuadConstraintCollector;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 import ai.timefold.solver.core.impl.util.Pair;
 
-final class Group2Mapping1CollectorQuadNode<OldA, OldB, OldC, OldD, A, B, C, ResultContainer_>
+public final class Group2Mapping1CollectorQuadNode<OldA, OldB, OldC, OldD, A, B, C, ResultContainer_>
         extends
         AbstractGroupQuadNode<OldA, OldB, OldC, OldD, TriTuple<A, B, C>, Pair<A, B>, ResultContainer_, C> {
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/Group2Mapping2CollectorQuadNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/Group2Mapping2CollectorQuadNode.java
similarity index 83%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/Group2Mapping2CollectorQuadNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/Group2Mapping2CollectorQuadNode.java
index 763b543b20..9b6e7714ae 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/Group2Mapping2CollectorQuadNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/Group2Mapping2CollectorQuadNode.java
@@ -1,13 +1,13 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.quad;
+package ai.timefold.solver.core.impl.bavet.quad;
 
 import ai.timefold.solver.core.api.function.QuadFunction;
 import ai.timefold.solver.core.api.score.stream.quad.QuadConstraintCollector;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 import ai.timefold.solver.core.impl.util.Pair;
 
-final class Group2Mapping2CollectorQuadNode<OldA, OldB, OldC, OldD, A, B, C, D, ResultContainerC_, ResultContainerD_>
+public final class Group2Mapping2CollectorQuadNode<OldA, OldB, OldC, OldD, A, B, C, D, ResultContainerC_, ResultContainerD_>
         extends
         AbstractGroupQuadNode<OldA, OldB, OldC, OldD, QuadTuple<A, B, C, D>, Pair<A, B>, Object, Pair<C, D>> {
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/Group3Mapping0CollectorQuadNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/Group3Mapping0CollectorQuadNode.java
similarity index 84%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/Group3Mapping0CollectorQuadNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/Group3Mapping0CollectorQuadNode.java
index 008dc98d43..a9da29f98a 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/Group3Mapping0CollectorQuadNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/Group3Mapping0CollectorQuadNode.java
@@ -1,13 +1,13 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.quad;
+package ai.timefold.solver.core.impl.bavet.quad;
 
 import ai.timefold.solver.core.api.function.QuadFunction;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 import ai.timefold.solver.core.impl.util.Triple;
 
-final class Group3Mapping0CollectorQuadNode<OldA, OldB, OldC, OldD, A, B, C>
+public final class Group3Mapping0CollectorQuadNode<OldA, OldB, OldC, OldD, A, B, C>
         extends
         AbstractGroupQuadNode<OldA, OldB, OldC, OldD, TriTuple<A, B, C>, Triple<A, B, C>, Void, Void> {
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/Group3Mapping1CollectorQuadNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/Group3Mapping1CollectorQuadNode.java
similarity index 83%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/Group3Mapping1CollectorQuadNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/Group3Mapping1CollectorQuadNode.java
index b559c2af8e..c3b6dd1bb1 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/Group3Mapping1CollectorQuadNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/Group3Mapping1CollectorQuadNode.java
@@ -1,13 +1,13 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.quad;
+package ai.timefold.solver.core.impl.bavet.quad;
 
 import ai.timefold.solver.core.api.function.QuadFunction;
 import ai.timefold.solver.core.api.score.stream.quad.QuadConstraintCollector;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 import ai.timefold.solver.core.impl.util.Triple;
 
-final class Group3Mapping1CollectorQuadNode<OldA, OldB, OldC, OldD, A, B, C, D, ResultContainer_>
+public final class Group3Mapping1CollectorQuadNode<OldA, OldB, OldC, OldD, A, B, C, D, ResultContainer_>
         extends
         AbstractGroupQuadNode<OldA, OldB, OldC, OldD, QuadTuple<A, B, C, D>, Triple<A, B, C>, ResultContainer_, D> {
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/Group4Mapping0CollectorQuadNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/Group4Mapping0CollectorQuadNode.java
similarity index 88%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/Group4Mapping0CollectorQuadNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/Group4Mapping0CollectorQuadNode.java
index b07135c19d..c008fb934f 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/Group4Mapping0CollectorQuadNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/Group4Mapping0CollectorQuadNode.java
@@ -1,12 +1,12 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.quad;
+package ai.timefold.solver.core.impl.bavet.quad;
 
 import ai.timefold.solver.core.api.function.QuadFunction;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 import ai.timefold.solver.core.impl.util.Quadruple;
 
-final class Group4Mapping0CollectorQuadNode<OldA, OldB, OldC, OldD, A, B, C, D>
+public final class Group4Mapping0CollectorQuadNode<OldA, OldB, OldC, OldD, A, B, C, D>
         extends
         AbstractGroupQuadNode<OldA, OldB, OldC, OldD, QuadTuple<A, B, C, D>, Quadruple<A, B, C, D>, Void, Void> {
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/IndexedIfExistsQuadNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/IndexedIfExistsQuadNode.java
similarity index 77%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/IndexedIfExistsQuadNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/IndexedIfExistsQuadNode.java
index f8c299d674..6984c6502c 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/IndexedIfExistsQuadNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/IndexedIfExistsQuadNode.java
@@ -1,18 +1,18 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.quad;
+package ai.timefold.solver.core.impl.bavet.quad;
 
 import java.util.function.Function;
 
 import ai.timefold.solver.core.api.function.PentaPredicate;
 import ai.timefold.solver.core.api.function.QuadFunction;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractIndexedIfExistsNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.ExistsCounter;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.index.IndexProperties;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.index.Indexer;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
-
-final class IndexedIfExistsQuadNode<A, B, C, D, E> extends AbstractIndexedIfExistsNode<QuadTuple<A, B, C, D>, E> {
+import ai.timefold.solver.core.impl.bavet.common.AbstractIndexedIfExistsNode;
+import ai.timefold.solver.core.impl.bavet.common.ExistsCounter;
+import ai.timefold.solver.core.impl.bavet.common.index.IndexProperties;
+import ai.timefold.solver.core.impl.bavet.common.index.Indexer;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
+
+public final class IndexedIfExistsQuadNode<A, B, C, D, E> extends AbstractIndexedIfExistsNode<QuadTuple<A, B, C, D>, E> {
 
     private final QuadFunction<A, B, C, D, IndexProperties> mappingABCD;
     private final PentaPredicate<A, B, C, D, E> filtering;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/IndexedJoinQuadNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/IndexedJoinQuadNode.java
similarity index 79%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/IndexedJoinQuadNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/IndexedJoinQuadNode.java
index 02b9f8bfed..707130c0b8 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/IndexedJoinQuadNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/IndexedJoinQuadNode.java
@@ -1,18 +1,18 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.quad;
+package ai.timefold.solver.core.impl.bavet.quad;
 
 import java.util.function.Function;
 
 import ai.timefold.solver.core.api.function.QuadPredicate;
 import ai.timefold.solver.core.api.function.TriFunction;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractIndexedJoinNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.index.IndexProperties;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.index.Indexer;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.common.AbstractIndexedJoinNode;
+import ai.timefold.solver.core.impl.bavet.common.index.IndexProperties;
+import ai.timefold.solver.core.impl.bavet.common.index.Indexer;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 
-final class IndexedJoinQuadNode<A, B, C, D>
+public final class IndexedJoinQuadNode<A, B, C, D>
         extends AbstractIndexedJoinNode<TriTuple<A, B, C>, D, QuadTuple<A, B, C, D>> {
 
     private final TriFunction<A, B, C, IndexProperties> mappingABC;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/MapQuadToBiNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/MapQuadToBiNode.java
similarity index 71%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/MapQuadToBiNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/MapQuadToBiNode.java
index 395e6da752..4bcb76619c 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/MapQuadToBiNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/MapQuadToBiNode.java
@@ -1,19 +1,19 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.quad;
+package ai.timefold.solver.core.impl.bavet.quad;
 
 import java.util.Objects;
 
 import ai.timefold.solver.core.api.function.QuadFunction;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractMapNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.AbstractMapNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 
-final class MapQuadToBiNode<A, B, C, D, NewA, NewB> extends AbstractMapNode<QuadTuple<A, B, C, D>, BiTuple<NewA, NewB>> {
+public final class MapQuadToBiNode<A, B, C, D, NewA, NewB> extends AbstractMapNode<QuadTuple<A, B, C, D>, BiTuple<NewA, NewB>> {
 
     private final QuadFunction<A, B, C, D, NewA> mappingFunctionA;
     private final QuadFunction<A, B, C, D, NewB> mappingFunctionB;
 
-    MapQuadToBiNode(int mapStoreIndex, QuadFunction<A, B, C, D, NewA> mappingFunctionA,
+    public MapQuadToBiNode(int mapStoreIndex, QuadFunction<A, B, C, D, NewA> mappingFunctionA,
             QuadFunction<A, B, C, D, NewB> mappingFunctionB, TupleLifecycle<BiTuple<NewA, NewB>> nextNodesTupleLifecycle,
             int outputStoreSize) {
         super(mapStoreIndex, nextNodesTupleLifecycle, outputStoreSize);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/MapQuadToQuadNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/MapQuadToQuadNode.java
similarity index 83%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/MapQuadToQuadNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/MapQuadToQuadNode.java
index 35aea3bd7e..093edc1300 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/MapQuadToQuadNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/MapQuadToQuadNode.java
@@ -1,13 +1,13 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.quad;
+package ai.timefold.solver.core.impl.bavet.quad;
 
 import java.util.Objects;
 
 import ai.timefold.solver.core.api.function.QuadFunction;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractMapNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.AbstractMapNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 
-final class MapQuadToQuadNode<A, B, C, D, NewA, NewB, NewC, NewD>
+public final class MapQuadToQuadNode<A, B, C, D, NewA, NewB, NewC, NewD>
         extends AbstractMapNode<QuadTuple<A, B, C, D>, QuadTuple<NewA, NewB, NewC, NewD>> {
 
     private final QuadFunction<A, B, C, D, NewA> mappingFunctionA;
@@ -15,7 +15,7 @@ final class MapQuadToQuadNode<A, B, C, D, NewA, NewB, NewC, NewD>
     private final QuadFunction<A, B, C, D, NewC> mappingFunctionC;
     private final QuadFunction<A, B, C, D, NewD> mappingFunctionD;
 
-    MapQuadToQuadNode(int mapStoreIndex, QuadFunction<A, B, C, D, NewA> mappingFunctionA,
+    public MapQuadToQuadNode(int mapStoreIndex, QuadFunction<A, B, C, D, NewA> mappingFunctionA,
             QuadFunction<A, B, C, D, NewB> mappingFunctionB, QuadFunction<A, B, C, D, NewC> mappingFunctionC,
             QuadFunction<A, B, C, D, NewD> mappingFunctionD,
             TupleLifecycle<QuadTuple<NewA, NewB, NewC, NewD>> nextNodesTupleLifecycle, int outputStoreSize) {
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/MapQuadToTriNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/MapQuadToTriNode.java
similarity index 78%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/MapQuadToTriNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/MapQuadToTriNode.java
index 1a28f6bca2..840ac00dfd 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/MapQuadToTriNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/MapQuadToTriNode.java
@@ -1,21 +1,21 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.quad;
+package ai.timefold.solver.core.impl.bavet.quad;
 
 import java.util.Objects;
 
 import ai.timefold.solver.core.api.function.QuadFunction;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractMapNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.AbstractMapNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 
-final class MapQuadToTriNode<A, B, C, D, NewA, NewB, NewC>
+public final class MapQuadToTriNode<A, B, C, D, NewA, NewB, NewC>
         extends AbstractMapNode<QuadTuple<A, B, C, D>, TriTuple<NewA, NewB, NewC>> {
 
     private final QuadFunction<A, B, C, D, NewA> mappingFunctionA;
     private final QuadFunction<A, B, C, D, NewB> mappingFunctionB;
     private final QuadFunction<A, B, C, D, NewC> mappingFunctionC;
 
-    MapQuadToTriNode(int mapStoreIndex, QuadFunction<A, B, C, D, NewA> mappingFunctionA,
+    public MapQuadToTriNode(int mapStoreIndex, QuadFunction<A, B, C, D, NewA> mappingFunctionA,
             QuadFunction<A, B, C, D, NewB> mappingFunctionB, QuadFunction<A, B, C, D, NewC> mappingFunctionC,
             TupleLifecycle<TriTuple<NewA, NewB, NewC>> nextNodesTupleLifecycle, int outputStoreSize) {
         super(mapStoreIndex, nextNodesTupleLifecycle, outputStoreSize);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/MapQuadToUniNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/MapQuadToUniNode.java
similarity index 64%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/MapQuadToUniNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/MapQuadToUniNode.java
index 0127c3ac18..1cfa564cc3 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/MapQuadToUniNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/MapQuadToUniNode.java
@@ -1,18 +1,18 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.quad;
+package ai.timefold.solver.core.impl.bavet.quad;
 
 import java.util.Objects;
 
 import ai.timefold.solver.core.api.function.QuadFunction;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractMapNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.common.AbstractMapNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 
-final class MapQuadToUniNode<A, B, C, D, NewA> extends AbstractMapNode<QuadTuple<A, B, C, D>, UniTuple<NewA>> {
+public final class MapQuadToUniNode<A, B, C, D, NewA> extends AbstractMapNode<QuadTuple<A, B, C, D>, UniTuple<NewA>> {
 
     private final QuadFunction<A, B, C, D, NewA> mappingFunction;
 
-    MapQuadToUniNode(int mapStoreIndex, QuadFunction<A, B, C, D, NewA> mappingFunction,
+    public MapQuadToUniNode(int mapStoreIndex, QuadFunction<A, B, C, D, NewA> mappingFunction,
             TupleLifecycle<UniTuple<NewA>> nextNodesTupleLifecycle, int outputStoreSize) {
         super(mapStoreIndex, nextNodesTupleLifecycle, outputStoreSize);
         this.mappingFunction = Objects.requireNonNull(mappingFunction);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/UnindexedIfExistsQuadNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/UnindexedIfExistsQuadNode.java
similarity index 73%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/UnindexedIfExistsQuadNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/UnindexedIfExistsQuadNode.java
index dd9e507580..88de613585 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/UnindexedIfExistsQuadNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/UnindexedIfExistsQuadNode.java
@@ -1,12 +1,12 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.quad;
+package ai.timefold.solver.core.impl.bavet.quad;
 
 import ai.timefold.solver.core.api.function.PentaPredicate;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractUnindexedIfExistsNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.common.AbstractUnindexedIfExistsNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 
-final class UnindexedIfExistsQuadNode<A, B, C, D, E> extends AbstractUnindexedIfExistsNode<QuadTuple<A, B, C, D>, E> {
+public final class UnindexedIfExistsQuadNode<A, B, C, D, E> extends AbstractUnindexedIfExistsNode<QuadTuple<A, B, C, D>, E> {
 
     private final PentaPredicate<A, B, C, D, E> filtering;
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/UnindexedJoinQuadNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/UnindexedJoinQuadNode.java
similarity index 78%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/UnindexedJoinQuadNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/UnindexedJoinQuadNode.java
index d4d88b779b..96111c2bc3 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/UnindexedJoinQuadNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/quad/UnindexedJoinQuadNode.java
@@ -1,13 +1,13 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.quad;
+package ai.timefold.solver.core.impl.bavet.quad;
 
 import ai.timefold.solver.core.api.function.QuadPredicate;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractUnindexedJoinNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.common.AbstractUnindexedJoinNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 
-final class UnindexedJoinQuadNode<A, B, C, D>
+public final class UnindexedJoinQuadNode<A, B, C, D>
         extends AbstractUnindexedJoinNode<TriTuple<A, B, C>, D, QuadTuple<A, B, C, D>> {
 
     private final QuadPredicate<A, B, C, D> filtering;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/AbstractGroupTriNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/AbstractGroupTriNode.java
similarity index 82%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/AbstractGroupTriNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/AbstractGroupTriNode.java
index 3d976d1c24..c5b9842fd4 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/AbstractGroupTriNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/AbstractGroupTriNode.java
@@ -1,14 +1,14 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.tri;
+package ai.timefold.solver.core.impl.bavet.tri;
 
 import java.util.function.Function;
 
 import ai.timefold.solver.core.api.function.QuadFunction;
 import ai.timefold.solver.core.api.score.stream.tri.TriConstraintCollector;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractGroupNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.AbstractTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.AbstractGroupNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.AbstractTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 
 abstract class AbstractGroupTriNode<OldA, OldB, OldC, OutTuple_ extends AbstractTuple, GroupKey_, ResultContainer_, Result_>
         extends AbstractGroupNode<TriTuple<OldA, OldB, OldC>, OutTuple_, GroupKey_, ResultContainer_, Result_> {
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/ConcatBiTriNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/ConcatBiTriNode.java
similarity index 75%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/ConcatBiTriNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/ConcatBiTriNode.java
index 2ce8707015..cd74e7f1b1 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/ConcatBiTriNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/ConcatBiTriNode.java
@@ -1,18 +1,18 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.tri;
+package ai.timefold.solver.core.impl.bavet.tri;
 
 import java.util.function.BiFunction;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractConcatNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.AbstractConcatNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 
-final class ConcatBiTriNode<A, B, C>
+public final class ConcatBiTriNode<A, B, C>
         extends AbstractConcatNode<BiTuple<A, B>, TriTuple<A, B, C>, TriTuple<A, B, C>> {
 
     private final BiFunction<A, B, C> paddingFunction;
 
-    ConcatBiTriNode(BiFunction<A, B, C> paddingFunction,
+    public ConcatBiTriNode(BiFunction<A, B, C> paddingFunction,
             TupleLifecycle<TriTuple<A, B, C>> nextNodesTupleLifecycle,
             int inputStoreIndexLeftOutTupleList, int inputStoreIndexRightOutTupleList,
             int outputStoreSize) {
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/ConcatTriBiNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/ConcatTriBiNode.java
similarity index 75%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/ConcatTriBiNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/ConcatTriBiNode.java
index cdc3232fc5..d0e5ec270c 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/ConcatTriBiNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/ConcatTriBiNode.java
@@ -1,18 +1,18 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.tri;
+package ai.timefold.solver.core.impl.bavet.tri;
 
 import java.util.function.BiFunction;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractConcatNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.AbstractConcatNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 
-final class ConcatTriBiNode<A, B, C>
+public final class ConcatTriBiNode<A, B, C>
         extends AbstractConcatNode<TriTuple<A, B, C>, BiTuple<A, B>, TriTuple<A, B, C>> {
 
     private final BiFunction<A, B, C> paddingFunction;
 
-    ConcatTriBiNode(BiFunction<A, B, C> paddingFunction,
+    public ConcatTriBiNode(BiFunction<A, B, C> paddingFunction,
             TupleLifecycle<TriTuple<A, B, C>> nextNodesTupleLifecycle,
             int inputStoreIndexLeftOutTupleList, int inputStoreIndexRightOutTupleList,
             int outputStoreSize) {
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/ConcatTriTriNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/ConcatTriTriNode.java
similarity index 72%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/ConcatTriTriNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/ConcatTriTriNode.java
index a5e37c002d..5a7d9f2c3d 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/ConcatTriTriNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/ConcatTriTriNode.java
@@ -1,13 +1,13 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.tri;
+package ai.timefold.solver.core.impl.bavet.tri;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractConcatNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.AbstractConcatNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 
-final class ConcatTriTriNode<A, B, C>
+public final class ConcatTriTriNode<A, B, C>
         extends AbstractConcatNode<TriTuple<A, B, C>, TriTuple<A, B, C>, TriTuple<A, B, C>> {
 
-    ConcatTriTriNode(TupleLifecycle<TriTuple<A, B, C>> nextNodesTupleLifecycle, int inputStoreIndexLeftOutTupleList,
+    public ConcatTriTriNode(TupleLifecycle<TriTuple<A, B, C>> nextNodesTupleLifecycle, int inputStoreIndexLeftOutTupleList,
             int inputStoreIndexRightOutTupleList,
             int outputStoreSize) {
         super(nextNodesTupleLifecycle, inputStoreIndexLeftOutTupleList, inputStoreIndexRightOutTupleList, outputStoreSize);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/ConcatTriUniNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/ConcatTriUniNode.java
similarity index 75%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/ConcatTriUniNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/ConcatTriUniNode.java
index e65c87daf2..3fcfd5135c 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/ConcatTriUniNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/ConcatTriUniNode.java
@@ -1,19 +1,19 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.tri;
+package ai.timefold.solver.core.impl.bavet.tri;
 
 import java.util.function.Function;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractConcatNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.common.AbstractConcatNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 
-final class ConcatTriUniNode<A, B, C>
+public final class ConcatTriUniNode<A, B, C>
         extends AbstractConcatNode<TriTuple<A, B, C>, UniTuple<A>, TriTuple<A, B, C>> {
 
     private final Function<A, B> paddingFunctionB;
     private final Function<A, C> paddingFunctionC;
 
-    ConcatTriUniNode(Function<A, B> paddingFunctionB, Function<A, C> paddingFunctionC,
+    public ConcatTriUniNode(Function<A, B> paddingFunctionB, Function<A, C> paddingFunctionC,
             TupleLifecycle<TriTuple<A, B, C>> nextNodesTupleLifecycle,
             int inputStoreIndexLeftOutTupleList, int inputStoreIndexRightOutTupleList,
             int outputStoreSize) {
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/ConcatUniTriNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/ConcatUniTriNode.java
similarity index 75%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/ConcatUniTriNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/ConcatUniTriNode.java
index fe1673e842..3a701e7a2f 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/ConcatUniTriNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/ConcatUniTriNode.java
@@ -1,19 +1,19 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.tri;
+package ai.timefold.solver.core.impl.bavet.tri;
 
 import java.util.function.Function;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractConcatNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.common.AbstractConcatNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 
-final class ConcatUniTriNode<A, B, C>
+public final class ConcatUniTriNode<A, B, C>
         extends AbstractConcatNode<UniTuple<A>, TriTuple<A, B, C>, TriTuple<A, B, C>> {
 
     private final Function<A, B> paddingFunctionB;
     private final Function<A, C> paddingFunctionC;
 
-    ConcatUniTriNode(Function<A, B> paddingFunctionB, Function<A, C> paddingFunctionC,
+    public ConcatUniTriNode(Function<A, B> paddingFunctionB, Function<A, C> paddingFunctionC,
             TupleLifecycle<TriTuple<A, B, C>> nextNodesTupleLifecycle,
             int inputStoreIndexLeftOutTupleList, int inputStoreIndexRightOutTupleList,
             int outputStoreSize) {
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/ConditionalTriTupleLifecycle.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/ConditionalTriTupleLifecycle.java
similarity index 51%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/ConditionalTriTupleLifecycle.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/ConditionalTriTupleLifecycle.java
index 0b78314a1f..fcb030bd40 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/ConditionalTriTupleLifecycle.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/ConditionalTriTupleLifecycle.java
@@ -1,11 +1,11 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.tri;
+package ai.timefold.solver.core.impl.bavet.tri;
 
 import ai.timefold.solver.core.api.function.TriPredicate;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.AbstractConditionalTupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.AbstractConditionalTupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 
-final class ConditionalTriTupleLifecycle<A, B, C> extends AbstractConditionalTupleLifecycle<TriTuple<A, B, C>> {
+public final class ConditionalTriTupleLifecycle<A, B, C> extends AbstractConditionalTupleLifecycle<TriTuple<A, B, C>> {
     private final TriPredicate<A, B, C> predicate;
 
     public ConditionalTriTupleLifecycle(TriPredicate<A, B, C> predicate, TupleLifecycle<TriTuple<A, B, C>> tupleLifecycle) {
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/FlattenLastTriNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/FlattenLastTriNode.java
similarity index 65%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/FlattenLastTriNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/FlattenLastTriNode.java
index 1c9ec71449..40f2234fa7 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/FlattenLastTriNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/FlattenLastTriNode.java
@@ -1,17 +1,17 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.tri;
+package ai.timefold.solver.core.impl.bavet.tri;
 
 import java.util.function.Function;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractFlattenLastNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.AbstractFlattenLastNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 
-final class FlattenLastTriNode<A, B, C, NewC>
+public final class FlattenLastTriNode<A, B, C, NewC>
         extends AbstractFlattenLastNode<TriTuple<A, B, C>, TriTuple<A, B, NewC>, C, NewC> {
 
     private final int outputStoreSize;
 
-    FlattenLastTriNode(int flattenLastStoreIndex, Function<C, Iterable<NewC>> mappingFunction,
+    public FlattenLastTriNode(int flattenLastStoreIndex, Function<C, Iterable<NewC>> mappingFunction,
             TupleLifecycle<TriTuple<A, B, NewC>> nextNodesTupleLifecycle, int outputStoreSize) {
         super(flattenLastStoreIndex, mappingFunction, nextNodesTupleLifecycle);
         this.outputStoreSize = outputStoreSize;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/Group0Mapping1CollectorTriNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/Group0Mapping1CollectorTriNode.java
similarity index 76%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/Group0Mapping1CollectorTriNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/Group0Mapping1CollectorTriNode.java
index fe30b69004..66ee29ad50 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/Group0Mapping1CollectorTriNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/Group0Mapping1CollectorTriNode.java
@@ -1,11 +1,11 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.tri;
+package ai.timefold.solver.core.impl.bavet.tri;
 
 import ai.timefold.solver.core.api.score.stream.tri.TriConstraintCollector;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 
-final class Group0Mapping1CollectorTriNode<OldA, OldB, OldC, A, ResultContainer_>
+public final class Group0Mapping1CollectorTriNode<OldA, OldB, OldC, A, ResultContainer_>
         extends AbstractGroupTriNode<OldA, OldB, OldC, UniTuple<A>, Void, ResultContainer_, A> {
 
     private final int outputStoreSize;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/Group0Mapping2CollectorTriNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/Group0Mapping2CollectorTriNode.java
similarity index 85%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/Group0Mapping2CollectorTriNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/Group0Mapping2CollectorTriNode.java
index 87cb83aebc..6f1bf300c8 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/Group0Mapping2CollectorTriNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/Group0Mapping2CollectorTriNode.java
@@ -1,13 +1,13 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.tri;
+package ai.timefold.solver.core.impl.bavet.tri;
 
 import ai.timefold.solver.core.api.score.stream.ConstraintCollectors;
 import ai.timefold.solver.core.api.score.stream.tri.TriConstraintCollector;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 import ai.timefold.solver.core.impl.util.Pair;
 
-final class Group0Mapping2CollectorTriNode<OldA, OldB, OldC, A, B, ResultContainerA_, ResultContainerB_>
+public final class Group0Mapping2CollectorTriNode<OldA, OldB, OldC, A, B, ResultContainerA_, ResultContainerB_>
         extends AbstractGroupTriNode<OldA, OldB, OldC, BiTuple<A, B>, Void, Object, Pair<A, B>> {
 
     private final int outputStoreSize;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/Group0Mapping3CollectorTriNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/Group0Mapping3CollectorTriNode.java
similarity index 86%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/Group0Mapping3CollectorTriNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/Group0Mapping3CollectorTriNode.java
index 0ea45e0eee..35f79968c3 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/Group0Mapping3CollectorTriNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/Group0Mapping3CollectorTriNode.java
@@ -1,13 +1,13 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.tri;
+package ai.timefold.solver.core.impl.bavet.tri;
 
 import ai.timefold.solver.core.api.score.stream.ConstraintCollectors;
 import ai.timefold.solver.core.api.score.stream.tri.TriConstraintCollector;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 import ai.timefold.solver.core.impl.util.Triple;
 
-final class Group0Mapping3CollectorTriNode<OldA, OldB, OldC, A, B, C, ResultContainerA_, ResultContainerB_, ResultContainerC_>
+public final class Group0Mapping3CollectorTriNode<OldA, OldB, OldC, A, B, C, ResultContainerA_, ResultContainerB_, ResultContainerC_>
         extends
         AbstractGroupTriNode<OldA, OldB, OldC, TriTuple<A, B, C>, Void, Object, Triple<A, B, C>> {
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/Group0Mapping4CollectorTriNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/Group0Mapping4CollectorTriNode.java
similarity index 87%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/Group0Mapping4CollectorTriNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/Group0Mapping4CollectorTriNode.java
index c3f101c0b0..5a1e4f9f1f 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/Group0Mapping4CollectorTriNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/Group0Mapping4CollectorTriNode.java
@@ -1,13 +1,13 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.tri;
+package ai.timefold.solver.core.impl.bavet.tri;
 
 import ai.timefold.solver.core.api.score.stream.ConstraintCollectors;
 import ai.timefold.solver.core.api.score.stream.tri.TriConstraintCollector;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 import ai.timefold.solver.core.impl.util.Quadruple;
 
-final class Group0Mapping4CollectorTriNode<OldA, OldB, OldC, A, B, C, D, ResultContainerA_, ResultContainerB_, ResultContainerC_, ResultContainerD_>
+public final class Group0Mapping4CollectorTriNode<OldA, OldB, OldC, A, B, C, D, ResultContainerA_, ResultContainerB_, ResultContainerC_, ResultContainerD_>
         extends
         AbstractGroupTriNode<OldA, OldB, OldC, QuadTuple<A, B, C, D>, Void, Object, Quadruple<A, B, C, D>> {
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/Group1Mapping0CollectorTriNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/Group1Mapping0CollectorTriNode.java
similarity index 77%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/Group1Mapping0CollectorTriNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/Group1Mapping0CollectorTriNode.java
index 55dbd17d1f..4cbb7d15d5 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/Group1Mapping0CollectorTriNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/Group1Mapping0CollectorTriNode.java
@@ -1,12 +1,12 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.tri;
+package ai.timefold.solver.core.impl.bavet.tri;
 
 import ai.timefold.solver.core.api.function.TriFunction;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 
-final class Group1Mapping0CollectorTriNode<OldA, OldB, OldC, A>
+public final class Group1Mapping0CollectorTriNode<OldA, OldB, OldC, A>
         extends AbstractGroupTriNode<OldA, OldB, OldC, UniTuple<A>, A, Void, Void> {
 
     private final int outputStoreSize;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/Group1Mapping1CollectorTriNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/Group1Mapping1CollectorTriNode.java
similarity index 79%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/Group1Mapping1CollectorTriNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/Group1Mapping1CollectorTriNode.java
index b5c32854b8..378e942430 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/Group1Mapping1CollectorTriNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/Group1Mapping1CollectorTriNode.java
@@ -1,12 +1,12 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.tri;
+package ai.timefold.solver.core.impl.bavet.tri;
 
 import ai.timefold.solver.core.api.function.TriFunction;
 import ai.timefold.solver.core.api.score.stream.tri.TriConstraintCollector;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 
-final class Group1Mapping1CollectorTriNode<OldA, OldB, OldC, A, B, ResultContainer_>
+public final class Group1Mapping1CollectorTriNode<OldA, OldB, OldC, A, B, ResultContainer_>
         extends AbstractGroupTriNode<OldA, OldB, OldC, BiTuple<A, B>, A, ResultContainer_, B> {
 
     private final int outputStoreSize;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/Group1Mapping2CollectorTriNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/Group1Mapping2CollectorTriNode.java
similarity index 81%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/Group1Mapping2CollectorTriNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/Group1Mapping2CollectorTriNode.java
index a04b9c92a4..de9a567c60 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/Group1Mapping2CollectorTriNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/Group1Mapping2CollectorTriNode.java
@@ -1,13 +1,13 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.tri;
+package ai.timefold.solver.core.impl.bavet.tri;
 
 import ai.timefold.solver.core.api.function.TriFunction;
 import ai.timefold.solver.core.api.score.stream.tri.TriConstraintCollector;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 import ai.timefold.solver.core.impl.util.Pair;
 
-final class Group1Mapping2CollectorTriNode<OldA, OldB, OldC, A, B, C, ResultContainerB_, ResultContainerC_>
+public final class Group1Mapping2CollectorTriNode<OldA, OldB, OldC, A, B, C, ResultContainerB_, ResultContainerC_>
         extends AbstractGroupTriNode<OldA, OldB, OldC, TriTuple<A, B, C>, A, Object, Pair<B, C>> {
 
     private final int outputStoreSize;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/Group1Mapping3CollectorTriNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/Group1Mapping3CollectorTriNode.java
similarity index 82%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/Group1Mapping3CollectorTriNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/Group1Mapping3CollectorTriNode.java
index 9f08c3921a..017e952e8b 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/Group1Mapping3CollectorTriNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/Group1Mapping3CollectorTriNode.java
@@ -1,13 +1,13 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.tri;
+package ai.timefold.solver.core.impl.bavet.tri;
 
 import ai.timefold.solver.core.api.function.TriFunction;
 import ai.timefold.solver.core.api.score.stream.tri.TriConstraintCollector;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 import ai.timefold.solver.core.impl.util.Triple;
 
-final class Group1Mapping3CollectorTriNode<OldA, OldB, OldC, A, B, C, D, ResultContainerB_, ResultContainerC_, ResultContainerD_>
+public final class Group1Mapping3CollectorTriNode<OldA, OldB, OldC, A, B, C, D, ResultContainerB_, ResultContainerC_, ResultContainerD_>
         extends
         AbstractGroupTriNode<OldA, OldB, OldC, QuadTuple<A, B, C, D>, A, Object, Triple<B, C, D>> {
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/Group2Mapping0CollectorTriNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/Group2Mapping0CollectorTriNode.java
similarity index 81%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/Group2Mapping0CollectorTriNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/Group2Mapping0CollectorTriNode.java
index dd544e1e41..914cd9713c 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/Group2Mapping0CollectorTriNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/Group2Mapping0CollectorTriNode.java
@@ -1,13 +1,13 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.tri;
+package ai.timefold.solver.core.impl.bavet.tri;
 
 import ai.timefold.solver.core.api.function.TriFunction;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 import ai.timefold.solver.core.impl.util.Pair;
 
-final class Group2Mapping0CollectorTriNode<OldA, OldB, OldC, A, B>
+public final class Group2Mapping0CollectorTriNode<OldA, OldB, OldC, A, B>
         extends AbstractGroupTriNode<OldA, OldB, OldC, BiTuple<A, B>, Pair<A, B>, Void, Void> {
 
     private final int outputStoreSize;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/Group2Mapping1CollectorTriNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/Group2Mapping1CollectorTriNode.java
similarity index 82%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/Group2Mapping1CollectorTriNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/Group2Mapping1CollectorTriNode.java
index 1096cfc4df..ca11f32cd2 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/Group2Mapping1CollectorTriNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/Group2Mapping1CollectorTriNode.java
@@ -1,13 +1,13 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.tri;
+package ai.timefold.solver.core.impl.bavet.tri;
 
 import ai.timefold.solver.core.api.function.TriFunction;
 import ai.timefold.solver.core.api.score.stream.tri.TriConstraintCollector;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 import ai.timefold.solver.core.impl.util.Pair;
 
-final class Group2Mapping1CollectorTriNode<OldA, OldB, OldC, A, B, C, ResultContainer_>
+public final class Group2Mapping1CollectorTriNode<OldA, OldB, OldC, A, B, C, ResultContainer_>
         extends
         AbstractGroupTriNode<OldA, OldB, OldC, TriTuple<A, B, C>, Pair<A, B>, ResultContainer_, C> {
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/Group2Mapping2CollectorTriNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/Group2Mapping2CollectorTriNode.java
similarity index 83%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/Group2Mapping2CollectorTriNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/Group2Mapping2CollectorTriNode.java
index c57934cd96..a1cf2fe149 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/Group2Mapping2CollectorTriNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/Group2Mapping2CollectorTriNode.java
@@ -1,13 +1,13 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.tri;
+package ai.timefold.solver.core.impl.bavet.tri;
 
 import ai.timefold.solver.core.api.function.TriFunction;
 import ai.timefold.solver.core.api.score.stream.tri.TriConstraintCollector;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 import ai.timefold.solver.core.impl.util.Pair;
 
-final class Group2Mapping2CollectorTriNode<OldA, OldB, OldC, A, B, C, D, ResultContainerC_, ResultContainerD_>
+public final class Group2Mapping2CollectorTriNode<OldA, OldB, OldC, A, B, C, D, ResultContainerC_, ResultContainerD_>
         extends
         AbstractGroupTriNode<OldA, OldB, OldC, QuadTuple<A, B, C, D>, Pair<A, B>, Object, Pair<C, D>> {
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/Group3Mapping0CollectorTriNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/Group3Mapping0CollectorTriNode.java
similarity index 86%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/Group3Mapping0CollectorTriNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/Group3Mapping0CollectorTriNode.java
index 74af3857e9..6197fc87e0 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/Group3Mapping0CollectorTriNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/Group3Mapping0CollectorTriNode.java
@@ -1,12 +1,12 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.tri;
+package ai.timefold.solver.core.impl.bavet.tri;
 
 import ai.timefold.solver.core.api.function.TriFunction;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 import ai.timefold.solver.core.impl.util.Triple;
 
-final class Group3Mapping0CollectorTriNode<OldA, OldB, OldC, A, B, C>
+public final class Group3Mapping0CollectorTriNode<OldA, OldB, OldC, A, B, C>
         extends AbstractGroupTriNode<OldA, OldB, OldC, TriTuple<A, B, C>, Triple<A, B, C>, Void, Void> {
 
     private final int outputStoreSize;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/Group3Mapping1CollectorTriNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/Group3Mapping1CollectorTriNode.java
similarity index 77%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/Group3Mapping1CollectorTriNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/Group3Mapping1CollectorTriNode.java
index 8164071df8..00a2cb7657 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/Group3Mapping1CollectorTriNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/Group3Mapping1CollectorTriNode.java
@@ -1,15 +1,15 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.tri;
+package ai.timefold.solver.core.impl.bavet.tri;
 
-import static ai.timefold.solver.core.impl.score.stream.bavet.tri.Group3Mapping0CollectorTriNode.createGroupKey;
+import static ai.timefold.solver.core.impl.bavet.tri.Group3Mapping0CollectorTriNode.createGroupKey;
 
 import ai.timefold.solver.core.api.function.TriFunction;
 import ai.timefold.solver.core.api.score.stream.tri.TriConstraintCollector;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 import ai.timefold.solver.core.impl.util.Triple;
 
-final class Group3Mapping1CollectorTriNode<OldA, OldB, OldC, A, B, C, D, ResultContainer_>
+public final class Group3Mapping1CollectorTriNode<OldA, OldB, OldC, A, B, C, D, ResultContainer_>
         extends
         AbstractGroupTriNode<OldA, OldB, OldC, QuadTuple<A, B, C, D>, Triple<A, B, C>, ResultContainer_, D> {
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/Group4Mapping0CollectorTriNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/Group4Mapping0CollectorTriNode.java
similarity index 85%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/Group4Mapping0CollectorTriNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/Group4Mapping0CollectorTriNode.java
index bf70d7af43..c1d926fdfb 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/Group4Mapping0CollectorTriNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/Group4Mapping0CollectorTriNode.java
@@ -1,13 +1,13 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.tri;
+package ai.timefold.solver.core.impl.bavet.tri;
 
 import ai.timefold.solver.core.api.function.TriFunction;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 import ai.timefold.solver.core.impl.util.Quadruple;
 
-final class Group4Mapping0CollectorTriNode<OldA, OldB, OldC, A, B, C, D>
+public final class Group4Mapping0CollectorTriNode<OldA, OldB, OldC, A, B, C, D>
         extends
         AbstractGroupTriNode<OldA, OldB, OldC, QuadTuple<A, B, C, D>, Quadruple<A, B, C, D>, Void, Void> {
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/IndexedIfExistsTriNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/IndexedIfExistsTriNode.java
similarity index 77%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/IndexedIfExistsTriNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/IndexedIfExistsTriNode.java
index b05887ce56..e3c9cb548c 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/IndexedIfExistsTriNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/IndexedIfExistsTriNode.java
@@ -1,18 +1,18 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.tri;
+package ai.timefold.solver.core.impl.bavet.tri;
 
 import java.util.function.Function;
 
 import ai.timefold.solver.core.api.function.QuadPredicate;
 import ai.timefold.solver.core.api.function.TriFunction;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractIndexedIfExistsNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.ExistsCounter;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.index.IndexProperties;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.index.Indexer;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
-
-final class IndexedIfExistsTriNode<A, B, C, D> extends AbstractIndexedIfExistsNode<TriTuple<A, B, C>, D> {
+import ai.timefold.solver.core.impl.bavet.common.AbstractIndexedIfExistsNode;
+import ai.timefold.solver.core.impl.bavet.common.ExistsCounter;
+import ai.timefold.solver.core.impl.bavet.common.index.IndexProperties;
+import ai.timefold.solver.core.impl.bavet.common.index.Indexer;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
+
+public final class IndexedIfExistsTriNode<A, B, C, D> extends AbstractIndexedIfExistsNode<TriTuple<A, B, C>, D> {
 
     private final TriFunction<A, B, C, IndexProperties> mappingABC;
     private final QuadPredicate<A, B, C, D> filtering;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/IndexedJoinTriNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/IndexedJoinTriNode.java
similarity index 78%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/IndexedJoinTriNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/IndexedJoinTriNode.java
index 3e9eec2fc8..afef54ff53 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/IndexedJoinTriNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/IndexedJoinTriNode.java
@@ -1,18 +1,18 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.tri;
+package ai.timefold.solver.core.impl.bavet.tri;
 
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
 import ai.timefold.solver.core.api.function.TriPredicate;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractIndexedJoinNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.index.IndexProperties;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.index.Indexer;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.common.AbstractIndexedJoinNode;
+import ai.timefold.solver.core.impl.bavet.common.index.IndexProperties;
+import ai.timefold.solver.core.impl.bavet.common.index.Indexer;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 
-final class IndexedJoinTriNode<A, B, C>
+public final class IndexedJoinTriNode<A, B, C>
         extends AbstractIndexedJoinNode<BiTuple<A, B>, C, TriTuple<A, B, C>> {
 
     private final BiFunction<A, B, IndexProperties> mappingAB;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/MapTriToBiNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/MapTriToBiNode.java
similarity index 67%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/MapTriToBiNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/MapTriToBiNode.java
index b5436008f0..4c97783376 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/MapTriToBiNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/MapTriToBiNode.java
@@ -1,19 +1,20 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.tri;
+package ai.timefold.solver.core.impl.bavet.tri;
 
 import java.util.Objects;
 
 import ai.timefold.solver.core.api.function.TriFunction;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractMapNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.AbstractMapNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 
-final class MapTriToBiNode<A, B, C, NewA, NewB> extends AbstractMapNode<TriTuple<A, B, C>, BiTuple<NewA, NewB>> {
+public final class MapTriToBiNode<A, B, C, NewA, NewB> extends AbstractMapNode<TriTuple<A, B, C>, BiTuple<NewA, NewB>> {
 
     private final TriFunction<A, B, C, NewA> mappingFunctionA;
     private final TriFunction<A, B, C, NewB> mappingFunctionB;
 
-    MapTriToBiNode(int mapStoreIndex, TriFunction<A, B, C, NewA> mappingFunctionA, TriFunction<A, B, C, NewB> mappingFunctionB,
+    public MapTriToBiNode(int mapStoreIndex, TriFunction<A, B, C, NewA> mappingFunctionA,
+            TriFunction<A, B, C, NewB> mappingFunctionB,
             TupleLifecycle<BiTuple<NewA, NewB>> nextNodesTupleLifecycle, int outputStoreSize) {
         super(mapStoreIndex, nextNodesTupleLifecycle, outputStoreSize);
         this.mappingFunctionA = Objects.requireNonNull(mappingFunctionA);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/MapTriToQuadNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/MapTriToQuadNode.java
similarity index 80%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/MapTriToQuadNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/MapTriToQuadNode.java
index c1866baa5b..d2cb5857a0 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/MapTriToQuadNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/MapTriToQuadNode.java
@@ -1,14 +1,14 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.tri;
+package ai.timefold.solver.core.impl.bavet.tri;
 
 import java.util.Objects;
 
 import ai.timefold.solver.core.api.function.TriFunction;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractMapNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.AbstractMapNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 
-final class MapTriToQuadNode<A, B, C, NewA, NewB, NewC, NewD>
+public final class MapTriToQuadNode<A, B, C, NewA, NewB, NewC, NewD>
         extends AbstractMapNode<TriTuple<A, B, C>, QuadTuple<NewA, NewB, NewC, NewD>> {
 
     private final TriFunction<A, B, C, NewA> mappingFunctionA;
@@ -16,7 +16,7 @@ final class MapTriToQuadNode<A, B, C, NewA, NewB, NewC, NewD>
     private final TriFunction<A, B, C, NewC> mappingFunctionC;
     private final TriFunction<A, B, C, NewD> mappingFunctionD;
 
-    MapTriToQuadNode(int mapStoreIndex, TriFunction<A, B, C, NewA> mappingFunctionA,
+    public MapTriToQuadNode(int mapStoreIndex, TriFunction<A, B, C, NewA> mappingFunctionA,
             TriFunction<A, B, C, NewB> mappingFunctionB, TriFunction<A, B, C, NewC> mappingFunctionC,
             TriFunction<A, B, C, NewD> mappingFunctionD,
             TupleLifecycle<QuadTuple<NewA, NewB, NewC, NewD>> nextNodesTupleLifecycle, int outputStoreSize) {
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/MapTriToTriNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/MapTriToTriNode.java
similarity index 78%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/MapTriToTriNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/MapTriToTriNode.java
index fc325249a8..2479cd603c 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/MapTriToTriNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/MapTriToTriNode.java
@@ -1,20 +1,21 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.tri;
+package ai.timefold.solver.core.impl.bavet.tri;
 
 import java.util.Objects;
 
 import ai.timefold.solver.core.api.function.TriFunction;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractMapNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.AbstractMapNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 
-final class MapTriToTriNode<A, B, C, NewA, NewB, NewC>
+public final class MapTriToTriNode<A, B, C, NewA, NewB, NewC>
         extends AbstractMapNode<TriTuple<A, B, C>, TriTuple<NewA, NewB, NewC>> {
 
     private final TriFunction<A, B, C, NewA> mappingFunctionA;
     private final TriFunction<A, B, C, NewB> mappingFunctionB;
     private final TriFunction<A, B, C, NewC> mappingFunctionC;
 
-    MapTriToTriNode(int mapStoreIndex, TriFunction<A, B, C, NewA> mappingFunctionA, TriFunction<A, B, C, NewB> mappingFunctionB,
+    public MapTriToTriNode(int mapStoreIndex, TriFunction<A, B, C, NewA> mappingFunctionA,
+            TriFunction<A, B, C, NewB> mappingFunctionB,
             TriFunction<A, B, C, NewC> mappingFunctionC, TupleLifecycle<TriTuple<NewA, NewB, NewC>> nextNodesTupleLifecycle,
             int outputStoreSize) {
         super(mapStoreIndex, nextNodesTupleLifecycle, outputStoreSize);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/MapTriToUniNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/MapTriToUniNode.java
similarity index 63%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/MapTriToUniNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/MapTriToUniNode.java
index 41e0b5b81b..bcbce11a16 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/MapTriToUniNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/MapTriToUniNode.java
@@ -1,18 +1,18 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.tri;
+package ai.timefold.solver.core.impl.bavet.tri;
 
 import java.util.Objects;
 
 import ai.timefold.solver.core.api.function.TriFunction;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractMapNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.common.AbstractMapNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 
-final class MapTriToUniNode<A, B, C, NewA> extends AbstractMapNode<TriTuple<A, B, C>, UniTuple<NewA>> {
+public final class MapTriToUniNode<A, B, C, NewA> extends AbstractMapNode<TriTuple<A, B, C>, UniTuple<NewA>> {
 
     private final TriFunction<A, B, C, NewA> mappingFunction;
 
-    MapTriToUniNode(int mapStoreIndex, TriFunction<A, B, C, NewA> mappingFunction,
+    public MapTriToUniNode(int mapStoreIndex, TriFunction<A, B, C, NewA> mappingFunction,
             TupleLifecycle<UniTuple<NewA>> nextNodesTupleLifecycle, int outputStoreSize) {
         super(mapStoreIndex, nextNodesTupleLifecycle, outputStoreSize);
         this.mappingFunction = Objects.requireNonNull(mappingFunction);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/UnindexedIfExistsTriNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/UnindexedIfExistsTriNode.java
similarity index 72%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/UnindexedIfExistsTriNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/UnindexedIfExistsTriNode.java
index 8b84f24feb..b83d7623f1 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/UnindexedIfExistsTriNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/UnindexedIfExistsTriNode.java
@@ -1,12 +1,12 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.tri;
+package ai.timefold.solver.core.impl.bavet.tri;
 
 import ai.timefold.solver.core.api.function.QuadPredicate;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractUnindexedIfExistsNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.common.AbstractUnindexedIfExistsNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 
-final class UnindexedIfExistsTriNode<A, B, C, D> extends AbstractUnindexedIfExistsNode<TriTuple<A, B, C>, D> {
+public final class UnindexedIfExistsTriNode<A, B, C, D> extends AbstractUnindexedIfExistsNode<TriTuple<A, B, C>, D> {
 
     private final QuadPredicate<A, B, C, D> filtering;
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/UnindexedJoinTriNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/UnindexedJoinTriNode.java
similarity index 77%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/UnindexedJoinTriNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/UnindexedJoinTriNode.java
index d1d60b0901..0755e70dc5 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/UnindexedJoinTriNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/tri/UnindexedJoinTriNode.java
@@ -1,13 +1,13 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.tri;
+package ai.timefold.solver.core.impl.bavet.tri;
 
 import ai.timefold.solver.core.api.function.TriPredicate;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractUnindexedJoinNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.common.AbstractUnindexedJoinNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 
-final class UnindexedJoinTriNode<A, B, C>
+public final class UnindexedJoinTriNode<A, B, C>
         extends AbstractUnindexedJoinNode<BiTuple<A, B>, C, TriTuple<A, B, C>> {
 
     private final TriPredicate<A, B, C> filtering;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/AbstractForEachUniNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/AbstractForEachUniNode.java
similarity index 69%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/AbstractForEachUniNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/AbstractForEachUniNode.java
index 69538c1da2..6f89934d00 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/AbstractForEachUniNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/AbstractForEachUniNode.java
@@ -1,33 +1,33 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.uni;
+package ai.timefold.solver.core.impl.bavet.uni;
 
 import java.util.IdentityHashMap;
 import java.util.Map;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.Propagator;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.StaticPropagationQueue;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleState;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.common.AbstractNode;
+import ai.timefold.solver.core.impl.bavet.common.Propagator;
+import ai.timefold.solver.core.impl.bavet.common.StaticPropagationQueue;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleState;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 
 /**
  * Filtering nodes are expensive.
  * Considering that most streams start with a nullity check on genuine planning variables,
  * it makes sense to create a specialized version of the node for this case ({@link ForEachExcludingUnassignedUniNode}),
- * as opposed to forcing an extra filter node on the generic case ({@link ForEachIncludingUnassignedUniNode}).
+ * as opposed to forcing an extra filter node on the generic case ({@link ForEachUniNode}).
  *
  * @param <A>
  */
 public abstract sealed class AbstractForEachUniNode<A>
         extends AbstractNode
-        permits ForEachExcludingUnassignedUniNode, ForEachIncludingUnassignedUniNode {
+        permits ForEachExcludingUnassignedUniNode, ForEachUniNode, ForEachStaticUniNode {
 
     private final Class<A> forEachClass;
     private final int outputStoreSize;
     private final StaticPropagationQueue<UniTuple<A>> propagationQueue;
     protected final Map<A, UniTuple<A>> tupleMap = new IdentityHashMap<>(1000);
 
-    public AbstractForEachUniNode(Class<A> forEachClass, TupleLifecycle<UniTuple<A>> nextNodesTupleLifecycle,
+    protected AbstractForEachUniNode(Class<A> forEachClass, TupleLifecycle<UniTuple<A>> nextNodesTupleLifecycle,
             int outputStoreSize) {
         this.forEachClass = forEachClass;
         this.outputStoreSize = outputStoreSize;
@@ -35,8 +35,8 @@ public AbstractForEachUniNode(Class<A> forEachClass, TupleLifecycle<UniTuple<A>>
     }
 
     public void insert(A a) {
-        UniTuple<A> tuple = new UniTuple<>(a, outputStoreSize);
-        UniTuple<A> old = tupleMap.put(a, tuple);
+        var tuple = new UniTuple<>(a, outputStoreSize);
+        var old = tupleMap.put(a, tuple);
         if (old != null) {
             throw new IllegalStateException("The fact (" + a + ") was already inserted, so it cannot insert again.");
         }
@@ -45,8 +45,8 @@ public void insert(A a) {
 
     public abstract void update(A a);
 
-    protected final void innerUpdate(A a, UniTuple<A> tuple) {
-        TupleState state = tuple.state;
+    protected final void updateExisting(A a, UniTuple<A> tuple) {
+        var state = tuple.state;
         if (state.isDirty()) {
             if (state == TupleState.DYING || state == TupleState.ABORTING) {
                 throw new IllegalStateException("The fact (" + a + ") was retracted, so it cannot update.");
@@ -58,11 +58,15 @@ protected final void innerUpdate(A a, UniTuple<A> tuple) {
     }
 
     public void retract(A a) {
-        UniTuple<A> tuple = tupleMap.remove(a);
+        var tuple = tupleMap.remove(a);
         if (tuple == null) {
             throw new IllegalStateException("The fact (" + a + ") was never inserted, so it cannot retract.");
         }
-        TupleState state = tuple.state;
+        retractExisting(a, tuple);
+    }
+
+    protected void retractExisting(A a, UniTuple<A> tuple) {
+        var state = tuple.state;
         if (state.isDirty()) {
             if (state == TupleState.DYING || state == TupleState.ABORTING) {
                 throw new IllegalStateException("The fact (" + a + ") was already retracted, so it cannot retract.");
@@ -82,6 +86,10 @@ public final Class<A> getForEachClass() {
         return forEachClass;
     }
 
+    public boolean supportsIndividualUpdates() {
+        return true;
+    }
+
     @Override
     public final String toString() {
         return super.toString() + "(" + forEachClass.getSimpleName() + ")";
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/AbstractGroupUniNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/AbstractGroupUniNode.java
similarity index 81%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/AbstractGroupUniNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/AbstractGroupUniNode.java
index 5d03af0ba6..6c1693cfda 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/AbstractGroupUniNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/AbstractGroupUniNode.java
@@ -1,14 +1,14 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.uni;
+package ai.timefold.solver.core.impl.bavet.uni;
 
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
 import ai.timefold.solver.core.api.score.stream.uni.UniConstraintCollector;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractGroupNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.AbstractTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.common.AbstractGroupNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.AbstractTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 
 abstract class AbstractGroupUniNode<OldA, OutTuple_ extends AbstractTuple, GroupKey_, ResultContainer_, Result_>
         extends AbstractGroupNode<UniTuple<OldA>, OutTuple_, GroupKey_, ResultContainer_, Result_> {
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/ConcatUniUniNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/ConcatUniUniNode.java
similarity index 70%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/ConcatUniUniNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/ConcatUniUniNode.java
index 009409661b..db214f40cf 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/ConcatUniUniNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/ConcatUniUniNode.java
@@ -1,13 +1,13 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.uni;
+package ai.timefold.solver.core.impl.bavet.uni;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractConcatNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.common.AbstractConcatNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 
-final class ConcatUniUniNode<A>
+public final class ConcatUniUniNode<A>
         extends AbstractConcatNode<UniTuple<A>, UniTuple<A>, UniTuple<A>> {
 
-    ConcatUniUniNode(TupleLifecycle<UniTuple<A>> nextNodesTupleLifecycle,
+    public ConcatUniUniNode(TupleLifecycle<UniTuple<A>> nextNodesTupleLifecycle,
             int inputStoreIndexLeftOutTupleList, int inputStoreIndexRightOutTupleList,
             int outputStoreSize) {
         super(nextNodesTupleLifecycle, inputStoreIndexLeftOutTupleList, inputStoreIndexRightOutTupleList,
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/ConditionalUniTupleLifecycle.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/ConditionalUniTupleLifecycle.java
new file mode 100644
index 0000000000..2983d1a1e5
--- /dev/null
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/ConditionalUniTupleLifecycle.java
@@ -0,0 +1,21 @@
+package ai.timefold.solver.core.impl.bavet.uni;
+
+import java.util.function.Predicate;
+
+import ai.timefold.solver.core.impl.bavet.common.tuple.AbstractConditionalTupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
+
+public final class ConditionalUniTupleLifecycle<A> extends AbstractConditionalTupleLifecycle<UniTuple<A>> {
+    private final Predicate<A> predicate;
+
+    public ConditionalUniTupleLifecycle(Predicate<A> predicate, TupleLifecycle<UniTuple<A>> tupleLifecycle) {
+        super(tupleLifecycle);
+        this.predicate = predicate;
+    }
+
+    @Override
+    protected boolean test(UniTuple<A> tuple) {
+        return predicate.test(tuple.factA);
+    }
+}
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/FlattenLastUniNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/FlattenLastUniNode.java
similarity index 57%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/FlattenLastUniNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/FlattenLastUniNode.java
index af463747b5..66c6c1cd4b 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/FlattenLastUniNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/FlattenLastUniNode.java
@@ -1,16 +1,16 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.uni;
+package ai.timefold.solver.core.impl.bavet.uni;
 
 import java.util.function.Function;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractFlattenLastNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.common.AbstractFlattenLastNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 
-final class FlattenLastUniNode<A, NewA> extends AbstractFlattenLastNode<UniTuple<A>, UniTuple<NewA>, A, NewA> {
+public final class FlattenLastUniNode<A, NewA> extends AbstractFlattenLastNode<UniTuple<A>, UniTuple<NewA>, A, NewA> {
 
     private final int outputStoreSize;
 
-    FlattenLastUniNode(int flattenLastStoreIndex, Function<A, Iterable<NewA>> mappingFunction,
+    public FlattenLastUniNode(int flattenLastStoreIndex, Function<A, Iterable<NewA>> mappingFunction,
             TupleLifecycle<UniTuple<NewA>> nextNodesTupleLifecycle, int outputStoreSize) {
         super(flattenLastStoreIndex, mappingFunction, nextNodesTupleLifecycle);
         this.outputStoreSize = outputStoreSize;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/ForEachExcludingUnassignedUniNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/ForEachExcludingUnassignedUniNode.java
similarity index 65%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/ForEachExcludingUnassignedUniNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/ForEachExcludingUnassignedUniNode.java
index aee7edcbfa..cadde434df 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/ForEachExcludingUnassignedUniNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/ForEachExcludingUnassignedUniNode.java
@@ -1,10 +1,10 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.uni;
+package ai.timefold.solver.core.impl.bavet.uni;
 
 import java.util.Objects;
 import java.util.function.Predicate;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 
 public final class ForEachExcludingUnassignedUniNode<A> extends AbstractForEachUniNode<A> {
 
@@ -26,22 +26,23 @@ public void insert(A a) {
 
     @Override
     public void update(A a) {
-        UniTuple<A> tuple = tupleMap.get(a);
+        var tuple = tupleMap.get(a);
         if (tuple == null) { // The tuple was never inserted because it did not pass the filter.
             insert(a);
         } else if (filter.test(a)) {
-            innerUpdate(a, tuple);
-        } else {
-            super.retract(a); // Call super.retract() to avoid testing the filter again.
+            updateExisting(a, tuple);
+        } else { // Tuple no longer passes the filter.
+            retract(a);
         }
     }
 
     @Override
     public void retract(A a) {
-        if (!filter.test(a)) { // The tuple was never inserted because it did not pass the filter.
+        var tuple = tupleMap.remove(a);
+        if (tuple == null) { // The tuple was never inserted because it did not pass the filter.
             return;
         }
-        super.retract(a);
+        super.retractExisting(a, tuple);
     }
 
 }
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/ForEachFromSolutionUniNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/ForEachFromSolutionUniNode.java
new file mode 100644
index 0000000000..39de817be1
--- /dev/null
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/ForEachFromSolutionUniNode.java
@@ -0,0 +1,68 @@
+package ai.timefold.solver.core.impl.bavet.uni;
+
+import java.util.Collections;
+import java.util.IdentityHashMap;
+import java.util.Objects;
+
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.preview.api.move.SolutionExtractor;
+import ai.timefold.solver.core.preview.api.move.SolutionView;
+
+public final class ForEachFromSolutionUniNode<Solution_, A>
+        extends ForEachUniNode<A> {
+
+    private final SolutionExtractor<Solution_, A> solutionExtractor;
+
+    public ForEachFromSolutionUniNode(Class<A> forEachClass, SolutionExtractor<Solution_, A> solutionExtractor,
+            TupleLifecycle<UniTuple<A>> nextNodesTupleLifecycle, int outputStoreSize) {
+        super(forEachClass, nextNodesTupleLifecycle, outputStoreSize);
+        this.solutionExtractor = Objects.requireNonNull(solutionExtractor);
+    }
+
+    public void read(SolutionView<Solution_> solutionView, Solution_ solution) {
+        var seenFactSet = Collections.newSetFromMap(new IdentityHashMap<A, Boolean>());
+        solutionExtractor.apply(solutionView, solution).forEach(a -> {
+            if (seenFactSet.contains(a)) { // Eliminate duplicates in the source data.
+                return;
+            }
+            seenFactSet.add(a);
+            var tuple = tupleMap.get(a);
+            if (tuple == null) {
+                super.insert(a);
+            } else {
+                updateExisting(a, tuple);
+            }
+        });
+        // Retract all tuples that were not seen in the source data.
+        var iterator = tupleMap.entrySet().iterator();
+        while (iterator.hasNext()) {
+            var entry = iterator.next();
+            var fact = entry.getKey();
+            if (!seenFactSet.contains(fact)) {
+                iterator.remove();
+                retractExisting(fact, entry.getValue());
+            }
+        }
+    }
+
+    @Override
+    public void insert(A a) {
+        throw new IllegalStateException("Impossible state: solution-based node cannot insert.");
+    }
+
+    @Override
+    public void update(A a) {
+        throw new IllegalStateException("Impossible state: solution-based node cannot update.");
+    }
+
+    @Override
+    public void retract(A a) {
+        throw new IllegalStateException("Impossible state: solution-based node cannot retract.");
+    }
+
+    @Override
+    public boolean supportsIndividualUpdates() {
+        return false;
+    }
+}
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/ForEachStaticUniNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/ForEachStaticUniNode.java
new file mode 100644
index 0000000000..59ccc88976
--- /dev/null
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/ForEachStaticUniNode.java
@@ -0,0 +1,44 @@
+package ai.timefold.solver.core.impl.bavet.uni;
+
+import java.util.Collection;
+import java.util.Objects;
+
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
+
+public final class ForEachStaticUniNode<A>
+        extends AbstractForEachUniNode<A> {
+
+    private final Collection<A> source;
+
+    public ForEachStaticUniNode(Class<A> forEachClass, Collection<A> source,
+            TupleLifecycle<UniTuple<A>> nextNodesTupleLifecycle, int outputStoreSize) {
+        super(forEachClass, nextNodesTupleLifecycle, outputStoreSize);
+        this.source = Objects.requireNonNull(source);
+    }
+
+    public void initialize() {
+        source.forEach(super::insert);
+    }
+
+    @Override
+    public void insert(A a) {
+        throw new IllegalStateException("Impossible state: static node cannot insert.");
+    }
+
+    @Override
+    public void update(A a) {
+        throw new IllegalStateException("Impossible state: static node cannot update.");
+    }
+
+    @Override
+    public void retract(A a) {
+        throw new IllegalStateException("Impossible state: static node cannot retract.");
+    }
+
+    @Override
+    public boolean supportsIndividualUpdates() {
+        return false;
+    }
+
+}
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/ForEachUniNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/ForEachUniNode.java
new file mode 100644
index 0000000000..105b984b0f
--- /dev/null
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/ForEachUniNode.java
@@ -0,0 +1,23 @@
+package ai.timefold.solver.core.impl.bavet.uni;
+
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
+
+public sealed class ForEachUniNode<A>
+        extends AbstractForEachUniNode<A> permits ForEachFromSolutionUniNode {
+
+    public ForEachUniNode(Class<A> forEachClass, TupleLifecycle<UniTuple<A>> nextNodesTupleLifecycle,
+            int outputStoreSize) {
+        super(forEachClass, nextNodesTupleLifecycle, outputStoreSize);
+    }
+
+    @Override
+    public void update(A a) {
+        var tuple = tupleMap.get(a);
+        if (tuple == null) {
+            throw new IllegalStateException("The fact (" + a + ") was never inserted, so it cannot update.");
+        }
+        updateExisting(a, tuple);
+    }
+
+}
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/Group0Mapping1CollectorUniNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/Group0Mapping1CollectorUniNode.java
similarity index 76%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/Group0Mapping1CollectorUniNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/Group0Mapping1CollectorUniNode.java
index 7da2329225..9149f57a77 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/Group0Mapping1CollectorUniNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/Group0Mapping1CollectorUniNode.java
@@ -1,11 +1,11 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.uni;
+package ai.timefold.solver.core.impl.bavet.uni;
 
 import ai.timefold.solver.core.api.score.stream.uni.UniConstraintCollector;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 
-final class Group0Mapping1CollectorUniNode<OldA, A, ResultContainer_>
+public final class Group0Mapping1CollectorUniNode<OldA, A, ResultContainer_>
         extends AbstractGroupUniNode<OldA, UniTuple<A>, Void, ResultContainer_, A> {
 
     private final int outputStoreSize;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/Group0Mapping2CollectorUniNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/Group0Mapping2CollectorUniNode.java
similarity index 84%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/Group0Mapping2CollectorUniNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/Group0Mapping2CollectorUniNode.java
index 6cd2c9db30..9ad112a67c 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/Group0Mapping2CollectorUniNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/Group0Mapping2CollectorUniNode.java
@@ -1,13 +1,13 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.uni;
+package ai.timefold.solver.core.impl.bavet.uni;
 
 import ai.timefold.solver.core.api.score.stream.ConstraintCollectors;
 import ai.timefold.solver.core.api.score.stream.uni.UniConstraintCollector;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 import ai.timefold.solver.core.impl.util.Pair;
 
-final class Group0Mapping2CollectorUniNode<OldA, A, B, ResultContainerA_, ResultContainerB_>
+public final class Group0Mapping2CollectorUniNode<OldA, A, B, ResultContainerA_, ResultContainerB_>
         extends AbstractGroupUniNode<OldA, BiTuple<A, B>, Void, Object, Pair<A, B>> {
 
     private final int outputStoreSize;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/Group0Mapping3CollectorUniNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/Group0Mapping3CollectorUniNode.java
similarity index 85%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/Group0Mapping3CollectorUniNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/Group0Mapping3CollectorUniNode.java
index d23f3d8fb8..bf3685e259 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/Group0Mapping3CollectorUniNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/Group0Mapping3CollectorUniNode.java
@@ -1,13 +1,13 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.uni;
+package ai.timefold.solver.core.impl.bavet.uni;
 
 import ai.timefold.solver.core.api.score.stream.ConstraintCollectors;
 import ai.timefold.solver.core.api.score.stream.uni.UniConstraintCollector;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 import ai.timefold.solver.core.impl.util.Triple;
 
-final class Group0Mapping3CollectorUniNode<OldA, A, B, C, ResultContainerA_, ResultContainerB_, ResultContainerC_>
+public final class Group0Mapping3CollectorUniNode<OldA, A, B, C, ResultContainerA_, ResultContainerB_, ResultContainerC_>
         extends AbstractGroupUniNode<OldA, TriTuple<A, B, C>, Void, Object, Triple<A, B, C>> {
 
     private final int outputStoreSize;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/Group0Mapping4CollectorUniNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/Group0Mapping4CollectorUniNode.java
similarity index 86%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/Group0Mapping4CollectorUniNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/Group0Mapping4CollectorUniNode.java
index 4523767235..91efb0900e 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/Group0Mapping4CollectorUniNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/Group0Mapping4CollectorUniNode.java
@@ -1,13 +1,13 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.uni;
+package ai.timefold.solver.core.impl.bavet.uni;
 
 import ai.timefold.solver.core.api.score.stream.ConstraintCollectors;
 import ai.timefold.solver.core.api.score.stream.uni.UniConstraintCollector;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 import ai.timefold.solver.core.impl.util.Quadruple;
 
-final class Group0Mapping4CollectorUniNode<OldA, A, B, C, D, ResultContainerA_, ResultContainerB_, ResultContainerC_, ResultContainerD_>
+public final class Group0Mapping4CollectorUniNode<OldA, A, B, C, D, ResultContainerA_, ResultContainerB_, ResultContainerC_, ResultContainerD_>
         extends
         AbstractGroupUniNode<OldA, QuadTuple<A, B, C, D>, Void, Object, Quadruple<A, B, C, D>> {
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/Group1Mapping0CollectorUniNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/Group1Mapping0CollectorUniNode.java
similarity index 79%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/Group1Mapping0CollectorUniNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/Group1Mapping0CollectorUniNode.java
index 3d40e0550a..e81264c52c 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/Group1Mapping0CollectorUniNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/Group1Mapping0CollectorUniNode.java
@@ -1,12 +1,12 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.uni;
+package ai.timefold.solver.core.impl.bavet.uni;
 
 import java.util.function.Function;
 
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 
-final class Group1Mapping0CollectorUniNode<OldA, A>
+public final class Group1Mapping0CollectorUniNode<OldA, A>
         extends AbstractGroupUniNode<OldA, UniTuple<A>, A, Void, Void> {
 
     private final int outputStoreSize;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/Group1Mapping1CollectorUniNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/Group1Mapping1CollectorUniNode.java
similarity index 73%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/Group1Mapping1CollectorUniNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/Group1Mapping1CollectorUniNode.java
index 88f675a4ee..8293279019 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/Group1Mapping1CollectorUniNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/Group1Mapping1CollectorUniNode.java
@@ -1,15 +1,15 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.uni;
+package ai.timefold.solver.core.impl.bavet.uni;
 
-import static ai.timefold.solver.core.impl.score.stream.bavet.uni.Group1Mapping0CollectorUniNode.createGroupKey;
+import static ai.timefold.solver.core.impl.bavet.uni.Group1Mapping0CollectorUniNode.createGroupKey;
 
 import java.util.function.Function;
 
 import ai.timefold.solver.core.api.score.stream.uni.UniConstraintCollector;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 
-final class Group1Mapping1CollectorUniNode<OldA, A, B, ResultContainer_>
+public final class Group1Mapping1CollectorUniNode<OldA, A, B, ResultContainer_>
         extends AbstractGroupUniNode<OldA, BiTuple<A, B>, A, ResultContainer_, B> {
 
     private final int outputStoreSize;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/Group1Mapping2CollectorUniNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/Group1Mapping2CollectorUniNode.java
similarity index 81%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/Group1Mapping2CollectorUniNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/Group1Mapping2CollectorUniNode.java
index fd626d15a7..596efdbd81 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/Group1Mapping2CollectorUniNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/Group1Mapping2CollectorUniNode.java
@@ -1,14 +1,14 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.uni;
+package ai.timefold.solver.core.impl.bavet.uni;
 
 import java.util.function.Function;
 
 import ai.timefold.solver.core.api.score.stream.uni.UniConstraintCollector;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 import ai.timefold.solver.core.impl.util.Pair;
 
-final class Group1Mapping2CollectorUniNode<OldA, A, B, C, ResultContainerB_, ResultContainerC_>
+public final class Group1Mapping2CollectorUniNode<OldA, A, B, C, ResultContainerB_, ResultContainerC_>
         extends AbstractGroupUniNode<OldA, TriTuple<A, B, C>, A, Object, Pair<B, C>> {
 
     private final int outputStoreSize;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/Group1Mapping3CollectorUniNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/Group1Mapping3CollectorUniNode.java
similarity index 77%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/Group1Mapping3CollectorUniNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/Group1Mapping3CollectorUniNode.java
index 00b9121c7e..c4a2e5762a 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/Group1Mapping3CollectorUniNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/Group1Mapping3CollectorUniNode.java
@@ -1,16 +1,16 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.uni;
+package ai.timefold.solver.core.impl.bavet.uni;
 
-import static ai.timefold.solver.core.impl.score.stream.bavet.uni.Group1Mapping0CollectorUniNode.createGroupKey;
+import static ai.timefold.solver.core.impl.bavet.uni.Group1Mapping0CollectorUniNode.createGroupKey;
 
 import java.util.function.Function;
 
 import ai.timefold.solver.core.api.score.stream.uni.UniConstraintCollector;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 import ai.timefold.solver.core.impl.util.Triple;
 
-final class Group1Mapping3CollectorUniNode<OldA, A, B, C, D, ResultContainerB_, ResultContainerC_, ResultContainerD_>
+public final class Group1Mapping3CollectorUniNode<OldA, A, B, C, D, ResultContainerB_, ResultContainerC_, ResultContainerD_>
         extends AbstractGroupUniNode<OldA, QuadTuple<A, B, C, D>, A, Object, Triple<B, C, D>> {
 
     private final int outputStoreSize;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/Group2Mapping0CollectorUniNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/Group2Mapping0CollectorUniNode.java
similarity index 80%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/Group2Mapping0CollectorUniNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/Group2Mapping0CollectorUniNode.java
index 2ec81d82f1..4e8e4149ab 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/Group2Mapping0CollectorUniNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/Group2Mapping0CollectorUniNode.java
@@ -1,14 +1,14 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.uni;
+package ai.timefold.solver.core.impl.bavet.uni;
 
 import java.util.function.Function;
 
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 import ai.timefold.solver.core.impl.util.Pair;
 
-final class Group2Mapping0CollectorUniNode<OldA, A, B>
+public final class Group2Mapping0CollectorUniNode<OldA, A, B>
         extends AbstractGroupUniNode<OldA, BiTuple<A, B>, Pair<A, B>, Void, Void> {
 
     private final int outputStoreSize;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/Group2Mapping1CollectorUniNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/Group2Mapping1CollectorUniNode.java
similarity index 75%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/Group2Mapping1CollectorUniNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/Group2Mapping1CollectorUniNode.java
index 6830242072..4b582c5777 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/Group2Mapping1CollectorUniNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/Group2Mapping1CollectorUniNode.java
@@ -1,16 +1,16 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.uni;
+package ai.timefold.solver.core.impl.bavet.uni;
 
-import static ai.timefold.solver.core.impl.score.stream.bavet.uni.Group2Mapping0CollectorUniNode.createGroupKey;
+import static ai.timefold.solver.core.impl.bavet.uni.Group2Mapping0CollectorUniNode.createGroupKey;
 
 import java.util.function.Function;
 
 import ai.timefold.solver.core.api.score.stream.uni.UniConstraintCollector;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 import ai.timefold.solver.core.impl.util.Pair;
 
-final class Group2Mapping1CollectorUniNode<OldA, A, B, C, ResultContainer_>
+public final class Group2Mapping1CollectorUniNode<OldA, A, B, C, ResultContainer_>
         extends AbstractGroupUniNode<OldA, TriTuple<A, B, C>, Pair<A, B>, ResultContainer_, C> {
 
     private final int outputStoreSize;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/Group2Mapping2CollectorUniNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/Group2Mapping2CollectorUniNode.java
similarity index 78%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/Group2Mapping2CollectorUniNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/Group2Mapping2CollectorUniNode.java
index 8b32aa7c50..3fd3813c80 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/Group2Mapping2CollectorUniNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/Group2Mapping2CollectorUniNode.java
@@ -1,16 +1,16 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.uni;
+package ai.timefold.solver.core.impl.bavet.uni;
 
-import static ai.timefold.solver.core.impl.score.stream.bavet.uni.Group2Mapping0CollectorUniNode.createGroupKey;
+import static ai.timefold.solver.core.impl.bavet.uni.Group2Mapping0CollectorUniNode.createGroupKey;
 
 import java.util.function.Function;
 
 import ai.timefold.solver.core.api.score.stream.uni.UniConstraintCollector;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 import ai.timefold.solver.core.impl.util.Pair;
 
-final class Group2Mapping2CollectorUniNode<OldA, A, B, C, D, ResultContainerC_, ResultContainerD_>
+public final class Group2Mapping2CollectorUniNode<OldA, A, B, C, D, ResultContainerC_, ResultContainerD_>
         extends AbstractGroupUniNode<OldA, QuadTuple<A, B, C, D>, Pair<A, B>, Object, Pair<C, D>> {
 
     private final int outputStoreSize;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/Group3Mapping0CollectorUniNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/Group3Mapping0CollectorUniNode.java
similarity index 81%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/Group3Mapping0CollectorUniNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/Group3Mapping0CollectorUniNode.java
index 9d0696eb75..646d939bfa 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/Group3Mapping0CollectorUniNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/Group3Mapping0CollectorUniNode.java
@@ -1,14 +1,14 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.uni;
+package ai.timefold.solver.core.impl.bavet.uni;
 
 import java.util.function.Function;
 
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 import ai.timefold.solver.core.impl.util.Triple;
 
-final class Group3Mapping0CollectorUniNode<OldA, A, B, C>
+public final class Group3Mapping0CollectorUniNode<OldA, A, B, C>
         extends AbstractGroupUniNode<OldA, TriTuple<A, B, C>, Triple<A, B, C>, Void, Void> {
 
     private final int outputStoreSize;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/Group3Mapping1CollectorUniNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/Group3Mapping1CollectorUniNode.java
similarity index 77%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/Group3Mapping1CollectorUniNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/Group3Mapping1CollectorUniNode.java
index 43ac44844e..d41e651bc1 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/Group3Mapping1CollectorUniNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/Group3Mapping1CollectorUniNode.java
@@ -1,16 +1,16 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.uni;
+package ai.timefold.solver.core.impl.bavet.uni;
 
-import static ai.timefold.solver.core.impl.score.stream.bavet.uni.Group3Mapping0CollectorUniNode.createGroupKey;
+import static ai.timefold.solver.core.impl.bavet.uni.Group3Mapping0CollectorUniNode.createGroupKey;
 
 import java.util.function.Function;
 
 import ai.timefold.solver.core.api.score.stream.uni.UniConstraintCollector;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 import ai.timefold.solver.core.impl.util.Triple;
 
-final class Group3Mapping1CollectorUniNode<OldA, A, B, C, D, ResultContainer_>
+public final class Group3Mapping1CollectorUniNode<OldA, A, B, C, D, ResultContainer_>
         extends
         AbstractGroupUniNode<OldA, QuadTuple<A, B, C, D>, Triple<A, B, C>, ResultContainer_, D> {
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/Group4Mapping0CollectorUniNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/Group4Mapping0CollectorUniNode.java
similarity index 83%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/Group4Mapping0CollectorUniNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/Group4Mapping0CollectorUniNode.java
index cc6b727829..c645500663 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/Group4Mapping0CollectorUniNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/Group4Mapping0CollectorUniNode.java
@@ -1,14 +1,14 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.uni;
+package ai.timefold.solver.core.impl.bavet.uni;
 
 import java.util.function.Function;
 
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 import ai.timefold.solver.core.impl.util.Quadruple;
 
-final class Group4Mapping0CollectorUniNode<OldA, A, B, C, D>
+public final class Group4Mapping0CollectorUniNode<OldA, A, B, C, D>
         extends
         AbstractGroupUniNode<OldA, QuadTuple<A, B, C, D>, Quadruple<A, B, C, D>, Void, Void> {
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/IndexedIfExistsUniNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/IndexedIfExistsUniNode.java
similarity index 77%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/IndexedIfExistsUniNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/IndexedIfExistsUniNode.java
index 0fc3cae3ef..667c3b8b31 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/IndexedIfExistsUniNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/IndexedIfExistsUniNode.java
@@ -1,16 +1,16 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.uni;
+package ai.timefold.solver.core.impl.bavet.uni;
 
 import java.util.function.BiPredicate;
 import java.util.function.Function;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractIndexedIfExistsNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.ExistsCounter;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.index.IndexProperties;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.index.Indexer;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.common.AbstractIndexedIfExistsNode;
+import ai.timefold.solver.core.impl.bavet.common.ExistsCounter;
+import ai.timefold.solver.core.impl.bavet.common.index.IndexProperties;
+import ai.timefold.solver.core.impl.bavet.common.index.Indexer;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 
-final class IndexedIfExistsUniNode<A, B> extends AbstractIndexedIfExistsNode<UniTuple<A>, B> {
+public final class IndexedIfExistsUniNode<A, B> extends AbstractIndexedIfExistsNode<UniTuple<A>, B> {
 
     private final Function<A, IndexProperties> mappingA;
     private final BiPredicate<A, B> filtering;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/MapUniToBiNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/MapUniToBiNode.java
similarity index 64%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/MapUniToBiNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/MapUniToBiNode.java
index e8a66ed5da..2c29456b8a 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/MapUniToBiNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/MapUniToBiNode.java
@@ -1,19 +1,19 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.uni;
+package ai.timefold.solver.core.impl.bavet.uni;
 
 import java.util.Objects;
 import java.util.function.Function;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractMapNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.common.AbstractMapNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 
-final class MapUniToBiNode<A, NewA, NewB> extends AbstractMapNode<UniTuple<A>, BiTuple<NewA, NewB>> {
+public final class MapUniToBiNode<A, NewA, NewB> extends AbstractMapNode<UniTuple<A>, BiTuple<NewA, NewB>> {
 
     private final Function<A, NewA> mappingFunctionA;
     private final Function<A, NewB> mappingFunctionB;
 
-    MapUniToBiNode(int mapStoreIndex, Function<A, NewA> mappingFunctionA, Function<A, NewB> mappingFunctionB,
+    public MapUniToBiNode(int mapStoreIndex, Function<A, NewA> mappingFunctionA, Function<A, NewB> mappingFunctionB,
             TupleLifecycle<BiTuple<NewA, NewB>> nextNodesTupleLifecycle, int outputStoreSize) {
         super(mapStoreIndex, nextNodesTupleLifecycle, outputStoreSize);
         this.mappingFunctionA = Objects.requireNonNull(mappingFunctionA);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/MapUniToQuadNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/MapUniToQuadNode.java
similarity index 76%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/MapUniToQuadNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/MapUniToQuadNode.java
index 2cfe2fe289..344d9a600a 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/MapUniToQuadNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/MapUniToQuadNode.java
@@ -1,14 +1,14 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.uni;
+package ai.timefold.solver.core.impl.bavet.uni;
 
 import java.util.Objects;
 import java.util.function.Function;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractMapNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.common.AbstractMapNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 
-final class MapUniToQuadNode<A, NewA, NewB, NewC, NewD>
+public final class MapUniToQuadNode<A, NewA, NewB, NewC, NewD>
         extends AbstractMapNode<UniTuple<A>, QuadTuple<NewA, NewB, NewC, NewD>> {
 
     private final Function<A, NewA> mappingFunctionA;
@@ -16,7 +16,7 @@ final class MapUniToQuadNode<A, NewA, NewB, NewC, NewD>
     private final Function<A, NewC> mappingFunctionC;
     private final Function<A, NewD> mappingFunctionD;
 
-    MapUniToQuadNode(int mapStoreIndex, Function<A, NewA> mappingFunctionA, Function<A, NewB> mappingFunctionB,
+    public MapUniToQuadNode(int mapStoreIndex, Function<A, NewA> mappingFunctionA, Function<A, NewB> mappingFunctionB,
             Function<A, NewC> mappingFunctionC, Function<A, NewD> mappingFunctionD,
             TupleLifecycle<QuadTuple<NewA, NewB, NewC, NewD>> nextNodesTupleLifecycle, int outputStoreSize) {
         super(mapStoreIndex, nextNodesTupleLifecycle, outputStoreSize);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/MapUniToTriNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/MapUniToTriNode.java
similarity index 69%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/MapUniToTriNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/MapUniToTriNode.java
index 6f15f78018..b00e22fd4c 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/MapUniToTriNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/MapUniToTriNode.java
@@ -1,20 +1,20 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.uni;
+package ai.timefold.solver.core.impl.bavet.uni;
 
 import java.util.Objects;
 import java.util.function.Function;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractMapNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.common.AbstractMapNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 
-final class MapUniToTriNode<A, NewA, NewB, NewC> extends AbstractMapNode<UniTuple<A>, TriTuple<NewA, NewB, NewC>> {
+public final class MapUniToTriNode<A, NewA, NewB, NewC> extends AbstractMapNode<UniTuple<A>, TriTuple<NewA, NewB, NewC>> {
 
     private final Function<A, NewA> mappingFunctionA;
     private final Function<A, NewB> mappingFunctionB;
     private final Function<A, NewC> mappingFunctionC;
 
-    MapUniToTriNode(int mapStoreIndex, Function<A, NewA> mappingFunctionA, Function<A, NewB> mappingFunctionB,
+    public MapUniToTriNode(int mapStoreIndex, Function<A, NewA> mappingFunctionA, Function<A, NewB> mappingFunctionB,
             Function<A, NewC> mappingFunctionC, TupleLifecycle<TriTuple<NewA, NewB, NewC>> nextNodesTupleLifecycle,
             int outputStoreSize) {
         super(mapStoreIndex, nextNodesTupleLifecycle, outputStoreSize);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/MapUniToUniNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/MapUniToUniNode.java
similarity index 62%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/MapUniToUniNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/MapUniToUniNode.java
index 9f600bcc12..0aece3279d 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/MapUniToUniNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/MapUniToUniNode.java
@@ -1,17 +1,17 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.uni;
+package ai.timefold.solver.core.impl.bavet.uni;
 
 import java.util.Objects;
 import java.util.function.Function;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractMapNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.common.AbstractMapNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 
-final class MapUniToUniNode<A, NewA> extends AbstractMapNode<UniTuple<A>, UniTuple<NewA>> {
+public final class MapUniToUniNode<A, NewA> extends AbstractMapNode<UniTuple<A>, UniTuple<NewA>> {
 
     private final Function<A, NewA> mappingFunction;
 
-    MapUniToUniNode(int mapStoreIndex, Function<A, NewA> mappingFunction,
+    public MapUniToUniNode(int mapStoreIndex, Function<A, NewA> mappingFunction,
             TupleLifecycle<UniTuple<NewA>> nextNodesTupleLifecycle, int outputStoreSize) {
         super(mapStoreIndex, nextNodesTupleLifecycle, outputStoreSize);
         this.mappingFunction = Objects.requireNonNull(mappingFunction);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/UnindexedIfExistsUniNode.java b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/UnindexedIfExistsUniNode.java
similarity index 75%
rename from core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/UnindexedIfExistsUniNode.java
rename to core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/UnindexedIfExistsUniNode.java
index e34dd98926..3d8709b282 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/UnindexedIfExistsUniNode.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/UnindexedIfExistsUniNode.java
@@ -1,12 +1,12 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.uni;
+package ai.timefold.solver.core.impl.bavet.uni;
 
 import java.util.function.BiPredicate;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractUnindexedIfExistsNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.common.AbstractUnindexedIfExistsNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 
-final class UnindexedIfExistsUniNode<A, B> extends AbstractUnindexedIfExistsNode<UniTuple<A>, B> {
+public final class UnindexedIfExistsUniNode<A, B> extends AbstractUnindexedIfExistsNode<UniTuple<A>, B> {
 
     private final BiPredicate<A, B> filtering;
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/domain/variable/descriptor/ListVariableDescriptor.java b/core/src/main/java/ai/timefold/solver/core/impl/domain/variable/descriptor/ListVariableDescriptor.java
index ad78ee2300..217937cae3 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/domain/variable/descriptor/ListVariableDescriptor.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/domain/variable/descriptor/ListVariableDescriptor.java
@@ -154,26 +154,35 @@ public List<Object> getValue(Object entity) {
         return (List<Object>) value;
     }
 
-    public Object removeElement(Object entity, int index) {
-        return getValue(entity).remove(index);
+    @SuppressWarnings("unchecked")
+    public <Value_> Value_ removeElement(Object entity, int index) {
+        var list = getValue(entity);
+        if (list.size() <= index) {
+            throw new IllegalArgumentException(
+                    "The index to remove (%s) must be less than the size (%s) of the planning list variable (%s) of entity (%s)."
+                            .formatted(index, list.size(), this, entity));
+        }
+        return (Value_) list.remove(index);
     }
 
     public void addElement(Object entity, int index, Object element) {
         getValue(entity).add(index, element);
     }
 
-    public Object getElement(Object entity, int index) {
+    @SuppressWarnings("unchecked")
+    public <Value_> Value_ getElement(Object entity, int index) {
         var values = getValue(entity);
         if (index >= values.size()) {
             throw new IndexOutOfBoundsException(
                     "Impossible state: The index (%s) must be less than the size (%s) of the planning list variable (%s) of entity (%s)."
                             .formatted(index, values.size(), this, entity));
         }
-        return values.get(index);
+        return (Value_) values.get(index);
     }
 
-    public Object setElement(Object entity, int index, Object element) {
-        return getValue(entity).set(index, element);
+    @SuppressWarnings("unchecked")
+    public <Value_> Value_ setElement(Object entity, int index, Value_ element) {
+        return (Value_) getValue(entity).set(index, element);
     }
 
     public int getListSize(Object entity) {
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/AbstractDataStream.java b/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/AbstractDataStream.java
new file mode 100644
index 0000000000..36385509b2
--- /dev/null
+++ b/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/AbstractDataStream.java
@@ -0,0 +1,76 @@
+package ai.timefold.solver.core.impl.move.dataset;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import ai.timefold.solver.core.impl.bavet.common.BavetStream;
+import ai.timefold.solver.core.impl.bavet.common.TupleSource;
+import ai.timefold.solver.core.impl.move.dataset.common.DataNodeBuildHelper;
+
+public abstract class AbstractDataStream<Solution_>
+        implements BavetStream {
+
+    protected final DefaultDatasetFactory<Solution_> datasetFactory;
+    protected final AbstractDataStream<Solution_> parent;
+    protected final List<AbstractDataStream<Solution_>> childStreamList = new ArrayList<>(2);
+
+    protected AbstractDataStream(DefaultDatasetFactory<Solution_> datasetFactory, AbstractDataStream<Solution_> parent) {
+        this.datasetFactory = datasetFactory;
+        this.parent = parent;
+    }
+
+    public final <Stream_ extends AbstractDataStream<Solution_>> Stream_ shareAndAddChild(Stream_ stream) {
+        return datasetFactory.share(stream, childStreamList::add);
+    }
+
+    // ************************************************************************
+    // Node creation
+    // ************************************************************************
+
+    public void collectActiveDataStreams(Set<AbstractDataStream<Solution_>> constraintStreamSet) {
+        if (parent == null) { // Maybe a join/ifExists/forEach forgot to override this?
+            throw new IllegalStateException("Impossible state: the stream (" + this + ") does not have a parent.");
+        }
+        parent.collectActiveDataStreams(constraintStreamSet);
+        constraintStreamSet.add(this);
+    }
+
+    /**
+     * Returns the stream which first produced the tuple that this stream operates on.
+     * If a stream does not have a single parent nor is it a source, it is expected to override this method.
+     *
+     * @return this if {@link TupleSource}, otherwise parent's tuple source.
+     */
+    public AbstractDataStream<Solution_> getTupleSource() {
+        if (this instanceof TupleSource) {
+            return this;
+        } else if (parent == null) { // Maybe some stream forgot to override this?
+            throw new IllegalStateException("Impossible state: the stream (" + this + ") does not have a parent.");
+        }
+        return parent.getTupleSource();
+    }
+
+    public abstract void buildNode(DataNodeBuildHelper<Solution_> buildHelper);
+
+    // ************************************************************************
+    // Helper methods
+    // ************************************************************************
+
+    protected void assertEmptyChildStreamList() {
+        if (!childStreamList.isEmpty()) {
+            throw new IllegalStateException(
+                    "Impossible state: the stream (" + this + ") has a non-empty childStreamList (" + childStreamList + ").");
+        }
+    }
+
+    @Override
+    public final AbstractDataStream<Solution_> getParent() {
+        return parent;
+    }
+
+    public final List<AbstractDataStream<Solution_>> getChildStreamList() {
+        return childStreamList;
+    }
+
+}
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/AbstractUniDataStream.java b/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/AbstractUniDataStream.java
new file mode 100644
index 0000000000..971a915f76
--- /dev/null
+++ b/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/AbstractUniDataStream.java
@@ -0,0 +1,85 @@
+package ai.timefold.solver.core.impl.move.dataset;
+
+import java.util.function.Predicate;
+
+import ai.timefold.solver.core.api.score.stream.bi.BiJoiner;
+import ai.timefold.solver.core.impl.bavet.common.index.joiner.BiJoinerComber;
+import ai.timefold.solver.core.impl.move.dataset.common.bridge.ForeBridgeUniDataStream;
+import ai.timefold.solver.core.preview.api.move.Dataset;
+import ai.timefold.solver.core.preview.api.move.UniDataStream;
+
+import org.jspecify.annotations.NonNull;
+
+public abstract class AbstractUniDataStream<Solution_, A> extends AbstractDataStream<Solution_>
+        implements UniDataStream<Solution_, A> {
+
+    protected AbstractUniDataStream(DefaultDatasetFactory<Solution_> datasetFactory) {
+        super(datasetFactory, null);
+    }
+
+    protected AbstractUniDataStream(DefaultDatasetFactory<Solution_> datasetFactory, AbstractDataStream<Solution_> parent) {
+        super(datasetFactory, parent);
+    }
+
+    @Override
+    public final @NonNull UniDataStream<Solution_, A> filter(@NonNull Predicate<A> predicate) {
+        return shareAndAddChild(new FilterUniDataStream<>(datasetFactory, this, predicate));
+    }
+
+    @SafeVarargs
+    @Override
+    public final @NonNull <B> UniDataStream<Solution_, A> ifExists(@NonNull Class<B> otherClass,
+            @NonNull BiJoiner<A, B>... joiners) {
+        return ifExists(datasetFactory.forEach(otherClass), joiners);
+    }
+
+    @SafeVarargs
+    @Override
+    public final @NonNull <B> UniDataStream<Solution_, A> ifExists(@NonNull UniDataStream<Solution_, B> otherStream,
+            @NonNull BiJoiner<A, B>... joiners) {
+        return ifExistsOrNot(true, otherStream, joiners);
+    }
+
+    @SafeVarargs
+    @Override
+    public final @NonNull <B> UniDataStream<Solution_, A> ifExistsIncludingUnassigned(@NonNull Class<B> otherClass,
+            @NonNull BiJoiner<A, B>... joiners) {
+        return ifExists(datasetFactory.forEachIncludingUnassigned(otherClass), joiners);
+    }
+
+    @SafeVarargs
+    @Override
+    public final @NonNull <B> UniDataStream<Solution_, A> ifNotExists(@NonNull Class<B> otherClass,
+            @NonNull BiJoiner<A, B>... joiners) {
+        return ifExistsOrNot(false, datasetFactory.forEach(otherClass), joiners);
+    }
+
+    @SafeVarargs
+    @Override
+    public final @NonNull <B> UniDataStream<Solution_, A> ifNotExists(@NonNull UniDataStream<Solution_, B> otherStream,
+            @NonNull BiJoiner<A, B>... joiners) {
+        return ifExistsOrNot(false, otherStream, joiners);
+    }
+
+    @SafeVarargs
+    @Override
+    public final @NonNull <B> UniDataStream<Solution_, A> ifNotExistsIncludingUnassigned(@NonNull Class<B> otherClass,
+            @NonNull BiJoiner<A, B>... joiners) {
+        return ifNotExists(datasetFactory.forEachIncludingUnassigned(otherClass), joiners);
+    }
+
+    private <B> UniDataStream<Solution_, A> ifExistsOrNot(boolean shouldExist, UniDataStream<Solution_, B> otherStream,
+            BiJoiner<A, B>[] joiners) {
+        var other = (AbstractUniDataStream<Solution_, B>) otherStream;
+        var joinerComber = BiJoinerComber.comb(joiners);
+        var parentBridgeB = other.shareAndAddChild(new ForeBridgeUniDataStream<Solution_, B>(datasetFactory, other));
+        return datasetFactory.share(new IfExistsUniDataStream<>(datasetFactory, this, parentBridgeB, shouldExist,
+                joinerComber.getMergedJoiner(), joinerComber.getMergedFiltering()), childStreamList::add);
+    }
+
+    @Override
+    public Dataset<Solution_, Object> createDataset() {
+        return null;
+    }
+
+}
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/Dataset.java b/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/Dataset.java
new file mode 100644
index 0000000000..7e68c3cb2f
--- /dev/null
+++ b/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/Dataset.java
@@ -0,0 +1,23 @@
+package ai.timefold.solver.core.impl.move.dataset;
+
+import java.util.Objects;
+import java.util.Set;
+
+import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetScoringConstraintStream;
+
+public final class Dataset<Solution_> {
+
+    private final DefaultDatasetFactory<Solution_> defaultDatasetFactory;
+    private final BavetScoringConstraintStream<Solution_> scoringConstraintStream;
+
+    public Dataset(DefaultDatasetFactory<Solution_> defaultDatasetFactory,
+            BavetScoringConstraintStream<Solution_> scoringConstraintStream) {
+        this.defaultDatasetFactory = Objects.requireNonNull(defaultDatasetFactory);
+        this.scoringConstraintStream = Objects.requireNonNull(scoringConstraintStream);
+    }
+
+    public void collectActiveDataStreams(Set<AbstractDataStream<Solution_>> dataStreamSet) {
+        // scoringConstraintStream.collectActiveDataStreams(dataStreamSet);
+    }
+
+}
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/DatasetSession.java b/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/DatasetSession.java
new file mode 100644
index 0000000000..8466bc3951
--- /dev/null
+++ b/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/DatasetSession.java
@@ -0,0 +1,58 @@
+package ai.timefold.solver.core.impl.move.dataset;
+
+import java.util.Collections;
+import java.util.IdentityHashMap;
+
+import ai.timefold.solver.core.impl.bavet.AbstractSession;
+import ai.timefold.solver.core.impl.bavet.NodeNetwork;
+import ai.timefold.solver.core.impl.bavet.uni.ForEachFromSolutionUniNode;
+import ai.timefold.solver.core.impl.bavet.uni.ForEachStaticUniNode;
+import ai.timefold.solver.core.preview.api.move.SolutionView;
+
+public final class DatasetSession<Solution_> extends AbstractSession {
+
+    private final ForEachStaticUniNode<Object>[] effectiveClassToStaticNodeArray;
+    private final ForEachFromSolutionUniNode<Solution_, Object>[] effectiveClassToFromSolutionNodeArray;
+
+    @SuppressWarnings("unchecked")
+    DatasetSession(NodeNetwork nodeNetwork) {
+        super(nodeNetwork);
+        var staticNodeSet = Collections.newSetFromMap(new IdentityHashMap<ForEachStaticUniNode<?>, Boolean>());
+        var fromSolutionNodeSet = Collections.newSetFromMap(new IdentityHashMap<ForEachFromSolutionUniNode<?, ?>, Boolean>());
+        nodeNetwork.getForEachNodes().forEach(node -> {
+            if (node instanceof ForEachStaticUniNode<?> forEachStaticUniNode) {
+                staticNodeSet.add(forEachStaticUniNode);
+            } else if (node instanceof ForEachFromSolutionUniNode<?, ?> forEachFromSolutionUniNode) {
+                fromSolutionNodeSet.add(forEachFromSolutionUniNode);
+            }
+        });
+        this.effectiveClassToStaticNodeArray =
+                staticNodeSet.isEmpty() ? null : staticNodeSet.toArray(ForEachStaticUniNode[]::new);
+        this.effectiveClassToFromSolutionNodeArray =
+                fromSolutionNodeSet.isEmpty() ? null : fromSolutionNodeSet.toArray(ForEachFromSolutionUniNode[]::new);
+    }
+
+    public void initialize() {
+        if (effectiveClassToStaticNodeArray == null) {
+            return;
+        }
+        for (var node : effectiveClassToStaticNodeArray) {
+            node.initialize();
+        }
+    }
+
+    public void updateWorkingSolution(SolutionView<Solution_> solutionView, Solution_ solution) {
+        if (effectiveClassToFromSolutionNodeArray == null) {
+            return;
+        }
+        for (var node : effectiveClassToFromSolutionNodeArray) {
+            node.read(solutionView, solution);
+        }
+    }
+
+    @Override
+    public void settle() {
+        super.settle();
+    }
+
+}
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/DatasetSessionFactory.java b/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/DatasetSessionFactory.java
new file mode 100644
index 0000000000..15f17e074b
--- /dev/null
+++ b/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/DatasetSessionFactory.java
@@ -0,0 +1,13 @@
+package ai.timefold.solver.core.impl.move.dataset;
+
+public final class DatasetSessionFactory<Solution_> {
+
+    // ************************************************************************
+    // Node creation
+    // ************************************************************************
+
+    @SuppressWarnings("unchecked")
+    public DatasetSession buildSession(Solution_ workingSolution) {
+        return null;
+    }
+}
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/DefaultDatasetFactory.java b/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/DefaultDatasetFactory.java
new file mode 100644
index 0000000000..c1046cf1de
--- /dev/null
+++ b/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/DefaultDatasetFactory.java
@@ -0,0 +1,134 @@
+package ai.timefold.solver.core.impl.move.dataset;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Consumer;
+
+import ai.timefold.solver.core.api.score.stream.Joiners;
+import ai.timefold.solver.core.impl.domain.solution.descriptor.SolutionDescriptor;
+import ai.timefold.solver.core.preview.api.move.DatasetFactory;
+import ai.timefold.solver.core.preview.api.move.SolutionExtractor;
+import ai.timefold.solver.core.preview.api.move.UniDataStream;
+
+import org.jspecify.annotations.NonNull;
+
+public final class DefaultDatasetFactory<Solution_> implements DatasetFactory<Solution_> {
+
+    private final SolutionDescriptor<Solution_> solutionDescriptor;
+    private final Map<AbstractDataStream<Solution_>, AbstractDataStream<Solution_>> sharingStreamMap = new HashMap<>(256);
+
+    public DefaultDatasetFactory(SolutionDescriptor<Solution_> solutionDescriptor) {
+        this.solutionDescriptor = solutionDescriptor;
+    }
+
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    @Override
+    public <A> @NonNull UniDataStream<Solution_, A> forEach(@NonNull Class<A> sourceClass) {
+        assertValidForEachType(sourceClass);
+        var entityDescriptor = solutionDescriptor.findEntityDescriptor(sourceClass);
+        if (entityDescriptor == null) {
+            // Not genuine or shadow entity; no need for filtering.
+            return share(new ForEachDataStream<>(this, sourceClass));
+        }
+        var listVariableDescriptor = solutionDescriptor.getListVariableDescriptor();
+        if (listVariableDescriptor == null || !listVariableDescriptor.acceptsValueType(sourceClass)) {
+            // No applicable list variable; don't need to check inverse relationships.
+            return share(new ForEachDataStream<>(this, sourceClass, entityDescriptor.getHasNoNullVariablesPredicateBasicVar()));
+        }
+        var entityClass = listVariableDescriptor.getEntityDescriptor().getEntityClass();
+        if (entityClass == sourceClass) {
+            throw new IllegalStateException("Impossible state: entityClass (%s) and sourceClass (%s) are the same."
+                    .formatted(entityClass.getCanonicalName(), sourceClass.getCanonicalName()));
+        }
+        var shadowDescriptor = listVariableDescriptor.getInverseRelationShadowVariableDescriptor();
+        if (shadowDescriptor == null) {
+            // The list variable element doesn't have the @InverseRelationShadowVariable annotation.
+            // We don't want the users to be forced to implement it in quickstarts,
+            // so we'll do this expensive thing instead.
+            return forEachIncludingUnassigned(sourceClass)
+                    .ifExists((Class) entityClass,
+                            Joiners.filtering(listVariableDescriptor.getInListPredicate()));
+        } else { // We have the inverse relation variable, so we can read its value directly.
+            return share(new ForEachDataStream<>(this, sourceClass, entityDescriptor.getHasNoNullVariablesPredicateListVar()));
+        }
+    }
+
+    public <A> UniDataStream<Solution_, A> forEachIncludingUnassigned(@NonNull Class<A> sourceClass) {
+        assertValidForEachType(sourceClass);
+        return share(new ForEachDataStream<>(this, sourceClass));
+    }
+
+    public <A> void assertValidForEachType(Class<A> fromType) {
+        SolutionDescriptor<Solution_> solutionDescriptor = getSolutionDescriptor();
+        Set<Class<?>> problemFactOrEntityClassSet = solutionDescriptor.getProblemFactOrEntityClassSet();
+        /*
+         * Need to support the following situations:
+         * 1/ FactType == FromType; querying for the declared type.
+         * 2/ FromType extends/implements FactType; querying for impl type where declared type is its interface.
+         * 3/ FromType super FactType; querying for interface where declared type is its implementation.
+         */
+        boolean hasMatchingType = problemFactOrEntityClassSet.stream()
+                .anyMatch(factType -> fromType.isAssignableFrom(factType) || factType.isAssignableFrom(fromType));
+        if (!hasMatchingType) {
+            List<String> canonicalClassNameList = problemFactOrEntityClassSet.stream()
+                    .map(Class::getCanonicalName)
+                    .sorted()
+                    .toList();
+            throw new IllegalArgumentException("Cannot use class (" + fromType.getCanonicalName()
+                    + ") in a data stream as it is neither the same as, nor a superclass or superinterface of "
+                    + "one of planning entities or problem facts.\n"
+                    + "Ensure that all forEach(), join(), ifExists() and ifNotExists() building blocks only reference "
+                    + "classes assignable from planning entities or problem facts (" + canonicalClassNameList + ") "
+                    + "annotated on the planning solution (" + solutionDescriptor.getSolutionClass().getCanonicalName()
+                    + ").");
+        }
+    }
+
+    @Override
+    public @NonNull <A> UniDataStream<Solution_, A> forEach(@NonNull Class<A> sourceClass,
+            @NonNull SolutionExtractor<Solution_, A> extractor) {
+        assertValidForEachType(sourceClass);
+        return share(new ForEachDataStream<>(this, sourceClass, extractor));
+    }
+
+    @Override
+    public @NonNull <A> UniDataStream<Solution_, A> forEach(@NonNull Class<A> sourceClass, @NonNull Collection<A> collection) {
+        // Not checking for valid from type because the collection is designed to inject arbitrary data into the stream.
+        return share(new ForEachDataStream<>(this, sourceClass, collection));
+    }
+
+    public <Stream_ extends AbstractDataStream<Solution_>> Stream_ share(Stream_ stream) {
+        return share(stream, t -> {
+        });
+    }
+
+    /**
+     * Enables node sharing.
+     * If a stream already exists in this factory, it replaces it with the old copy.
+     * {@link AbstractDataStream} implement equals/hashcode ignoring child streams.
+     * <p>
+     * {@link DatasetSessionFactory#buildSession(Object)} needs this to happen for all streams.
+     * <p>
+     * This must be called before the stream receives child streams.
+     *
+     * @param stream never null
+     * @param consumer never null
+     * @param <Stream_> the {@link AbstractDataStream} subclass
+     * @return never null
+     */
+    @SuppressWarnings("unchecked")
+    public <Stream_ extends AbstractDataStream<Solution_>> Stream_ share(Stream_ stream, Consumer<Stream_> consumer) {
+        return (Stream_) sharingStreamMap.computeIfAbsent(stream, k -> {
+            consumer.accept(stream);
+            return stream;
+        });
+    }
+
+    public SolutionDescriptor<Solution_> getSolutionDescriptor() {
+        return solutionDescriptor;
+    }
+
+}
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/FilterUniDataStream.java b/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/FilterUniDataStream.java
new file mode 100644
index 0000000000..c646dc5634
--- /dev/null
+++ b/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/FilterUniDataStream.java
@@ -0,0 +1,52 @@
+package ai.timefold.solver.core.impl.move.dataset;
+
+import java.util.Objects;
+import java.util.function.Predicate;
+
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.uni.ConditionalUniTupleLifecycle;
+import ai.timefold.solver.core.impl.move.dataset.common.DataNodeBuildHelper;
+
+final class FilterUniDataStream<Solution_, A>
+        extends AbstractUniDataStream<Solution_, A> {
+
+    private final Predicate<A> predicate;
+
+    public FilterUniDataStream(DefaultDatasetFactory<Solution_> datasetFactory,
+            AbstractUniDataStream<Solution_, A> parent, Predicate<A> predicate) {
+        super(datasetFactory, parent);
+        this.predicate = predicate;
+        if (predicate == null) {
+            throw new IllegalArgumentException("The predicate (null) cannot be null.");
+        }
+    }
+
+    @Override
+    public void buildNode(DataNodeBuildHelper<Solution_> buildHelper) {
+        buildHelper.<UniTuple<A>> putInsertUpdateRetract(this, childStreamList,
+                tupleLifecycle -> new ConditionalUniTupleLifecycle<>(predicate, tupleLifecycle));
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(parent, predicate);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        } else if (o instanceof FilterUniDataStream<?, ?> other) {
+            return parent == other.parent
+                    && predicate == other.predicate;
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "Filter() with " + childStreamList.size() + " children";
+    }
+
+}
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/ForEachDataStream.java b/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/ForEachDataStream.java
new file mode 100644
index 0000000000..0df8c50e9c
--- /dev/null
+++ b/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/ForEachDataStream.java
@@ -0,0 +1,113 @@
+package ai.timefold.solver.core.impl.move.dataset;
+
+import java.util.Collection;
+import java.util.Objects;
+import java.util.Set;
+import java.util.function.Predicate;
+
+import ai.timefold.solver.core.impl.bavet.common.TupleSource;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.uni.AbstractForEachUniNode;
+import ai.timefold.solver.core.impl.bavet.uni.ForEachExcludingUnassignedUniNode;
+import ai.timefold.solver.core.impl.bavet.uni.ForEachFromSolutionUniNode;
+import ai.timefold.solver.core.impl.bavet.uni.ForEachStaticUniNode;
+import ai.timefold.solver.core.impl.bavet.uni.ForEachUniNode;
+import ai.timefold.solver.core.impl.move.dataset.common.DataNodeBuildHelper;
+import ai.timefold.solver.core.preview.api.move.SolutionExtractor;
+
+public final class ForEachDataStream<Solution_, A>
+        extends AbstractUniDataStream<Solution_, A>
+        implements TupleSource {
+
+    private final Class<A> forEachClass;
+    private final Predicate<A> filter;
+    private final SolutionExtractor<Solution_, A> extractor;
+    private final Collection<A> source;
+
+    public ForEachDataStream(DefaultDatasetFactory<Solution_> datasetFactory, Class<A> forEachClass) {
+        this(datasetFactory, forEachClass, (Predicate<A>) null);
+    }
+
+    public ForEachDataStream(DefaultDatasetFactory<Solution_> datasetFactory, Class<A> forEachClass, Predicate<A> filter) {
+        super(datasetFactory, null);
+        this.forEachClass = forEachClass;
+        if (forEachClass == null) {
+            throw new IllegalArgumentException("The forEachClass (null) cannot be null.");
+        }
+        this.filter = filter;
+        this.extractor = null;
+        this.source = null;
+    }
+
+    public ForEachDataStream(DefaultDatasetFactory<Solution_> datasetFactory, Class<A> forEachClass,
+            SolutionExtractor<Solution_, A> extractor) {
+        super(datasetFactory, null);
+        this.forEachClass = forEachClass;
+        this.filter = null;
+        this.extractor = Objects.requireNonNull(extractor);
+        this.source = null;
+    }
+
+    public ForEachDataStream(DefaultDatasetFactory<Solution_> datasetFactory, Class<A> forEachClass, Collection<A> source) {
+        super(datasetFactory, null);
+        this.forEachClass = forEachClass;
+        this.filter = null;
+        this.extractor = null;
+        this.source = Objects.requireNonNull(source);
+    }
+
+    @Override
+    public void collectActiveDataStreams(Set<AbstractDataStream<Solution_>> dataStreamSet) {
+        dataStreamSet.add(this);
+    }
+
+    @Override
+    public void buildNode(DataNodeBuildHelper<Solution_> buildHelper) {
+        TupleLifecycle<UniTuple<A>> tupleLifecycle = buildHelper.getAggregatedTupleLifecycle(childStreamList);
+        int outputStoreSize = buildHelper.extractTupleStoreSize(this);
+        var node = getNode(tupleLifecycle, outputStoreSize);
+        buildHelper.addNode(node, this, null);
+    }
+
+    private AbstractForEachUniNode<A> getNode(TupleLifecycle<UniTuple<A>> tupleLifecycle, int outputStoreSize) {
+        if (source != null) {
+            return new ForEachStaticUniNode<>(forEachClass, source, tupleLifecycle, outputStoreSize);
+        } else if (extractor != null) {
+            return new ForEachFromSolutionUniNode<>(forEachClass, extractor, tupleLifecycle, outputStoreSize);
+        } else if (filter == null) {
+            return new ForEachUniNode<>(forEachClass, tupleLifecycle, outputStoreSize);
+        } else {
+            return new ForEachExcludingUnassignedUniNode<>(forEachClass, filter, tupleLifecycle, outputStoreSize);
+        }
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (!(o instanceof ForEachDataStream<?, ?> that))
+            return false;
+        return Objects.equals(forEachClass, that.forEachClass) && Objects.equals(filter, that.filter)
+                && Objects.equals(extractor, that.extractor) && Objects.equals(source, that.source);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(forEachClass, filter, extractor, source);
+    }
+
+    @Override
+    public String toString() {
+        if (source != null) {
+            return "Static ForEach(" + forEachClass.getSimpleName() + ") with " + childStreamList.size() + " children";
+        } else if (extractor != null) {
+            return "ForEach(" + forEachClass.getSimpleName() + ") from solution with " + childStreamList.size() + " children";
+        } else if (filter == null) {
+            return "ForEach(" + forEachClass.getSimpleName() + ") with " + childStreamList.size() + " children";
+        } else {
+            return "ForEach(" + forEachClass.getSimpleName() + ") with filter and " + childStreamList.size() + " children";
+        }
+    }
+
+}
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/IfExistsUniDataStream.java b/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/IfExistsUniDataStream.java
new file mode 100644
index 0000000000..bcc38269c6
--- /dev/null
+++ b/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/IfExistsUniDataStream.java
@@ -0,0 +1,117 @@
+package ai.timefold.solver.core.impl.move.dataset;
+
+import java.util.Objects;
+import java.util.Set;
+import java.util.function.BiPredicate;
+
+import ai.timefold.solver.core.impl.bavet.common.index.IndexerFactory;
+import ai.timefold.solver.core.impl.bavet.common.index.joiner.DefaultBiJoiner;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.uni.IndexedIfExistsUniNode;
+import ai.timefold.solver.core.impl.bavet.uni.UnindexedIfExistsUniNode;
+import ai.timefold.solver.core.impl.move.dataset.common.BavetIfExistsDataStream;
+import ai.timefold.solver.core.impl.move.dataset.common.DataNodeBuildHelper;
+import ai.timefold.solver.core.impl.move.dataset.common.bridge.ForeBridgeUniDataStream;
+
+final class IfExistsUniDataStream<Solution_, A, B>
+        extends AbstractUniDataStream<Solution_, A>
+        implements BavetIfExistsDataStream<Solution_> {
+
+    private final AbstractUniDataStream<Solution_, A> parentA;
+    private final ForeBridgeUniDataStream<Solution_, B> parentBridgeB;
+    private final boolean shouldExist;
+    private final DefaultBiJoiner<A, B> joiner;
+    private final BiPredicate<A, B> filtering;
+
+    public IfExistsUniDataStream(DefaultDatasetFactory<Solution_> datasetFactory,
+            AbstractUniDataStream<Solution_, A> parentA,
+            ForeBridgeUniDataStream<Solution_, B> parentBridgeB,
+            boolean shouldExist,
+            DefaultBiJoiner<A, B> joiner, BiPredicate<A, B> filtering) {
+        super(datasetFactory);
+        this.parentA = parentA;
+        this.parentBridgeB = parentBridgeB;
+        this.shouldExist = shouldExist;
+        this.joiner = joiner;
+        this.filtering = filtering;
+    }
+
+    @Override
+    public void collectActiveDataStreams(Set<AbstractDataStream<Solution_>> dataStreamSet) {
+        parentA.collectActiveDataStreams(dataStreamSet);
+        parentBridgeB.collectActiveDataStreams(dataStreamSet);
+        dataStreamSet.add(this);
+    }
+
+    @Override
+    public void buildNode(DataNodeBuildHelper<Solution_> buildHelper) {
+        TupleLifecycle<UniTuple<A>> downstream = buildHelper.getAggregatedTupleLifecycle(childStreamList);
+        var indexerFactory = new IndexerFactory<>(joiner);
+        var node = indexerFactory.hasJoiners()
+                ? (filtering == null ? new IndexedIfExistsUniNode<>(shouldExist,
+                        indexerFactory.buildUniLeftMapping(), indexerFactory.buildRightMapping(),
+                        buildHelper.reserveTupleStoreIndex(parentA.getTupleSource()),
+                        buildHelper.reserveTupleStoreIndex(parentA.getTupleSource()),
+                        buildHelper.reserveTupleStoreIndex(parentBridgeB.getTupleSource()),
+                        buildHelper.reserveTupleStoreIndex(parentBridgeB.getTupleSource()),
+                        downstream, indexerFactory.buildIndexer(true), indexerFactory.buildIndexer(false))
+                        : new IndexedIfExistsUniNode<>(shouldExist,
+                                indexerFactory.buildUniLeftMapping(), indexerFactory.buildRightMapping(),
+                                buildHelper.reserveTupleStoreIndex(parentA.getTupleSource()),
+                                buildHelper.reserveTupleStoreIndex(parentA.getTupleSource()),
+                                buildHelper.reserveTupleStoreIndex(parentA.getTupleSource()),
+                                buildHelper.reserveTupleStoreIndex(parentBridgeB.getTupleSource()),
+                                buildHelper.reserveTupleStoreIndex(parentBridgeB.getTupleSource()),
+                                buildHelper.reserveTupleStoreIndex(parentBridgeB.getTupleSource()),
+                                downstream, indexerFactory.buildIndexer(true), indexerFactory.buildIndexer(false),
+                                filtering))
+                : (filtering == null ? new UnindexedIfExistsUniNode<>(shouldExist,
+                        buildHelper.reserveTupleStoreIndex(parentA.getTupleSource()),
+                        buildHelper.reserveTupleStoreIndex(parentBridgeB.getTupleSource()), downstream)
+                        : new UnindexedIfExistsUniNode<>(shouldExist,
+                                buildHelper.reserveTupleStoreIndex(parentA.getTupleSource()),
+                                buildHelper.reserveTupleStoreIndex(parentA.getTupleSource()),
+                                buildHelper.reserveTupleStoreIndex(parentBridgeB.getTupleSource()),
+                                buildHelper.reserveTupleStoreIndex(parentBridgeB.getTupleSource()),
+                                downstream, filtering));
+        buildHelper.addNode(node, this, this, parentBridgeB);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (!(o instanceof IfExistsUniDataStream<?, ?, ?> that))
+            return false;
+        return shouldExist == that.shouldExist && Objects.equals(parentA, that.parentA)
+                && Objects.equals(parentBridgeB, that.parentBridgeB) && Objects.equals(joiner, that.joiner)
+                && Objects.equals(filtering, that.filtering);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(parentA, parentBridgeB, shouldExist, joiner, filtering);
+    }
+
+    @Override
+    public String toString() {
+        return "IfExists() with " + childStreamList.size() + " children";
+    }
+
+    @Override
+    public AbstractDataStream<Solution_> getTupleSource() {
+        return parentA.getTupleSource();
+    }
+
+    @Override
+    public AbstractDataStream<Solution_> getLeftParent() {
+        return parentA;
+    }
+
+    @Override
+    public AbstractDataStream<Solution_> getRightParent() {
+        return parentBridgeB;
+    }
+
+}
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/IndexedList.java b/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/IndexedList.java
new file mode 100644
index 0000000000..1aa278371b
--- /dev/null
+++ b/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/IndexedList.java
@@ -0,0 +1,81 @@
+package ai.timefold.solver.core.impl.move.dataset;
+
+import java.util.AbstractList;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import ai.timefold.solver.core.impl.util.CollectionUtils;
+
+final class IndexedList<E> extends AbstractList<E> {
+
+    private final List<E> list;
+    private final Map<E, Integer> indexMap;
+
+    public IndexedList() {
+        this(16);
+    }
+
+    public IndexedList(int expectedSize) {
+        this.list = new ArrayList<>(expectedSize);
+        this.indexMap = CollectionUtils.newIdentityHashMap(expectedSize);
+    }
+
+    @Override
+    public E get(int index) {
+        return list.get(index);
+    }
+
+    @Override
+    public E set(int index, E element) {
+        if (index < 0 || index >= list.size()) {
+            throw new IndexOutOfBoundsException("The index (" + index + ") must be between 0 and " + (list.size() - 1) + ".");
+        } else if (indexMap.containsKey(element)) {
+            throw new IllegalArgumentException("The element (" + element + ") was already added to the list.");
+        } else {
+            E oldElement = list.set(index, element);
+            indexMap.remove(oldElement);
+            indexMap.put(element, index);
+            return oldElement;
+        }
+    }
+
+    @Override
+    public void add(int index, E element) {
+        if (index < 0 || index > list.size()) {
+            throw new IndexOutOfBoundsException("The index (" + index + ") must be between 0 and " + list.size() + ".");
+        } else if (indexMap.containsKey(element)) {
+            throw new IllegalArgumentException("The element (" + element + ") was already added to the list.");
+        }
+        list.add(index, element);
+        indexMap.put(element, index);
+        reindex(index + 1);
+    }
+
+    private void reindex(int startingIndex) {
+        int listSize = list.size();
+        for (int i = startingIndex; i < listSize; i++) {
+            indexMap.put(list.get(i), i);
+        }
+    }
+
+    @Override
+    public E remove(int index) {
+        E oldElement = list.remove(index);
+        indexMap.remove(oldElement);
+        reindex(index);
+        return oldElement;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public int indexOf(Object o) {
+        return indexMap.getOrDefault((E) o, -1);
+    }
+
+    @Override
+    public int size() {
+        return list.size();
+    }
+
+}
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/common/BavetDataStreamBinaryOperation.java b/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/common/BavetDataStreamBinaryOperation.java
new file mode 100644
index 0000000000..6c794aaa34
--- /dev/null
+++ b/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/common/BavetDataStreamBinaryOperation.java
@@ -0,0 +1,9 @@
+package ai.timefold.solver.core.impl.move.dataset.common;
+
+import ai.timefold.solver.core.impl.bavet.common.BavetStreamBinaryOperation;
+import ai.timefold.solver.core.impl.move.dataset.AbstractDataStream;
+
+public sealed interface BavetDataStreamBinaryOperation<Solution_>
+        extends BavetStreamBinaryOperation<AbstractDataStream<Solution_>> permits BavetIfExistsDataStream {
+
+}
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/common/BavetIfExistsDataStream.java b/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/common/BavetIfExistsDataStream.java
new file mode 100644
index 0000000000..1b46da0aa2
--- /dev/null
+++ b/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/common/BavetIfExistsDataStream.java
@@ -0,0 +1,5 @@
+package ai.timefold.solver.core.impl.move.dataset.common;
+
+public non-sealed interface BavetIfExistsDataStream<Solution_> extends BavetDataStreamBinaryOperation<Solution_> {
+
+}
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/common/DataNodeBuildHelper.java b/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/common/DataNodeBuildHelper.java
new file mode 100644
index 0000000000..675092f8ce
--- /dev/null
+++ b/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/common/DataNodeBuildHelper.java
@@ -0,0 +1,14 @@
+package ai.timefold.solver.core.impl.move.dataset.common;
+
+import java.util.Set;
+
+import ai.timefold.solver.core.impl.bavet.common.AbstractNodeBuildHelper;
+import ai.timefold.solver.core.impl.move.dataset.AbstractDataStream;
+
+public final class DataNodeBuildHelper<Solution_> extends AbstractNodeBuildHelper<AbstractDataStream<Solution_>> {
+
+    public DataNodeBuildHelper(Set<AbstractDataStream<Solution_>> activeStreamSet) {
+        super(activeStreamSet);
+    }
+
+}
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/common/bridge/AftBridgeUniDataStream.java b/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/common/bridge/AftBridgeUniDataStream.java
new file mode 100644
index 0000000000..b49aba4d60
--- /dev/null
+++ b/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/common/bridge/AftBridgeUniDataStream.java
@@ -0,0 +1,46 @@
+package ai.timefold.solver.core.impl.move.dataset.common.bridge;
+
+import java.util.Objects;
+
+import ai.timefold.solver.core.impl.bavet.common.TupleSource;
+import ai.timefold.solver.core.impl.move.dataset.AbstractDataStream;
+import ai.timefold.solver.core.impl.move.dataset.AbstractUniDataStream;
+import ai.timefold.solver.core.impl.move.dataset.DefaultDatasetFactory;
+import ai.timefold.solver.core.impl.move.dataset.common.DataNodeBuildHelper;
+
+public final class AftBridgeUniDataStream<Solution_, A>
+        extends AbstractUniDataStream<Solution_, A>
+        implements TupleSource {
+
+    public AftBridgeUniDataStream(DefaultDatasetFactory<Solution_> datasetFactory, AbstractDataStream<Solution_> parent) {
+        super(datasetFactory, parent);
+    }
+
+    @Override
+    public void buildNode(DataNodeBuildHelper<Solution_> buildHelper) {
+        // Do nothing. The parent stream builds everything.
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        AftBridgeUniDataStream<?, ?> that = (AftBridgeUniDataStream<?, ?>) o;
+        return Objects.equals(parent, that.parent);
+    }
+
+    @Override
+    public int hashCode() {
+        return parent.hashCode();
+    }
+
+    @Override
+    public String toString() {
+        return "Bridge from " + parent + " with " + childStreamList.size() + " children";
+    }
+
+}
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/common/bridge/ForeBridgeUniDataStream.java b/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/common/bridge/ForeBridgeUniDataStream.java
new file mode 100644
index 0000000000..1bcc5f32df
--- /dev/null
+++ b/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/common/bridge/ForeBridgeUniDataStream.java
@@ -0,0 +1,28 @@
+package ai.timefold.solver.core.impl.move.dataset.common.bridge;
+
+import ai.timefold.solver.core.impl.move.dataset.AbstractDataStream;
+import ai.timefold.solver.core.impl.move.dataset.AbstractUniDataStream;
+import ai.timefold.solver.core.impl.move.dataset.DefaultDatasetFactory;
+import ai.timefold.solver.core.impl.move.dataset.common.DataNodeBuildHelper;
+import ai.timefold.solver.core.preview.api.move.UniDataStream;
+
+public final class ForeBridgeUniDataStream<Solution_, A>
+        extends AbstractUniDataStream<Solution_, A>
+        implements UniDataStream<Solution_, A> {
+
+    public ForeBridgeUniDataStream(DefaultDatasetFactory<Solution_> datasetFactory,
+            AbstractDataStream<Solution_> parent) {
+        super(datasetFactory, parent);
+    }
+
+    @Override
+    public void buildNode(DataNodeBuildHelper<Solution_> buildHelper) {
+        // Do nothing. The child stream builds everything.
+    }
+
+    @Override
+    public String toString() {
+        return "Generic bridge";
+    }
+
+}
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/common/bridge/package-info.java b/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/common/bridge/package-info.java
new file mode 100644
index 0000000000..9ac8de06bc
--- /dev/null
+++ b/core/src/main/java/ai/timefold/solver/core/impl/move/dataset/common/bridge/package-info.java
@@ -0,0 +1,14 @@
+/**
+ * Data streams that serve as bridges.
+ * Fore bridges go before the stream they bridge,
+ * while aft bridges go after.
+ * <p>
+ * Aft bridges are node-shared,
+ * therefore their {@link java.lang.Object#equals(Object)} and {@link java.lang.Object#hashCode()} (java.lang.Object)}
+ * methods are overridden to reference the bridged stream,
+ * which carries all the equality data.
+ * <p>
+ * Fore bridges are node-shared through their child stream
+ * and therefore the equality logic can reside there entirely.
+ */
+package ai.timefold.solver.core.impl.move.dataset.common.bridge;
\ No newline at end of file
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/move/director/MoveDirector.java b/core/src/main/java/ai/timefold/solver/core/impl/move/director/MoveDirector.java
index 3d409d0b4b..726dad7b80 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/move/director/MoveDirector.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/move/director/MoveDirector.java
@@ -26,6 +26,20 @@ public MoveDirector(VariableDescriptorAwareScoreDirector<Solution_> scoreDirecto
         this.scoreDirector = Objects.requireNonNull(scoreDirector);
     }
 
+    @Override
+    public <Entity_, Value_> void assignValue(
+            @NonNull PlanningListVariableMetaModel<Solution_, Entity_, Value_> variableMetaModel, @NonNull Value_ planningValue,
+            @NonNull Entity_ destinationEntity, int destinationIndex) {
+
+    }
+
+    @Override
+    public <Entity_, Value_> void unassignValue(
+            @NonNull PlanningListVariableMetaModel<Solution_, Entity_, Value_> variableMetaModel, @NonNull Value_ movedValue,
+            @NonNull Entity_ sourceEntity, int sourceIndex) {
+
+    }
+
     public final <Entity_, Value_> void changeVariable(
             @NonNull PlanningVariableMetaModel<Solution_, Entity_, Value_> variableMetaModel,
             @NonNull Entity_ entity, Value_ newValue) {
@@ -35,40 +49,42 @@ public final <Entity_, Value_> void changeVariable(
         scoreDirector.afterVariableChanged(variableDescriptor, entity);
     }
 
-    public final <Entity_, Value_> void moveValueBetweenLists(
+    @SuppressWarnings("unchecked")
+    public final <Entity_, Value_> Value_ moveValueBetweenLists(
             @NonNull PlanningListVariableMetaModel<Solution_, Entity_, Value_> variableMetaModel,
             @NonNull Entity_ sourceEntity, int sourceIndex, @NonNull Entity_ destinationEntity, int destinationIndex) {
         if (sourceEntity == destinationEntity) {
-            moveValueInList(variableMetaModel, sourceEntity, sourceIndex, destinationIndex);
-            return;
+            return moveValueInList(variableMetaModel, sourceEntity, sourceIndex, destinationIndex);
         }
         var variableDescriptor = extractVariableDescriptor(variableMetaModel);
         scoreDirector.beforeListVariableChanged(variableDescriptor, sourceEntity, sourceIndex, sourceIndex + 1);
-        var element = variableDescriptor.removeElement(sourceEntity, sourceIndex);
+        var element = (Value_) variableDescriptor.removeElement(sourceEntity, sourceIndex);
         scoreDirector.afterListVariableChanged(variableDescriptor, sourceEntity, sourceIndex, sourceIndex);
 
         scoreDirector.beforeListVariableChanged(variableDescriptor, destinationEntity, destinationIndex, destinationIndex);
         variableDescriptor.addElement(destinationEntity, destinationIndex, element);
         scoreDirector.afterListVariableChanged(variableDescriptor, destinationEntity, destinationIndex, destinationIndex + 1);
+        return element;
     }
 
+    @SuppressWarnings("unchecked")
     @Override
-    public final <Entity_, Value_> void moveValueInList(
+    public final <Entity_, Value_> Value_ moveValueInList(
             @NonNull PlanningListVariableMetaModel<Solution_, Entity_, Value_> variableMetaModel,
             @NonNull Entity_ entity, int sourceIndex, int destinationIndex) {
         if (sourceIndex == destinationIndex) {
-            return;
+            return null;
         } else if (sourceIndex > destinationIndex) { // Always start from the lower index.
-            moveValueInList(variableMetaModel, entity, destinationIndex, sourceIndex);
-            return;
+            return moveValueInList(variableMetaModel, entity, destinationIndex, sourceIndex);
         }
         var variableDescriptor = extractVariableDescriptor(variableMetaModel);
         var toIndex = destinationIndex + 1;
         scoreDirector.beforeListVariableChanged(variableDescriptor, entity, sourceIndex, toIndex);
         var variable = variableDescriptor.getValue(entity);
-        var value = variable.remove(sourceIndex);
+        var value = (Value_) variable.remove(sourceIndex);
         variable.add(destinationIndex, value);
         scoreDirector.afterListVariableChanged(variableDescriptor, entity, sourceIndex, toIndex);
+        return value;
     }
 
     @Override
@@ -86,7 +102,7 @@ public final <Entity_, Value_> Value_ getValue(
 
     @SuppressWarnings("unchecked")
     @Override
-    public final <Entity_, Value_> Value_ getValueAtIndex(
+    public final <Entity_, Value_> @NonNull Value_ getValueAtIndex(
             @NonNull PlanningListVariableMetaModel<Solution_, Entity_, Value_> variableMetaModel,
             @NonNull Entity_ entity, int index) {
         return (Value_) extractVariableDescriptor(variableMetaModel).getValue(entity).get(index);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/move/generic/AbstractMove.java b/core/src/main/java/ai/timefold/solver/core/impl/move/generic/AbstractMove.java
new file mode 100644
index 0000000000..447b2fe777
--- /dev/null
+++ b/core/src/main/java/ai/timefold/solver/core/impl/move/generic/AbstractMove.java
@@ -0,0 +1,89 @@
+package ai.timefold.solver.core.impl.move.generic;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+import ai.timefold.solver.core.api.score.director.ScoreDirector;
+import ai.timefold.solver.core.impl.domain.solution.descriptor.DefaultPlanningListVariableMetaModel;
+import ai.timefold.solver.core.impl.domain.solution.descriptor.DefaultPlanningVariableMetaModel;
+import ai.timefold.solver.core.impl.domain.solution.descriptor.InnerVariableMetaModel;
+import ai.timefold.solver.core.impl.domain.variable.descriptor.GenuineVariableDescriptor;
+import ai.timefold.solver.core.impl.domain.variable.descriptor.ListVariableDescriptor;
+import ai.timefold.solver.core.impl.domain.variable.descriptor.VariableDescriptor;
+import ai.timefold.solver.core.preview.api.domain.metamodel.PlanningListVariableMetaModel;
+import ai.timefold.solver.core.preview.api.domain.metamodel.PlanningVariableMetaModel;
+import ai.timefold.solver.core.preview.api.domain.metamodel.VariableMetaModel;
+import ai.timefold.solver.core.preview.api.move.Move;
+
+import org.jspecify.annotations.NonNull;
+
+public abstract class AbstractMove<Solution_> implements Move<Solution_> {
+
+    private static final char OPENING_PARENTHESES = '(';
+    private static final char CLOSING_PARENTHESES = ')';
+
+    @Override
+    public final @NonNull String describe() {
+        var metaModels = getVariableMetaModels();
+        var substring = switch (metaModels.size()) {
+            case 0 -> "";
+            case 1 -> OPENING_PARENTHESES + getVariableDescriptor(metaModels.get(0)).getSimpleEntityAndVariableName()
+                    + CLOSING_PARENTHESES;
+            default -> {
+                var stringBuilder = new StringBuilder()
+                        .append(OPENING_PARENTHESES);
+                var first = true;
+                for (var variableMetaModel : getVariableMetaModels()) {
+                    if (first) {
+                        first = false;
+                    } else {
+                        stringBuilder.append(", ");
+                    }
+                    stringBuilder.append(getVariableDescriptor(variableMetaModel).getSimpleEntityAndVariableName());
+                }
+                stringBuilder.append(CLOSING_PARENTHESES);
+                yield stringBuilder.toString();
+            }
+        };
+        return getClass().getSimpleName() + substring;
+    }
+
+    protected List<VariableMetaModel<Solution_, ?, ?>> getVariableMetaModels() {
+        return Collections.emptyList();
+    }
+
+    @SuppressWarnings("unchecked")
+    protected final VariableDescriptor<Solution_> getVariableDescriptor(VariableMetaModel<Solution_, ?, ?> variableMetaModel) {
+        return ((InnerVariableMetaModel<Solution_>) variableMetaModel).variableDescriptor();
+    }
+
+    protected final GenuineVariableDescriptor<Solution_>
+            getVariableDescriptor(PlanningVariableMetaModel<Solution_, ?, ?> variableMetaModel) {
+        return ((DefaultPlanningVariableMetaModel<Solution_, ?, ?>) variableMetaModel).variableDescriptor();
+    }
+
+    protected final ListVariableDescriptor<Solution_>
+            getVariableDescriptor(PlanningListVariableMetaModel<Solution_, ?, ?> variableMetaModel) {
+        return ((DefaultPlanningListVariableMetaModel<Solution_, ?, ?>) variableMetaModel).variableDescriptor();
+    }
+
+    public static <E> List<E> rebaseList(List<E> externalObjectList, ScoreDirector<?> destinationScoreDirector) {
+        var rebasedObjectList = new ArrayList<E>(externalObjectList.size());
+        for (var entity : externalObjectList) {
+            rebasedObjectList.add(destinationScoreDirector.lookUpWorkingObject(entity));
+        }
+        return rebasedObjectList;
+    }
+
+    public static <E> Set<E> rebaseSet(Set<E> externalObjectSet, ScoreDirector<?> destinationScoreDirector) {
+        var rebasedObjectSet = new LinkedHashSet<E>(externalObjectSet.size());
+        for (var entity : externalObjectSet) {
+            rebasedObjectSet.add(destinationScoreDirector.lookUpWorkingObject(entity));
+        }
+        return rebasedObjectSet;
+    }
+
+}
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/move/generic/ChainedChangeMove.java b/core/src/main/java/ai/timefold/solver/core/impl/move/generic/ChainedChangeMove.java
new file mode 100644
index 0000000000..0b81169c1e
--- /dev/null
+++ b/core/src/main/java/ai/timefold/solver/core/impl/move/generic/ChainedChangeMove.java
@@ -0,0 +1,56 @@
+package ai.timefold.solver.core.impl.move.generic;
+
+import java.util.Objects;
+
+import ai.timefold.solver.core.impl.domain.variable.inverserelation.SingletonInverseVariableSupply;
+import ai.timefold.solver.core.preview.api.domain.metamodel.PlanningVariableMetaModel;
+import ai.timefold.solver.core.preview.api.move.MutableSolutionView;
+import ai.timefold.solver.core.preview.api.move.Rebaser;
+
+import org.jspecify.annotations.NonNull;
+
+public final class ChainedChangeMove<Solution_, Entity_> extends ChangeMove<Solution_, Entity_, Entity_> {
+
+    private final Entity_ oldTrailingEntity;
+    private final Entity_ newTrailingEntity;
+
+    @SuppressWarnings("unchecked")
+    public ChainedChangeMove(PlanningVariableMetaModel<Solution_, Entity_, Entity_> variableMetaModel, Entity_ entity,
+            Entity_ toPlanningValue, SingletonInverseVariableSupply inverseVariableSupply) {
+        super(variableMetaModel, entity, toPlanningValue);
+        this.oldTrailingEntity = (Entity_) Objects.requireNonNull(inverseVariableSupply).getInverseSingleton(entity);
+        this.newTrailingEntity =
+                toPlanningValue == null ? null : (Entity_) inverseVariableSupply.getInverseSingleton(toPlanningValue);
+    }
+
+    ChainedChangeMove(PlanningVariableMetaModel<Solution_, Entity_, Entity_> variableMetaModel, Entity_ entity,
+            Entity_ toPlanningValue, Entity_ oldTrailingEntity, Entity_ newTrailingEntity) {
+        super(variableMetaModel, entity, toPlanningValue);
+        this.oldTrailingEntity = oldTrailingEntity;
+        this.newTrailingEntity = newTrailingEntity;
+    }
+
+    @Override
+    public void execute(@NonNull MutableSolutionView<Solution_> solutionView) {
+        // Close the old chain
+        if (oldTrailingEntity != null) {
+            solutionView.changeVariable(variableMetaModel, oldTrailingEntity, readValue(solutionView));
+        }
+        // Change the entity
+        solutionView.changeVariable(variableMetaModel, entity, toPlanningValue);
+        // Reroute the new chain
+        if (newTrailingEntity != null) {
+            solutionView.changeVariable(variableMetaModel, newTrailingEntity, entity);
+        }
+    }
+
+    @Override
+    public @NonNull ChainedChangeMove<Solution_, Entity_> rebase(@NonNull Rebaser rebaser) {
+        return new ChainedChangeMove<>(variableMetaModel,
+                rebaser.rebase(entity),
+                rebaser.rebase(toPlanningValue),
+                rebaser.rebase(oldTrailingEntity),
+                rebaser.rebase(newTrailingEntity));
+    }
+
+}
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/move/generic/ChangeMove.java b/core/src/main/java/ai/timefold/solver/core/impl/move/generic/ChangeMove.java
new file mode 100644
index 0000000000..d06c8597ab
--- /dev/null
+++ b/core/src/main/java/ai/timefold/solver/core/impl/move/generic/ChangeMove.java
@@ -0,0 +1,89 @@
+package ai.timefold.solver.core.impl.move.generic;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+
+import ai.timefold.solver.core.api.domain.solution.PlanningSolution;
+import ai.timefold.solver.core.preview.api.domain.metamodel.PlanningVariableMetaModel;
+import ai.timefold.solver.core.preview.api.domain.metamodel.VariableMetaModel;
+import ai.timefold.solver.core.preview.api.move.Move;
+import ai.timefold.solver.core.preview.api.move.MutableSolutionView;
+import ai.timefold.solver.core.preview.api.move.Rebaser;
+import ai.timefold.solver.core.preview.api.move.SolutionView;
+
+import org.jspecify.annotations.NonNull;
+
+/**
+ * @param <Solution_> the solution type, the class with the {@link PlanningSolution} annotation
+ */
+public class ChangeMove<Solution_, Entity_, Value_> extends AbstractMove<Solution_> {
+
+    protected final PlanningVariableMetaModel<Solution_, Entity_, Value_> variableMetaModel;
+    protected final Entity_ entity;
+    protected final Value_ toPlanningValue;
+
+    private Value_ currentValue;
+
+    public ChangeMove(PlanningVariableMetaModel<Solution_, Entity_, Value_> variableMetaModel, Entity_ entity,
+            Value_ toPlanningValue) {
+        this.variableMetaModel = Objects.requireNonNull(variableMetaModel);
+        this.entity = Objects.requireNonNull(entity);
+        this.toPlanningValue = toPlanningValue;
+    }
+
+    protected Value_ readValue(SolutionView<Solution_> solutionView) {
+        if (currentValue == null) {
+            currentValue = solutionView.getValue(variableMetaModel, entity);
+        }
+        return currentValue;
+    }
+
+    @Override
+    public void execute(@NonNull MutableSolutionView<Solution_> solutionView) {
+        solutionView.changeVariable(variableMetaModel, entity, toPlanningValue);
+    }
+
+    @Override
+    public @NonNull Move<Solution_> rebase(@NonNull Rebaser rebaser) {
+        return new ChangeMove<>(variableMetaModel, rebaser.rebase(entity), rebaser.rebase(toPlanningValue));
+    }
+
+    @Override
+    public @NonNull Collection<?> extractPlanningEntities() {
+        return Collections.singletonList(entity);
+    }
+
+    @Override
+    public @NonNull Collection<?> extractPlanningValues() {
+        return Collections.singletonList(toPlanningValue);
+    }
+
+    @Override
+    protected List<VariableMetaModel<Solution_, ?, ?>> getVariableMetaModels() {
+        return List.of(variableMetaModel);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (!(o instanceof ChangeMove<?, ?, ?> that))
+            return false;
+        return Objects.equals(variableMetaModel, that.variableMetaModel) && Objects.equals(entity, that.entity)
+                && Objects.equals(toPlanningValue, that.toPlanningValue);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(variableMetaModel, entity, toPlanningValue);
+    }
+
+    @Override
+    public @NonNull String toString() {
+        var oldValue = currentValue == null ? getVariableDescriptor(variableMetaModel).getValue(entity) : currentValue;
+        return entity + " {" + oldValue + " -> " + toPlanningValue + "}";
+    }
+
+}
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/move/generic/ListAssignMove.java b/core/src/main/java/ai/timefold/solver/core/impl/move/generic/ListAssignMove.java
new file mode 100644
index 0000000000..280a3b3963
--- /dev/null
+++ b/core/src/main/java/ai/timefold/solver/core/impl/move/generic/ListAssignMove.java
@@ -0,0 +1,63 @@
+package ai.timefold.solver.core.impl.move.generic;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
+
+import ai.timefold.solver.core.preview.api.domain.metamodel.PlanningListVariableMetaModel;
+import ai.timefold.solver.core.preview.api.domain.metamodel.VariableMetaModel;
+import ai.timefold.solver.core.preview.api.move.Move;
+import ai.timefold.solver.core.preview.api.move.MutableSolutionView;
+import ai.timefold.solver.core.preview.api.move.Rebaser;
+
+import org.jspecify.annotations.NonNull;
+
+public final class ListAssignMove<Solution_, Entity_, Value_> extends AbstractMove<Solution_> {
+
+    private final PlanningListVariableMetaModel<Solution_, Entity_, Value_> variableMetaModel;
+    private final Value_ planningValue;
+    private final Entity_ destinationEntity;
+    private final int destinationIndex;
+
+    public ListAssignMove(PlanningListVariableMetaModel<Solution_, Entity_, Value_> variableMetaModel, Value_ planningValue,
+            Entity_ destinationEntity, int destinationIndex) {
+        this.variableMetaModel = Objects.requireNonNull(variableMetaModel);
+        this.planningValue = Objects.requireNonNull(planningValue);
+        this.destinationEntity = Objects.requireNonNull(destinationEntity);
+        if (destinationIndex < 0) {
+            throw new IllegalArgumentException("The destinationIndex (" + destinationIndex + ") must be greater than 0.");
+        }
+        this.destinationIndex = destinationIndex;
+    }
+
+    @Override
+    public void execute(@NonNull MutableSolutionView<Solution_> mutableSolutionView) {
+        mutableSolutionView.assignValue(variableMetaModel, planningValue, destinationEntity, destinationIndex);
+    }
+
+    @Override
+    public @NonNull Move<Solution_> rebase(@NonNull Rebaser rebaser) {
+        return new ListAssignMove<>(variableMetaModel, rebaser.rebase(planningValue),
+                rebaser.rebase(destinationEntity), destinationIndex);
+    }
+
+    @Override
+    public @NonNull Collection<?> extractPlanningEntities() {
+        return List.of(destinationEntity);
+    }
+
+    @Override
+    public @NonNull Collection<?> extractPlanningValues() {
+        return List.of(planningValue);
+    }
+
+    @Override
+    protected List<VariableMetaModel<Solution_, ?, ?>> getVariableMetaModels() {
+        return List.of(variableMetaModel);
+    }
+
+    @Override
+    public @NonNull String toString() {
+        return String.format("%s {null -> %s[%d]}", planningValue, destinationEntity, destinationIndex);
+    }
+}
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/move/generic/ListChangeMove.java b/core/src/main/java/ai/timefold/solver/core/impl/move/generic/ListChangeMove.java
new file mode 100644
index 0000000000..fafc3aa104
--- /dev/null
+++ b/core/src/main/java/ai/timefold/solver/core/impl/move/generic/ListChangeMove.java
@@ -0,0 +1,178 @@
+package ai.timefold.solver.core.impl.move.generic;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+
+import ai.timefold.solver.core.api.domain.solution.PlanningSolution;
+import ai.timefold.solver.core.api.domain.variable.PlanningListVariable;
+import ai.timefold.solver.core.preview.api.domain.metamodel.PlanningListVariableMetaModel;
+import ai.timefold.solver.core.preview.api.domain.metamodel.VariableMetaModel;
+import ai.timefold.solver.core.preview.api.move.MutableSolutionView;
+import ai.timefold.solver.core.preview.api.move.Rebaser;
+
+import org.jspecify.annotations.NonNull;
+
+/**
+ * Moves an element of a {@link PlanningListVariable list variable}. The moved element is identified
+ * by an entity instance and a position in that entity's list variable. The element is inserted at the given index
+ * in the given destination entity's list variable.
+ * <p>
+ * An undo move is simply created by flipping the source and destination entity+index.
+ *
+ * @param <Solution_> the solution type, the class with the {@link PlanningSolution} annotation
+ */
+public final class ListChangeMove<Solution_, Entity_, Value_> extends AbstractMove<Solution_> {
+
+    private final PlanningListVariableMetaModel<Solution_, Entity_, Value_> variableMetaModel;
+    private final Entity_ sourceEntity;
+    private final int sourceIndex;
+    private final Entity_ destinationEntity;
+    private final int destinationIndex;
+
+    private Value_ planningValue;
+
+    /**
+     * The move removes a planning value element from {@code sourceEntity.listVariable[sourceIndex]}
+     * and inserts the planning value at {@code destinationEntity.listVariable[destinationIndex]}.
+     *
+     * <h4>ListChangeMove anatomy</h4>
+     *
+     * <pre>
+     * {@code
+     *                             / destinationEntity
+     *                             |   / destinationIndex
+     *                             |   |
+     *                A {Ann[0]}->{Bob[2]}
+     *                |  |   |
+     * planning value /  |   \ sourceIndex
+     *                   \ sourceEntity
+     * }
+     * </pre>
+     *
+     * <h4>Example 1 - source and destination entities are different</h4>
+     *
+     * <pre>
+     * {@code
+     * GIVEN
+     * Ann.tasks = [A, B, C]
+     * Bob.tasks = [X, Y]
+     *
+     * WHEN
+     * ListChangeMove: A {Ann[0]->Bob[2]}
+     *
+     * THEN
+     * Ann.tasks = [B, C]
+     * Bob.tasks = [X, Y, A]
+     * }
+     * </pre>
+     *
+     * <h4>Example 2 - source and destination is the same entity</h4>
+     *
+     * <pre>
+     * {@code
+     * GIVEN
+     * Ann.tasks = [A, B, C]
+     *
+     * WHEN
+     * ListChangeMove: A {Ann[0]->Ann[2]}
+     *
+     * THEN
+     * Ann.tasks = [B, C, A]
+     * }
+     * </pre>
+     *
+     * @param variableMetaModel never null
+     * @param sourceEntity planning entity instance from which a planning value will be removed, for example "Ann"
+     * @param sourceIndex index in sourceEntity's list variable from which a planning value will be removed
+     * @param destinationEntity planning entity instance to which a planning value will be moved, for example "Bob"
+     * @param destinationIndex index in destinationEntity's list variable where the moved planning value will be inserted
+     */
+    public ListChangeMove(PlanningListVariableMetaModel<Solution_, Entity_, Value_> variableMetaModel, Entity_ sourceEntity,
+            int sourceIndex, Entity_ destinationEntity, int destinationIndex) {
+        this.variableMetaModel = Objects.requireNonNull(variableMetaModel);
+        this.sourceEntity = Objects.requireNonNull(sourceEntity);
+        if (sourceIndex < 0) {
+            throw new IllegalArgumentException("The sourceIndex (" + sourceIndex + ") must be greater than 0.");
+        }
+        this.sourceIndex = sourceIndex;
+        this.destinationEntity = Objects.requireNonNull(destinationEntity);
+        if (destinationIndex < 0) {
+            throw new IllegalArgumentException("The destinationIndex (" + destinationIndex + ") must be greater than 0.");
+        }
+        this.destinationIndex = destinationIndex;
+    }
+
+    @SuppressWarnings("unchecked")
+    private Value_ getMovedValue() {
+        if (planningValue == null) {
+            planningValue = (Value_) getVariableDescriptor(variableMetaModel)
+                    .getValue(sourceEntity)
+                    .get(sourceIndex);
+        }
+        return planningValue;
+    }
+
+    // ************************************************************************
+    // Worker methods
+    // ************************************************************************
+
+    @Override
+    public void execute(@NonNull MutableSolutionView<Solution_> solutionView) {
+        if (sourceEntity == destinationEntity) {
+            planningValue = solutionView.moveValueInList(variableMetaModel, sourceEntity, sourceIndex, destinationIndex);
+        } else {
+            planningValue = solutionView.moveValueBetweenLists(variableMetaModel, sourceEntity, sourceIndex, destinationEntity,
+                    destinationIndex);
+        }
+    }
+
+    @Override
+    public @NonNull ListChangeMove<Solution_, Entity_, Value_> rebase(@NonNull Rebaser rebaser) {
+        return new ListChangeMove<>(variableMetaModel,
+                rebaser.rebase(sourceEntity), sourceIndex,
+                rebaser.rebase(destinationEntity), destinationIndex);
+    }
+
+    @Override
+    public @NonNull Collection<Object> extractPlanningEntities() {
+        if (sourceEntity == destinationEntity) {
+            return Collections.singleton(sourceEntity);
+        } else {
+            return List.of(sourceEntity, destinationEntity);
+        }
+    }
+
+    @Override
+    public @NonNull Collection<Object> extractPlanningValues() {
+        return Collections.singleton(planningValue);
+    }
+
+    @Override
+    protected List<VariableMetaModel<Solution_, ?, ?>> getVariableMetaModels() {
+        return List.of(variableMetaModel);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (!(o instanceof ListChangeMove<?, ?, ?> that))
+            return false;
+        return sourceIndex == that.sourceIndex && destinationIndex == that.destinationIndex
+                && Objects.equals(variableMetaModel, that.variableMetaModel) && Objects.equals(sourceEntity, that.sourceEntity)
+                && Objects.equals(destinationEntity, that.destinationEntity);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(variableMetaModel, sourceEntity, sourceIndex, destinationEntity, destinationIndex);
+    }
+
+    @Override
+    public @NonNull String toString() {
+        return String.format("%s {%s[%d] -> %s[%d]}",
+                getMovedValue(), sourceEntity, sourceIndex, destinationEntity, destinationIndex);
+    }
+}
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/move/generic/ListUnassignMove.java b/core/src/main/java/ai/timefold/solver/core/impl/move/generic/ListUnassignMove.java
new file mode 100644
index 0000000000..e56693af8d
--- /dev/null
+++ b/core/src/main/java/ai/timefold/solver/core/impl/move/generic/ListUnassignMove.java
@@ -0,0 +1,79 @@
+package ai.timefold.solver.core.impl.move.generic;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+
+import ai.timefold.solver.core.preview.api.domain.metamodel.PlanningListVariableMetaModel;
+import ai.timefold.solver.core.preview.api.domain.metamodel.VariableMetaModel;
+import ai.timefold.solver.core.preview.api.move.Move;
+import ai.timefold.solver.core.preview.api.move.MutableSolutionView;
+import ai.timefold.solver.core.preview.api.move.Rebaser;
+
+import org.jspecify.annotations.NonNull;
+
+public final class ListUnassignMove<Solution_, Entity_, Value_> extends AbstractMove<Solution_> {
+
+    private final PlanningListVariableMetaModel<Solution_, Entity_, Value_> variableMetaModel;
+    private final Value_ movedValue;
+    private final Entity_ sourceEntity;
+    private final int sourceIndex;
+
+    public ListUnassignMove(PlanningListVariableMetaModel<Solution_, Entity_, Value_> variableMetaModel, Value_ value,
+            Entity_ sourceEntity, int sourceIndex) {
+        this.variableMetaModel = Objects.requireNonNull(variableMetaModel);
+        this.movedValue = Objects.requireNonNull(value);
+        this.sourceEntity = Objects.requireNonNull(sourceEntity);
+        if (sourceIndex < 0) {
+            throw new IllegalArgumentException("The sourceIndex (" + sourceIndex + ") must be greater than or equal to 0.");
+        }
+        this.sourceIndex = sourceIndex;
+    }
+
+    @Override
+    public void execute(@NonNull MutableSolutionView<Solution_> solutionView) {
+        solutionView.unassignValue(variableMetaModel, movedValue, sourceEntity, sourceIndex);
+    }
+
+    @Override
+    public @NonNull Move<Solution_> rebase(@NonNull Rebaser rebaser) {
+        return new ListUnassignMove<>(variableMetaModel, rebaser.rebase(movedValue), rebaser.rebase(sourceEntity),
+                sourceIndex);
+    }
+
+    @Override
+    public @NonNull Collection<?> extractPlanningEntities() {
+        return Collections.singleton(sourceEntity);
+    }
+
+    @Override
+    public @NonNull Collection<?> extractPlanningValues() {
+        return Collections.singleton(movedValue);
+    }
+
+    @Override
+    protected List<VariableMetaModel<Solution_, ?, ?>> getVariableMetaModels() {
+        return List.of(variableMetaModel);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (!(o instanceof ListUnassignMove<?, ?, ?> that))
+            return false;
+        return sourceIndex == that.sourceIndex && Objects.equals(variableMetaModel, that.variableMetaModel)
+                && Objects.equals(sourceEntity, that.sourceEntity);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(variableMetaModel, sourceEntity, sourceIndex);
+    }
+
+    @Override
+    public @NonNull String toString() {
+        return String.format("%s {%s[%d] -> null}", movedValue, sourceEntity, sourceIndex);
+    }
+}
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/BavetConstraintSession.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/BavetConstraintSession.java
index 42248d408a..9d43ea7f29 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/BavetConstraintSession.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/BavetConstraintSession.java
@@ -1,15 +1,15 @@
 package ai.timefold.solver.core.impl.score.stream.bavet;
 
-import java.util.IdentityHashMap;
 import java.util.Map;
 
 import ai.timefold.solver.core.api.score.Score;
 import ai.timefold.solver.core.api.score.constraint.ConstraintMatchTotal;
 import ai.timefold.solver.core.api.score.constraint.Indictment;
+import ai.timefold.solver.core.impl.bavet.AbstractSession;
+import ai.timefold.solver.core.impl.bavet.NodeNetwork;
+import ai.timefold.solver.core.impl.bavet.common.PropagationQueue;
 import ai.timefold.solver.core.impl.score.constraint.ConstraintMatchPolicy;
 import ai.timefold.solver.core.impl.score.director.stream.BavetConstraintStreamScoreDirectorFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.PropagationQueue;
-import ai.timefold.solver.core.impl.score.stream.bavet.uni.AbstractForEachUniNode;
 import ai.timefold.solver.core.impl.score.stream.common.inliner.AbstractScoreInliner;
 
 /**
@@ -18,57 +18,24 @@
  * {@link BavetConstraintStreamScoreDirectorFactory#newSession(Object, ConstraintMatchPolicy, boolean)}.
  *
  * @see PropagationQueue Description of the tuple propagation mechanism.
+ *
  * @param <Score_>
  */
-public final class BavetConstraintSession<Score_ extends Score<Score_>> {
+public final class BavetConstraintSession<Score_ extends Score<Score_>> extends AbstractSession {
 
     private final AbstractScoreInliner<Score_> scoreInliner;
-    private final NodeNetwork nodeNetwork;
-    private final Map<Class<?>, AbstractForEachUniNode<Object>[]> effectiveClassToNodeArrayMap;
 
     BavetConstraintSession(AbstractScoreInliner<Score_> scoreInliner) {
         this(scoreInliner, NodeNetwork.EMPTY);
     }
 
     BavetConstraintSession(AbstractScoreInliner<Score_> scoreInliner, NodeNetwork nodeNetwork) {
+        super(nodeNetwork);
         this.scoreInliner = scoreInliner;
-        this.nodeNetwork = nodeNetwork;
-        this.effectiveClassToNodeArrayMap = new IdentityHashMap<>(nodeNetwork.forEachNodeCount());
-    }
-
-    public void insert(Object fact) {
-        var factClass = fact.getClass();
-        for (var node : findNodes(factClass)) {
-            node.insert(fact);
-        }
-    }
-
-    private AbstractForEachUniNode<Object>[] findNodes(Class<?> factClass) {
-        // Map.computeIfAbsent() would have created lambdas on the hot path, this will not.
-        var nodeArray = effectiveClassToNodeArrayMap.get(factClass);
-        if (nodeArray == null) {
-            nodeArray = nodeNetwork.getApplicableForEachNodes(factClass);
-            effectiveClassToNodeArrayMap.put(factClass, nodeArray);
-        }
-        return nodeArray;
-    }
-
-    public void update(Object fact) {
-        var factClass = fact.getClass();
-        for (var node : findNodes(factClass)) {
-            node.update(fact);
-        }
-    }
-
-    public void retract(Object fact) {
-        var factClass = fact.getClass();
-        for (var node : findNodes(factClass)) {
-            node.retract(fact);
-        }
     }
 
     public Score_ calculateScore(int initScore) {
-        nodeNetwork.propagate();
+        settle();
         return scoreInliner.extractScore(initScore);
     }
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/BavetConstraintSessionFactory.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/BavetConstraintSessionFactory.java
index 0ca6763d8d..fbafd476eb 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/BavetConstraintSessionFactory.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/BavetConstraintSessionFactory.java
@@ -13,21 +13,22 @@
 import ai.timefold.solver.core.api.score.Score;
 import ai.timefold.solver.core.api.score.stream.Constraint;
 import ai.timefold.solver.core.api.score.stream.ConstraintMetaModel;
+import ai.timefold.solver.core.impl.bavet.NodeNetwork;
+import ai.timefold.solver.core.impl.bavet.common.AbstractConcatNode;
+import ai.timefold.solver.core.impl.bavet.common.AbstractIfExistsNode;
+import ai.timefold.solver.core.impl.bavet.common.AbstractJoinNode;
+import ai.timefold.solver.core.impl.bavet.common.AbstractNode;
+import ai.timefold.solver.core.impl.bavet.common.PropagationQueue;
+import ai.timefold.solver.core.impl.bavet.common.Propagator;
+import ai.timefold.solver.core.impl.bavet.uni.AbstractForEachUniNode;
 import ai.timefold.solver.core.impl.domain.solution.descriptor.SolutionDescriptor;
 import ai.timefold.solver.core.impl.score.constraint.ConstraintMatchPolicy;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractConcatNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractIfExistsNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractJoinNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractNode;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetAbstractConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetConcatConstraintStream;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetConstraintStreamBinaryOperation;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetIfExistsConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetJoinConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetStreamBinaryOperation;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.PropagationQueue;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.Propagator;
-import ai.timefold.solver.core.impl.score.stream.bavet.uni.AbstractForEachUniNode;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.common.inliner.AbstractScoreInliner;
 import ai.timefold.solver.core.impl.util.CollectionUtils;
 
@@ -122,21 +123,20 @@ public BavetConstraintSession<Score_> buildSession(Solution_ workingSolution, Co
         return new BavetConstraintSession<>(scoreInliner, buildNodeNetwork(constraintStreamSet, scoreInliner));
     }
 
-    @SuppressWarnings("unchecked")
     private static <Solution_, Score_ extends Score<Score_>> NodeNetwork buildNodeNetwork(
             Set<BavetAbstractConstraintStream<Solution_>> constraintStreamSet, AbstractScoreInliner<Score_> scoreInliner) {
         /*
          * Build constraintStreamSet in reverse order to create downstream nodes first
          * so every node only has final variables (some of which have downstream node method references).
          */
-        var buildHelper = new NodeBuildHelper<>(constraintStreamSet, scoreInliner);
+        var buildHelper = new ConstraintNodeBuildHelper<>(constraintStreamSet, scoreInliner);
         var reversedConstraintStreamList = new ArrayList<>(constraintStreamSet);
         Collections.reverse(reversedConstraintStreamList);
         for (var constraintStream : reversedConstraintStreamList) {
             constraintStream.buildNode(buildHelper);
         }
         var nodeList = buildHelper.destroyAndGetNodeList();
-        var declaredClassToNodeMap = new LinkedHashMap<Class<?>, List<AbstractForEachUniNode<Object>>>();
+        var declaredClassToNodeMap = new LinkedHashMap<Class<?>, List<AbstractForEachUniNode<?>>>();
         var nextNodeId = 0L;
         for (var node : nodeList) {
             /*
@@ -155,7 +155,7 @@ private static <Solution_, Score_ extends Score<Score_>> NodeNetwork buildNodeNe
                             + ") there are already 2 nodes (" + forEachUniNodeList + "), not adding another ("
                             + forEachUniNode + ").");
                 }
-                forEachUniNodeList.add((AbstractForEachUniNode<Object>) forEachUniNode);
+                forEachUniNodeList.add(forEachUniNode);
             }
         }
         var layerMap = new TreeMap<Long, List<Propagator>>();
@@ -187,28 +187,30 @@ private static <Solution_, Score_ extends Score<Score_>> NodeNetwork buildNodeNe
      * @param buildHelper never null
      * @return at least 0
      */
-    private static <Score_ extends Score<Score_>> long determineLayerIndex(AbstractNode node,
-            NodeBuildHelper<Score_> buildHelper) {
+    @SuppressWarnings("unchecked")
+    private static <Solution_, Score_ extends Score<Score_>> long determineLayerIndex(AbstractNode node,
+            ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         if (node instanceof AbstractForEachUniNode<?>) { // ForEach nodes, and only they, are in layer 0.
             return 0;
         } else if (node instanceof AbstractJoinNode<?, ?, ?> joinNode) {
             return determineLayerIndexOfBinaryOperation(
-                    (BavetJoinConstraintStream<?>) buildHelper.getNodeCreatingStream(joinNode), buildHelper);
+                    (BavetJoinConstraintStream<Solution_>) buildHelper.getNodeCreatingStream(joinNode), buildHelper);
         } else if (node instanceof AbstractConcatNode<?, ?, ?> concatNode) {
             return determineLayerIndexOfBinaryOperation(
-                    (BavetConcatConstraintStream<?>) buildHelper.getNodeCreatingStream(concatNode), buildHelper);
+                    (BavetConcatConstraintStream<Solution_>) buildHelper.getNodeCreatingStream(concatNode), buildHelper);
         } else if (node instanceof AbstractIfExistsNode<?, ?> ifExistsNode) {
             return determineLayerIndexOfBinaryOperation(
-                    (BavetIfExistsConstraintStream<?>) buildHelper.getNodeCreatingStream(ifExistsNode), buildHelper);
+                    (BavetIfExistsConstraintStream<Solution_>) buildHelper.getNodeCreatingStream(ifExistsNode), buildHelper);
         } else {
-            var nodeCreator = (BavetAbstractConstraintStream<?>) buildHelper.getNodeCreatingStream(node);
+            var nodeCreator = buildHelper.getNodeCreatingStream(node);
             var parentNode = buildHelper.findParentNode(nodeCreator.getParent());
             return parentNode.getLayerIndex() + 1;
         }
     }
 
-    private static <Score_ extends Score<Score_>> long determineLayerIndexOfBinaryOperation(
-            BavetStreamBinaryOperation<?> nodeCreator, NodeBuildHelper<Score_> buildHelper) {
+    private static <Solution_, Score_ extends Score<Score_>> long determineLayerIndexOfBinaryOperation(
+            BavetConstraintStreamBinaryOperation<Solution_> nodeCreator,
+            ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         var leftParent = nodeCreator.getLeftParent();
         var rightParent = nodeCreator.getRightParent();
         var leftParentNode = buildHelper.findParentNode(leftParent);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetAbstractBiConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetAbstractBiConstraintStream.java
index 441daef664..021f0b5648 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetAbstractBiConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetAbstractBiConstraintStream.java
@@ -21,10 +21,29 @@
 import ai.timefold.solver.core.api.score.stream.tri.TriConstraintStream;
 import ai.timefold.solver.core.api.score.stream.tri.TriJoiner;
 import ai.timefold.solver.core.api.score.stream.uni.UniConstraintStream;
+import ai.timefold.solver.core.impl.bavet.bi.Group0Mapping1CollectorBiNode;
+import ai.timefold.solver.core.impl.bavet.bi.Group0Mapping2CollectorBiNode;
+import ai.timefold.solver.core.impl.bavet.bi.Group0Mapping3CollectorBiNode;
+import ai.timefold.solver.core.impl.bavet.bi.Group0Mapping4CollectorBiNode;
+import ai.timefold.solver.core.impl.bavet.bi.Group1Mapping0CollectorBiNode;
+import ai.timefold.solver.core.impl.bavet.bi.Group1Mapping1CollectorBiNode;
+import ai.timefold.solver.core.impl.bavet.bi.Group1Mapping2CollectorBiNode;
+import ai.timefold.solver.core.impl.bavet.bi.Group1Mapping3CollectorBiNode;
+import ai.timefold.solver.core.impl.bavet.bi.Group2Mapping0CollectorBiNode;
+import ai.timefold.solver.core.impl.bavet.bi.Group2Mapping1CollectorBiNode;
+import ai.timefold.solver.core.impl.bavet.bi.Group2Mapping2CollectorBiNode;
+import ai.timefold.solver.core.impl.bavet.bi.Group3Mapping0CollectorBiNode;
+import ai.timefold.solver.core.impl.bavet.bi.Group3Mapping1CollectorBiNode;
+import ai.timefold.solver.core.impl.bavet.bi.Group4Mapping0CollectorBiNode;
+import ai.timefold.solver.core.impl.bavet.common.GroupNodeConstructor;
+import ai.timefold.solver.core.impl.bavet.common.index.joiner.TriJoinerComber;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetAbstractConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetScoringConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.GroupNodeConstructor;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeBiConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeQuadConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeTriConstraintStream;
@@ -33,10 +52,6 @@
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetForeBridgeQuadConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetForeBridgeTriConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetForeBridgeUniConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
 import ai.timefold.solver.core.impl.score.stream.bavet.quad.BavetAbstractQuadConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.quad.BavetBiConcatQuadConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.tri.BavetAbstractTriConstraintStream;
@@ -47,7 +62,6 @@
 import ai.timefold.solver.core.impl.score.stream.common.ScoreImpactType;
 import ai.timefold.solver.core.impl.score.stream.common.bi.BiConstraintBuilderImpl;
 import ai.timefold.solver.core.impl.score.stream.common.bi.InnerBiConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.common.tri.TriJoinerComber;
 import ai.timefold.solver.core.impl.util.ConstantLambdaUtils;
 
 import org.jspecify.annotations.NonNull;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetBiConcatBiConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetBiConcatBiConstraintStream.java
index 7049677bd7..e9d77d5455 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetBiConcatBiConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetBiConcatBiConstraintStream.java
@@ -4,14 +4,15 @@
 import java.util.Set;
 
 import ai.timefold.solver.core.api.score.Score;
+import ai.timefold.solver.core.impl.bavet.bi.ConcatBiBiNode;
+import ai.timefold.solver.core.impl.bavet.common.AbstractConcatNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractConcatNode;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetAbstractConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetConcatConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetForeBridgeBiConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
 
 public final class BavetBiConcatBiConstraintStream<Solution_, A, B> extends BavetAbstractBiConstraintStream<Solution_, A, B>
         implements BavetConcatConstraintStream<Solution_> {
@@ -46,7 +47,7 @@ public void collectActiveConstraintStreams(Set<BavetAbstractConstraintStream<Sol
     }
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         TupleLifecycle<BiTuple<A, B>> downstream = buildHelper.getAggregatedTupleLifecycle(childStreamList);
         int leftCloneStoreIndex = buildHelper.reserveTupleStoreIndex(leftParent.getTupleSource());
         int rightCloneStoreIndex = buildHelper.reserveTupleStoreIndex(rightParent.getTupleSource());
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetBiGroupBiConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetBiGroupBiConstraintStream.java
index 007b786be9..580ff2c80d 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetBiGroupBiConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetBiGroupBiConstraintStream.java
@@ -1,15 +1,13 @@
 package ai.timefold.solver.core.impl.score.stream.bavet.bi;
 
-import java.util.List;
 import java.util.Objects;
 
 import ai.timefold.solver.core.api.score.Score;
-import ai.timefold.solver.core.api.score.stream.ConstraintStream;
+import ai.timefold.solver.core.impl.bavet.common.GroupNodeConstructor;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.GroupNodeConstructor;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeBiConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
 
 final class BavetBiGroupBiConstraintStream<Solution_, A, B, NewA, NewB>
         extends BavetAbstractBiConstraintStream<Solution_, A, B> {
@@ -38,8 +36,8 @@ public boolean guaranteesDistinct() {
     // ************************************************************************
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
-        List<? extends ConstraintStream> aftStreamChildList = aftStream.getChildStreamList();
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
+        var aftStreamChildList = aftStream.getChildStreamList();
         nodeConstructor.build(buildHelper, parent.getTupleSource(), aftStream, aftStreamChildList, this, childStreamList,
                 constraintFactory.getEnvironmentMode());
     }
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetBiMapBiConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetBiMapBiConstraintStream.java
index 65cf1859a6..5bf601d28b 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetBiMapBiConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetBiMapBiConstraintStream.java
@@ -4,8 +4,9 @@
 import java.util.function.BiFunction;
 
 import ai.timefold.solver.core.api.score.Score;
+import ai.timefold.solver.core.impl.bavet.bi.MapBiToBiNode;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeBiConstraintStream;
 
 final class BavetBiMapBiConstraintStream<Solution_, A, B, NewA, NewB>
@@ -37,7 +38,7 @@ public void setAftBridge(BavetAftBridgeBiConstraintStream<Solution_, NewA, NewB>
     // ************************************************************************
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         assertEmptyChildStreamList();
         int inputStoreIndex = buildHelper.reserveTupleStoreIndex(parent.getTupleSource());
         int outputStoreSize = buildHelper.extractTupleStoreSize(aftStream);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetFilterBiConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetFilterBiConstraintStream.java
index 5c4c63a2cc..eb3bef7c07 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetFilterBiConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetFilterBiConstraintStream.java
@@ -4,9 +4,10 @@
 import java.util.function.BiPredicate;
 
 import ai.timefold.solver.core.api.score.Score;
+import ai.timefold.solver.core.impl.bavet.bi.ConditionalBiTupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 
 final class BavetFilterBiConstraintStream<Solution_, A, B>
         extends BavetAbstractBiConstraintStream<Solution_, A, B> {
@@ -28,7 +29,7 @@ public BavetFilterBiConstraintStream(BavetConstraintFactory<Solution_> constrain
     // ************************************************************************
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         buildHelper.<BiTuple<A, B>> putInsertUpdateRetract(this, childStreamList,
                 tupleLifecycle -> new ConditionalBiTupleLifecycle<>(predicate, tupleLifecycle));
     }
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetFlattenLastBiConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetFlattenLastBiConstraintStream.java
index 9c2c814c30..783557e86f 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetFlattenLastBiConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetFlattenLastBiConstraintStream.java
@@ -4,11 +4,12 @@
 import java.util.function.Function;
 
 import ai.timefold.solver.core.api.score.Score;
+import ai.timefold.solver.core.impl.bavet.bi.FlattenLastBiNode;
+import ai.timefold.solver.core.impl.bavet.common.AbstractFlattenLastNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractFlattenLastNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeBiConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
 
 final class BavetFlattenLastBiConstraintStream<Solution_, A, B, NewB>
         extends BavetAbstractBiConstraintStream<Solution_, A, B> {
@@ -37,7 +38,7 @@ public boolean guaranteesDistinct() {
     }
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         assertEmptyChildStreamList();
         int inputStoreIndex = buildHelper.reserveTupleStoreIndex(parent.getTupleSource());
         int outputStoreSize = buildHelper.extractTupleStoreSize(flattenLastStream);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetIfExistsBiConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetIfExistsBiConstraintStream.java
index 5365a9efe8..8b46e9400c 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetIfExistsBiConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetIfExistsBiConstraintStream.java
@@ -5,15 +5,17 @@
 
 import ai.timefold.solver.core.api.function.TriPredicate;
 import ai.timefold.solver.core.api.score.Score;
+import ai.timefold.solver.core.impl.bavet.bi.IndexedIfExistsBiNode;
+import ai.timefold.solver.core.impl.bavet.bi.UnindexedIfExistsBiNode;
+import ai.timefold.solver.core.impl.bavet.common.index.IndexerFactory;
+import ai.timefold.solver.core.impl.bavet.common.index.joiner.DefaultTriJoiner;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetAbstractConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetIfExistsConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetForeBridgeUniConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.index.IndexerFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.common.tri.DefaultTriJoiner;
 
 final class BavetIfExistsBiConstraintStream<Solution_, A, B, C>
         extends BavetAbstractBiConstraintStream<Solution_, A, B>
@@ -61,7 +63,7 @@ public BavetAbstractConstraintStream<Solution_> getTupleSource() {
     }
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         TupleLifecycle<BiTuple<A, B>> downstream = buildHelper.getAggregatedTupleLifecycle(childStreamList);
         IndexerFactory<C> indexerFactory = new IndexerFactory<>(joiner);
         var node = indexerFactory.hasJoiners()
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetJoinBiConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetJoinBiConstraintStream.java
index e6f640ffcd..190e82e0c0 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetJoinBiConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetJoinBiConstraintStream.java
@@ -5,15 +5,17 @@
 import java.util.function.BiPredicate;
 
 import ai.timefold.solver.core.api.score.Score;
+import ai.timefold.solver.core.impl.bavet.bi.IndexedJoinBiNode;
+import ai.timefold.solver.core.impl.bavet.bi.UnindexedJoinBiNode;
+import ai.timefold.solver.core.impl.bavet.common.index.IndexerFactory;
+import ai.timefold.solver.core.impl.bavet.common.index.joiner.DefaultBiJoiner;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetAbstractConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetJoinConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetForeBridgeUniConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.index.IndexerFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.common.bi.DefaultBiJoiner;
 
 public final class BavetJoinBiConstraintStream<Solution_, A, B> extends BavetAbstractBiConstraintStream<Solution_, A, B>
         implements BavetJoinConstraintStream<Solution_> {
@@ -51,7 +53,7 @@ public void collectActiveConstraintStreams(Set<BavetAbstractConstraintStream<Sol
     }
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         int outputStoreSize = buildHelper.extractTupleStoreSize(this);
         TupleLifecycle<BiTuple<A, B>> downstream = buildHelper.getAggregatedTupleLifecycle(childStreamList);
         IndexerFactory<B> indexerFactory = new IndexerFactory<>(joiner);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetQuadGroupBiConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetQuadGroupBiConstraintStream.java
index ec3e25f329..085cac464d 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetQuadGroupBiConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetQuadGroupBiConstraintStream.java
@@ -1,15 +1,13 @@
 package ai.timefold.solver.core.impl.score.stream.bavet.bi;
 
-import java.util.List;
 import java.util.Objects;
 
 import ai.timefold.solver.core.api.score.Score;
-import ai.timefold.solver.core.api.score.stream.ConstraintStream;
+import ai.timefold.solver.core.impl.bavet.common.GroupNodeConstructor;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.GroupNodeConstructor;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeQuadConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
 
 final class BavetQuadGroupBiConstraintStream<Solution_, A, B, NewA, NewB, NewC, NewD>
         extends BavetAbstractBiConstraintStream<Solution_, A, B> {
@@ -38,8 +36,8 @@ public boolean guaranteesDistinct() {
     // ************************************************************************
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
-        List<? extends ConstraintStream> aftStreamChildList = aftStream.getChildStreamList();
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
+        var aftStreamChildList = aftStream.getChildStreamList();
         nodeConstructor.build(buildHelper, parent.getTupleSource(), aftStream, aftStreamChildList, this, childStreamList,
                 constraintFactory.getEnvironmentMode());
     }
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetQuadMapBiConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetQuadMapBiConstraintStream.java
index dcb4454f5d..55ed43f87d 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetQuadMapBiConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetQuadMapBiConstraintStream.java
@@ -4,8 +4,9 @@
 import java.util.function.BiFunction;
 
 import ai.timefold.solver.core.api.score.Score;
+import ai.timefold.solver.core.impl.bavet.bi.MapBiToQuadNode;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeQuadConstraintStream;
 
 final class BavetQuadMapBiConstraintStream<Solution_, A, B, NewA, NewB, NewC, NewD>
@@ -45,7 +46,7 @@ public void setAftBridge(BavetAftBridgeQuadConstraintStream<Solution_, NewA, New
     // ************************************************************************
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         assertEmptyChildStreamList();
         int inputStoreIndex = buildHelper.reserveTupleStoreIndex(parent.getTupleSource());
         int outputStoreSize = buildHelper.extractTupleStoreSize(aftStream);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetScoringBiConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetScoringBiConstraintStream.java
index e99a94c5b4..e508269cac 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetScoringBiConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetScoringBiConstraintStream.java
@@ -13,7 +13,7 @@
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraint;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetScoringConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.common.inliner.ConstraintMatchSupplier;
 import ai.timefold.solver.core.impl.score.stream.common.inliner.UndoScoreImpacter;
 import ai.timefold.solver.core.impl.score.stream.common.inliner.WeightedScoreImpacter;
@@ -70,7 +70,7 @@ public void setConstraint(BavetConstraint<Solution_> constraint) {
     // ************************************************************************
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         assertEmptyChildStreamList();
         var scoreImpacter = buildScoreImpacter(buildHelper.getScoreInliner().getConstraintMatchPolicy());
         var weightedScoreImpacter = buildHelper.getScoreInliner().buildWeightedScoreImpacter(constraint);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetTriGroupBiConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetTriGroupBiConstraintStream.java
index c50da1f055..c68d30ab2d 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetTriGroupBiConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetTriGroupBiConstraintStream.java
@@ -1,15 +1,13 @@
 package ai.timefold.solver.core.impl.score.stream.bavet.bi;
 
-import java.util.List;
 import java.util.Objects;
 
 import ai.timefold.solver.core.api.score.Score;
-import ai.timefold.solver.core.api.score.stream.ConstraintStream;
+import ai.timefold.solver.core.impl.bavet.common.GroupNodeConstructor;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.GroupNodeConstructor;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeTriConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
 
 final class BavetTriGroupBiConstraintStream<Solution_, A, B, NewA, NewB, NewC>
         extends BavetAbstractBiConstraintStream<Solution_, A, B> {
@@ -38,8 +36,8 @@ public boolean guaranteesDistinct() {
     // ************************************************************************
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
-        List<? extends ConstraintStream> aftStreamChildList = aftStream.getChildStreamList();
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
+        var aftStreamChildList = aftStream.getChildStreamList();
         nodeConstructor.build(buildHelper, parent.getTupleSource(), aftStream, aftStreamChildList, this, childStreamList,
                 constraintFactory.getEnvironmentMode());
     }
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetTriMapBiConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetTriMapBiConstraintStream.java
index b42113626f..429adb05fd 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetTriMapBiConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetTriMapBiConstraintStream.java
@@ -4,8 +4,9 @@
 import java.util.function.BiFunction;
 
 import ai.timefold.solver.core.api.score.Score;
+import ai.timefold.solver.core.impl.bavet.bi.MapBiToTriNode;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeTriConstraintStream;
 
 final class BavetTriMapBiConstraintStream<Solution_, A, B, NewA, NewB, NewC>
@@ -42,7 +43,7 @@ public void setAftBridge(BavetAftBridgeTriConstraintStream<Solution_, NewA, NewB
     // ************************************************************************
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         assertEmptyChildStreamList();
         int inputStoreIndex = buildHelper.reserveTupleStoreIndex(parent.getTupleSource());
         int outputStoreSize = buildHelper.extractTupleStoreSize(aftStream);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetUniConcatBiConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetUniConcatBiConstraintStream.java
index 1945569fa9..8acddf54ae 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetUniConcatBiConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetUniConcatBiConstraintStream.java
@@ -5,15 +5,17 @@
 import java.util.function.Function;
 
 import ai.timefold.solver.core.api.score.Score;
+import ai.timefold.solver.core.impl.bavet.bi.ConcatBiUniNode;
+import ai.timefold.solver.core.impl.bavet.bi.ConcatUniBiNode;
+import ai.timefold.solver.core.impl.bavet.common.AbstractConcatNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractConcatNode;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetAbstractConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetConcatConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetForeBridgeBiConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetForeBridgeUniConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
 
 public final class BavetUniConcatBiConstraintStream<Solution_, A, B> extends BavetAbstractBiConstraintStream<Solution_, A, B>
         implements BavetConcatConstraintStream<Solution_> {
@@ -67,7 +69,7 @@ public void collectActiveConstraintStreams(Set<BavetAbstractConstraintStream<Sol
     }
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         TupleLifecycle<BiTuple<A, B>> downstream = buildHelper.getAggregatedTupleLifecycle(childStreamList);
         var leftCloneStoreIndex = buildHelper.reserveTupleStoreIndex(leftParent.getTupleSource());
         var rightCloneStoreIndex = buildHelper.reserveTupleStoreIndex(rightParent.getTupleSource());
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetUniGroupBiConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetUniGroupBiConstraintStream.java
index 5a68cae9bb..3e9c365eed 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetUniGroupBiConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetUniGroupBiConstraintStream.java
@@ -1,15 +1,13 @@
 package ai.timefold.solver.core.impl.score.stream.bavet.bi;
 
-import java.util.List;
 import java.util.Objects;
 
 import ai.timefold.solver.core.api.score.Score;
-import ai.timefold.solver.core.api.score.stream.ConstraintStream;
+import ai.timefold.solver.core.impl.bavet.common.GroupNodeConstructor;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.GroupNodeConstructor;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeUniConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
 
 final class BavetUniGroupBiConstraintStream<Solution_, A, B, NewA>
         extends BavetAbstractBiConstraintStream<Solution_, A, B> {
@@ -38,8 +36,8 @@ public boolean guaranteesDistinct() {
     // ************************************************************************
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
-        List<? extends ConstraintStream> aftStreamChildList = aftStream.getChildStreamList();
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
+        var aftStreamChildList = aftStream.getChildStreamList();
         nodeConstructor.build(buildHelper, parent.getTupleSource(), aftStream, aftStreamChildList, this, childStreamList,
                 constraintFactory.getEnvironmentMode());
     }
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetUniMapBiConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetUniMapBiConstraintStream.java
index 7f25b4b351..6dce8209d4 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetUniMapBiConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BavetUniMapBiConstraintStream.java
@@ -4,8 +4,9 @@
 import java.util.function.BiFunction;
 
 import ai.timefold.solver.core.api.score.Score;
+import ai.timefold.solver.core.impl.bavet.bi.MapBiToUniNode;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeUniConstraintStream;
 
 final class BavetUniMapBiConstraintStream<Solution_, A, B, NewA>
@@ -34,7 +35,7 @@ public boolean guaranteesDistinct() {
     }
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         assertEmptyChildStreamList();
         int inputStoreIndex = buildHelper.reserveTupleStoreIndex(parent.getTupleSource());
         int outputStoreSize = buildHelper.extractTupleStoreSize(aftStream);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BiScorer.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BiScorer.java
index 4e73367491..5c91b20c10 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BiScorer.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/BiScorer.java
@@ -1,8 +1,8 @@
 package ai.timefold.solver.core.impl.score.stream.bavet.bi;
 
 import ai.timefold.solver.core.api.function.TriFunction;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractScorer;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
 import ai.timefold.solver.core.impl.score.stream.common.inliner.UndoScoreImpacter;
 import ai.timefold.solver.core.impl.score.stream.common.inliner.WeightedScoreImpacter;
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/ConditionalBiTupleLifecycle.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/ConditionalBiTupleLifecycle.java
deleted file mode 100644
index 9597aa2246..0000000000
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/bi/ConditionalBiTupleLifecycle.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.bi;
-
-import java.util.function.BiPredicate;
-
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.AbstractConditionalTupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-
-final class ConditionalBiTupleLifecycle<A, B> extends AbstractConditionalTupleLifecycle<BiTuple<A, B>> {
-    private final BiPredicate<A, B> predicate;
-
-    public ConditionalBiTupleLifecycle(BiPredicate<A, B> predicate, TupleLifecycle<BiTuple<A, B>> tupleLifecycle) {
-        super(tupleLifecycle);
-        this.predicate = predicate;
-    }
-
-    @Override
-    protected boolean test(BiTuple<A, B> tuple) {
-        return predicate.test(tuple.factA, tuple.factB);
-    }
-
-}
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/AbstractScorer.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/AbstractScorer.java
index d4903b2604..cba5e9c937 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/AbstractScorer.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/AbstractScorer.java
@@ -1,7 +1,7 @@
 package ai.timefold.solver.core.impl.score.stream.bavet.common;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.AbstractTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.AbstractTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
 import ai.timefold.solver.core.impl.score.stream.common.inliner.UndoScoreImpacter;
 import ai.timefold.solver.core.impl.score.stream.common.inliner.WeightedScoreImpacter;
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/BavetAbstractConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/BavetAbstractConstraintStream.java
index 2aeec36ae1..3628528caa 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/BavetAbstractConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/BavetAbstractConstraintStream.java
@@ -8,6 +8,7 @@
 import ai.timefold.solver.core.api.score.Score;
 import ai.timefold.solver.core.api.score.constraint.ConstraintRef;
 import ai.timefold.solver.core.api.score.stream.Constraint;
+import ai.timefold.solver.core.impl.bavet.common.TupleSource;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraint;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
 import ai.timefold.solver.core.impl.score.stream.common.AbstractConstraintStream;
@@ -109,7 +110,7 @@ public BavetAbstractConstraintStream<Solution_> getTupleSource() {
         return parent.getTupleSource();
     }
 
-    public abstract <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper);
+    public abstract <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper);
 
     // ************************************************************************
     // Helper methods
@@ -135,6 +136,7 @@ protected void assertEmptyChildStreamList() {
      * @return null for join/ifExists nodes, which have left and right parents instead;
      *         also null for forEach node, which has no parent.
      */
+    @Override
     public final BavetAbstractConstraintStream<Solution_> getParent() {
         return parent;
     }
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/BavetConcatConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/BavetConcatConstraintStream.java
index 6399fae8bd..373a66cc1a 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/BavetConcatConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/BavetConcatConstraintStream.java
@@ -1,6 +1,8 @@
 package ai.timefold.solver.core.impl.score.stream.bavet.common;
 
+import ai.timefold.solver.core.impl.bavet.common.TupleSource;
+
 public interface BavetConcatConstraintStream<Solution_>
-        extends BavetStreamBinaryOperation<Solution_>, TupleSource {
+        extends BavetConstraintStreamBinaryOperation<Solution_>, TupleSource {
 
 }
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/BavetConstraintStreamBinaryOperation.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/BavetConstraintStreamBinaryOperation.java
new file mode 100644
index 0000000000..8611dab8c2
--- /dev/null
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/BavetConstraintStreamBinaryOperation.java
@@ -0,0 +1,8 @@
+package ai.timefold.solver.core.impl.score.stream.bavet.common;
+
+import ai.timefold.solver.core.impl.bavet.common.BavetStreamBinaryOperation;
+
+public interface BavetConstraintStreamBinaryOperation<Solution_>
+        extends BavetStreamBinaryOperation<BavetAbstractConstraintStream<Solution_>> {
+
+}
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/BavetIfExistsConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/BavetIfExistsConstraintStream.java
index ed46705d00..c6bfccbd88 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/BavetIfExistsConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/BavetIfExistsConstraintStream.java
@@ -1,5 +1,5 @@
 package ai.timefold.solver.core.impl.score.stream.bavet.common;
 
-public interface BavetIfExistsConstraintStream<Solution_> extends BavetStreamBinaryOperation<Solution_> {
+public interface BavetIfExistsConstraintStream<Solution_> extends BavetConstraintStreamBinaryOperation<Solution_> {
 
 }
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/BavetJoinConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/BavetJoinConstraintStream.java
index da0eedf76b..9115f75975 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/BavetJoinConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/BavetJoinConstraintStream.java
@@ -1,20 +1,8 @@
 package ai.timefold.solver.core.impl.score.stream.bavet.common;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetForeBridgeUniConstraintStream;
+import ai.timefold.solver.core.impl.bavet.common.TupleSource;
 
 public interface BavetJoinConstraintStream<Solution_>
-        extends BavetStreamBinaryOperation<Solution_>, TupleSource {
-
-    /**
-     *
-     * @return An instance of {@link BavetForeBridgeUniConstraintStream}.
-     */
-    BavetAbstractConstraintStream<Solution_> getLeftParent();
-
-    /**
-     *
-     * @return An instance of {@link BavetForeBridgeUniConstraintStream}.
-     */
-    BavetAbstractConstraintStream<Solution_> getRightParent();
+        extends BavetConstraintStreamBinaryOperation<Solution_>, TupleSource {
 
 }
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/BavetStreamBinaryOperation.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/BavetStreamBinaryOperation.java
deleted file mode 100644
index 1d1614cebb..0000000000
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/BavetStreamBinaryOperation.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common;
-
-import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetForeBridgeUniConstraintStream;
-
-public interface BavetStreamBinaryOperation<Solution_> {
-    /**
-     * @return An instance of {@link BavetForeBridgeUniConstraintStream}.
-     */
-    BavetAbstractConstraintStream<Solution_> getLeftParent();
-
-    /**
-     * @return An instance of {@link BavetForeBridgeUniConstraintStream}.
-     */
-    BavetAbstractConstraintStream<Solution_> getRightParent();
-
-}
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/ConstraintNodeBuildHelper.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/ConstraintNodeBuildHelper.java
new file mode 100644
index 0000000000..f1d7afa4c6
--- /dev/null
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/ConstraintNodeBuildHelper.java
@@ -0,0 +1,24 @@
+package ai.timefold.solver.core.impl.score.stream.bavet.common;
+
+import java.util.Set;
+
+import ai.timefold.solver.core.api.score.Score;
+import ai.timefold.solver.core.impl.bavet.common.AbstractNodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.common.inliner.AbstractScoreInliner;
+
+public final class ConstraintNodeBuildHelper<Solution_, Score_ extends Score<Score_>>
+        extends AbstractNodeBuildHelper<BavetAbstractConstraintStream<Solution_>> {
+
+    private final AbstractScoreInliner<Score_> scoreInliner;
+
+    public ConstraintNodeBuildHelper(Set<BavetAbstractConstraintStream<Solution_>> activeStreamSet,
+            AbstractScoreInliner<Score_> scoreInliner) {
+        super(activeStreamSet);
+        this.scoreInliner = scoreInliner;
+    }
+
+    public AbstractScoreInliner<Score_> getScoreInliner() {
+        return scoreInliner;
+    }
+
+}
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/TupleSource.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/TupleSource.java
deleted file mode 100644
index 7e5a5ee517..0000000000
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/TupleSource.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common;
-
-public interface TupleSource {
-}
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/bridge/BavetAftBridgeBiConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/bridge/BavetAftBridgeBiConstraintStream.java
index be94e23482..a67bb09796 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/bridge/BavetAftBridgeBiConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/bridge/BavetAftBridgeBiConstraintStream.java
@@ -3,11 +3,11 @@
 import java.util.Objects;
 
 import ai.timefold.solver.core.api.score.Score;
+import ai.timefold.solver.core.impl.bavet.common.TupleSource;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
 import ai.timefold.solver.core.impl.score.stream.bavet.bi.BavetAbstractBiConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetAbstractConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.TupleSource;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 
 public final class BavetAftBridgeBiConstraintStream<Solution_, A, B>
         extends BavetAbstractBiConstraintStream<Solution_, A, B>
@@ -19,7 +19,7 @@ public BavetAftBridgeBiConstraintStream(BavetConstraintFactory<Solution_> constr
     }
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         // Do nothing. The parent stream builds everything.
     }
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/bridge/BavetAftBridgeQuadConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/bridge/BavetAftBridgeQuadConstraintStream.java
index bc56c00f02..7db79c1f29 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/bridge/BavetAftBridgeQuadConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/bridge/BavetAftBridgeQuadConstraintStream.java
@@ -3,10 +3,10 @@
 import java.util.Objects;
 
 import ai.timefold.solver.core.api.score.Score;
+import ai.timefold.solver.core.impl.bavet.common.TupleSource;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetAbstractConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.TupleSource;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.quad.BavetAbstractQuadConstraintStream;
 
 public final class BavetAftBridgeQuadConstraintStream<Solution_, A, B, C, D>
@@ -19,7 +19,7 @@ public BavetAftBridgeQuadConstraintStream(BavetConstraintFactory<Solution_> cons
     }
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         // Do nothing. The parent stream builds everything.
     }
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/bridge/BavetAftBridgeTriConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/bridge/BavetAftBridgeTriConstraintStream.java
index 6cace8759d..16b6c9ee0a 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/bridge/BavetAftBridgeTriConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/bridge/BavetAftBridgeTriConstraintStream.java
@@ -3,10 +3,10 @@
 import java.util.Objects;
 
 import ai.timefold.solver.core.api.score.Score;
+import ai.timefold.solver.core.impl.bavet.common.TupleSource;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetAbstractConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.TupleSource;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.tri.BavetAbstractTriConstraintStream;
 
 public final class BavetAftBridgeTriConstraintStream<Solution_, A, B, C>
@@ -19,7 +19,7 @@ public BavetAftBridgeTriConstraintStream(BavetConstraintFactory<Solution_> const
     }
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         // Do nothing. The parent stream builds everything.
     }
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/bridge/BavetAftBridgeUniConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/bridge/BavetAftBridgeUniConstraintStream.java
index e96ca54142..24d4b3674e 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/bridge/BavetAftBridgeUniConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/bridge/BavetAftBridgeUniConstraintStream.java
@@ -3,10 +3,10 @@
 import java.util.Objects;
 
 import ai.timefold.solver.core.api.score.Score;
+import ai.timefold.solver.core.impl.bavet.common.TupleSource;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetAbstractConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.TupleSource;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.uni.BavetAbstractUniConstraintStream;
 
 public final class BavetAftBridgeUniConstraintStream<Solution_, A>
@@ -19,7 +19,7 @@ public BavetAftBridgeUniConstraintStream(BavetConstraintFactory<Solution_> const
     }
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         // Do nothing. The parent stream builds everything.
     }
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/bridge/BavetForeBridgeBiConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/bridge/BavetForeBridgeBiConstraintStream.java
index 02a870e280..d917acc221 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/bridge/BavetForeBridgeBiConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/bridge/BavetForeBridgeBiConstraintStream.java
@@ -3,7 +3,7 @@
 import ai.timefold.solver.core.api.score.Score;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
 import ai.timefold.solver.core.impl.score.stream.bavet.bi.BavetAbstractBiConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 
 public final class BavetForeBridgeBiConstraintStream<Solution_, A, B>
         extends BavetAbstractBiConstraintStream<Solution_, A, B> {
@@ -18,7 +18,7 @@ public BavetForeBridgeBiConstraintStream(BavetConstraintFactory<Solution_> const
     // ************************************************************************
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         // Do nothing. The child stream builds everything.
     }
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/bridge/BavetForeBridgeQuadConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/bridge/BavetForeBridgeQuadConstraintStream.java
index 10ce5bd857..0f65cde50d 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/bridge/BavetForeBridgeQuadConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/bridge/BavetForeBridgeQuadConstraintStream.java
@@ -2,7 +2,7 @@
 
 import ai.timefold.solver.core.api.score.Score;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.quad.BavetAbstractQuadConstraintStream;
 
 public final class BavetForeBridgeQuadConstraintStream<Solution_, A, B, C, D>
@@ -18,7 +18,7 @@ public BavetForeBridgeQuadConstraintStream(BavetConstraintFactory<Solution_> con
     // ************************************************************************
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         // Do nothing. The child stream builds everything.
     }
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/bridge/BavetForeBridgeTriConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/bridge/BavetForeBridgeTriConstraintStream.java
index 2824e5aa7f..6252686a6d 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/bridge/BavetForeBridgeTriConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/bridge/BavetForeBridgeTriConstraintStream.java
@@ -2,7 +2,7 @@
 
 import ai.timefold.solver.core.api.score.Score;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.tri.BavetAbstractTriConstraintStream;
 
 public final class BavetForeBridgeTriConstraintStream<Solution_, A, B, C>
@@ -18,7 +18,7 @@ public BavetForeBridgeTriConstraintStream(BavetConstraintFactory<Solution_> cons
     // ************************************************************************
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         // Do nothing. The child stream builds everything.
     }
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/bridge/BavetForeBridgeUniConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/bridge/BavetForeBridgeUniConstraintStream.java
index 647190a02f..a6877f97e0 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/bridge/BavetForeBridgeUniConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/bridge/BavetForeBridgeUniConstraintStream.java
@@ -2,7 +2,7 @@
 
 import ai.timefold.solver.core.api.score.Score;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.uni.BavetAbstractUniConstraintStream;
 
 public final class BavetForeBridgeUniConstraintStream<Solution_, A>
@@ -18,7 +18,7 @@ public BavetForeBridgeUniConstraintStream(BavetConstraintFactory<Solution_> cons
     // ************************************************************************
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         // Do nothing. The child stream builds everything.
     }
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/package-info.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/package-info.java
deleted file mode 100644
index da2363ff2b..0000000000
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/package-info.java
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * This package contains code that deals with indexing of tuples.
- * The entry point is {@link ai.timefold.solver.core.impl.score.stream.bavet.common.index.IndexerFactory},
- * which also contains a description of the entire mechanism.
- */
-package ai.timefold.solver.core.impl.score.stream.bavet.common.index;
\ No newline at end of file
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetAbstractQuadConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetAbstractQuadConstraintStream.java
index d91a3e3eaf..da122ce063 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetAbstractQuadConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetAbstractQuadConstraintStream.java
@@ -23,11 +23,30 @@
 import ai.timefold.solver.core.api.score.stream.quad.QuadConstraintStream;
 import ai.timefold.solver.core.api.score.stream.tri.TriConstraintStream;
 import ai.timefold.solver.core.api.score.stream.uni.UniConstraintStream;
+import ai.timefold.solver.core.impl.bavet.common.GroupNodeConstructor;
+import ai.timefold.solver.core.impl.bavet.common.index.joiner.PentaJoinerComber;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.quad.Group0Mapping1CollectorQuadNode;
+import ai.timefold.solver.core.impl.bavet.quad.Group0Mapping2CollectorQuadNode;
+import ai.timefold.solver.core.impl.bavet.quad.Group0Mapping3CollectorQuadNode;
+import ai.timefold.solver.core.impl.bavet.quad.Group0Mapping4CollectorQuadNode;
+import ai.timefold.solver.core.impl.bavet.quad.Group1Mapping0CollectorQuadNode;
+import ai.timefold.solver.core.impl.bavet.quad.Group1Mapping1CollectorQuadNode;
+import ai.timefold.solver.core.impl.bavet.quad.Group1Mapping2CollectorQuadNode;
+import ai.timefold.solver.core.impl.bavet.quad.Group1Mapping3CollectorQuadNode;
+import ai.timefold.solver.core.impl.bavet.quad.Group2Mapping0CollectorQuadNode;
+import ai.timefold.solver.core.impl.bavet.quad.Group2Mapping1CollectorQuadNode;
+import ai.timefold.solver.core.impl.bavet.quad.Group2Mapping2CollectorQuadNode;
+import ai.timefold.solver.core.impl.bavet.quad.Group3Mapping0CollectorQuadNode;
+import ai.timefold.solver.core.impl.bavet.quad.Group3Mapping1CollectorQuadNode;
+import ai.timefold.solver.core.impl.bavet.quad.Group4Mapping0CollectorQuadNode;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
 import ai.timefold.solver.core.impl.score.stream.bavet.bi.BavetAbstractBiConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetAbstractConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetScoringConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.GroupNodeConstructor;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeBiConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeQuadConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeTriConstraintStream;
@@ -36,15 +55,10 @@
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetForeBridgeQuadConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetForeBridgeTriConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetForeBridgeUniConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
 import ai.timefold.solver.core.impl.score.stream.bavet.tri.BavetAbstractTriConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.uni.BavetAbstractUniConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.common.RetrievalSemantics;
 import ai.timefold.solver.core.impl.score.stream.common.ScoreImpactType;
-import ai.timefold.solver.core.impl.score.stream.common.penta.PentaJoinerComber;
 import ai.timefold.solver.core.impl.score.stream.common.quad.InnerQuadConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.common.quad.QuadConstraintBuilderImpl;
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetBiConcatQuadConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetBiConcatQuadConstraintStream.java
index 94958f0082..dfebd4ef99 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetBiConcatQuadConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetBiConcatQuadConstraintStream.java
@@ -5,15 +5,17 @@
 import java.util.function.BiFunction;
 
 import ai.timefold.solver.core.api.score.Score;
+import ai.timefold.solver.core.impl.bavet.common.AbstractConcatNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.quad.ConcatBiQuadNode;
+import ai.timefold.solver.core.impl.bavet.quad.ConcatQuadBiNode;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractConcatNode;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetAbstractConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetConcatConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetForeBridgeBiConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetForeBridgeQuadConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
 
 public final class BavetBiConcatQuadConstraintStream<Solution_, A, B, C, D>
         extends BavetAbstractQuadConstraintStream<Solution_, A, B, C, D>
@@ -71,7 +73,7 @@ public void collectActiveConstraintStreams(Set<BavetAbstractConstraintStream<Sol
     }
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         TupleLifecycle<QuadTuple<A, B, C, D>> downstream = buildHelper.getAggregatedTupleLifecycle(childStreamList);
         var leftCloneStoreIndex = buildHelper.reserveTupleStoreIndex(leftParent.getTupleSource());
         var rightCloneStoreIndex = buildHelper.reserveTupleStoreIndex(rightParent.getTupleSource());
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetBiGroupQuadConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetBiGroupQuadConstraintStream.java
index 52a6d8782e..f874452736 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetBiGroupQuadConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetBiGroupQuadConstraintStream.java
@@ -1,15 +1,13 @@
 package ai.timefold.solver.core.impl.score.stream.bavet.quad;
 
-import java.util.List;
 import java.util.Objects;
 
 import ai.timefold.solver.core.api.score.Score;
-import ai.timefold.solver.core.api.score.stream.ConstraintStream;
+import ai.timefold.solver.core.impl.bavet.common.GroupNodeConstructor;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.GroupNodeConstructor;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeBiConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
 
 final class BavetBiGroupQuadConstraintStream<Solution_, A, B, C, D, NewA, NewB>
         extends BavetAbstractQuadConstraintStream<Solution_, A, B, C, D> {
@@ -38,8 +36,8 @@ public boolean guaranteesDistinct() {
     // ************************************************************************
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
-        List<? extends ConstraintStream> aftStreamChildList = aftStream.getChildStreamList();
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
+        var aftStreamChildList = aftStream.getChildStreamList();
         nodeConstructor.build(buildHelper, parent.getTupleSource(), aftStream, aftStreamChildList, this, childStreamList,
                 constraintFactory.getEnvironmentMode());
     }
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetBiMapQuadConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetBiMapQuadConstraintStream.java
index 1be86fab9a..cda1944edf 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetBiMapQuadConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetBiMapQuadConstraintStream.java
@@ -4,8 +4,9 @@
 
 import ai.timefold.solver.core.api.function.QuadFunction;
 import ai.timefold.solver.core.api.score.Score;
+import ai.timefold.solver.core.impl.bavet.quad.MapQuadToBiNode;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeBiConstraintStream;
 
 final class BavetBiMapQuadConstraintStream<Solution_, A, B, C, D, NewA, NewB>
@@ -37,7 +38,7 @@ public boolean guaranteesDistinct() {
     }
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         assertEmptyChildStreamList();
         int inputStoreIndex = buildHelper.reserveTupleStoreIndex(parent.getTupleSource());
         int outputStoreSize = buildHelper.extractTupleStoreSize(aftStream);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetFilterQuadConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetFilterQuadConstraintStream.java
index e59781158b..bc8791efa8 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetFilterQuadConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetFilterQuadConstraintStream.java
@@ -4,9 +4,10 @@
 
 import ai.timefold.solver.core.api.function.QuadPredicate;
 import ai.timefold.solver.core.api.score.Score;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.quad.ConditionalQuadTupleLifecycle;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 
 final class BavetFilterQuadConstraintStream<Solution_, A, B, C, D>
         extends BavetAbstractQuadConstraintStream<Solution_, A, B, C, D> {
@@ -28,7 +29,7 @@ public BavetFilterQuadConstraintStream(BavetConstraintFactory<Solution_> constra
     // ************************************************************************
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         buildHelper.<QuadTuple<A, B, C, D>> putInsertUpdateRetract(this, childStreamList,
                 tupleLifecycle -> new ConditionalQuadTupleLifecycle<>(predicate, tupleLifecycle));
     }
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetFlattenLastQuadConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetFlattenLastQuadConstraintStream.java
index 5af7ed11fe..a4b8ef4187 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetFlattenLastQuadConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetFlattenLastQuadConstraintStream.java
@@ -4,8 +4,9 @@
 import java.util.function.Function;
 
 import ai.timefold.solver.core.api.score.Score;
+import ai.timefold.solver.core.impl.bavet.quad.FlattenLastQuadNode;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeQuadConstraintStream;
 
 final class BavetFlattenLastQuadConstraintStream<Solution_, A, B, C, D, NewD>
@@ -35,7 +36,7 @@ public boolean guaranteesDistinct() {
     }
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         assertEmptyChildStreamList();
         int inputStoreIndex = buildHelper.reserveTupleStoreIndex(parent.getTupleSource());
         int outputStoreSize = buildHelper.extractTupleStoreSize(flattenLastStream);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetIfExistsQuadConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetIfExistsQuadConstraintStream.java
index 03d23d1a4f..c03ac22913 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetIfExistsQuadConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetIfExistsQuadConstraintStream.java
@@ -5,15 +5,17 @@
 
 import ai.timefold.solver.core.api.function.PentaPredicate;
 import ai.timefold.solver.core.api.score.Score;
+import ai.timefold.solver.core.impl.bavet.common.index.IndexerFactory;
+import ai.timefold.solver.core.impl.bavet.common.index.joiner.DefaultPentaJoiner;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.quad.IndexedIfExistsQuadNode;
+import ai.timefold.solver.core.impl.bavet.quad.UnindexedIfExistsQuadNode;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetAbstractConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetIfExistsConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetForeBridgeUniConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.index.IndexerFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.common.penta.DefaultPentaJoiner;
 
 final class BavetIfExistsQuadConstraintStream<Solution_, A, B, C, D, E>
         extends BavetAbstractQuadConstraintStream<Solution_, A, B, C, D>
@@ -61,7 +63,7 @@ public BavetAbstractConstraintStream<Solution_> getTupleSource() {
     }
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         TupleLifecycle<QuadTuple<A, B, C, D>> downstream = buildHelper.getAggregatedTupleLifecycle(childStreamList);
         IndexerFactory<E> indexerFactory = new IndexerFactory<>(joiner);
         var node = indexerFactory.hasJoiners()
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetJoinQuadConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetJoinQuadConstraintStream.java
index 4c0d323348..3fab65c2af 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetJoinQuadConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetJoinQuadConstraintStream.java
@@ -5,16 +5,18 @@
 
 import ai.timefold.solver.core.api.function.QuadPredicate;
 import ai.timefold.solver.core.api.score.Score;
+import ai.timefold.solver.core.impl.bavet.common.index.IndexerFactory;
+import ai.timefold.solver.core.impl.bavet.common.index.joiner.DefaultQuadJoiner;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.quad.IndexedJoinQuadNode;
+import ai.timefold.solver.core.impl.bavet.quad.UnindexedJoinQuadNode;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetAbstractConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetJoinConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetForeBridgeTriConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetForeBridgeUniConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.index.IndexerFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.common.quad.DefaultQuadJoiner;
 
 public final class BavetJoinQuadConstraintStream<Solution_, A, B, C, D>
         extends BavetAbstractQuadConstraintStream<Solution_, A, B, C, D>
@@ -54,7 +56,7 @@ public void collectActiveConstraintStreams(Set<BavetAbstractConstraintStream<Sol
     }
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         int outputStoreSize = buildHelper.extractTupleStoreSize(this);
         TupleLifecycle<QuadTuple<A, B, C, D>> downstream = buildHelper.getAggregatedTupleLifecycle(childStreamList);
         IndexerFactory<D> indexerFactory = new IndexerFactory<>(joiner);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetQuadConcatQuadConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetQuadConcatQuadConstraintStream.java
index 24d9526f96..842201e1b4 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetQuadConcatQuadConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetQuadConcatQuadConstraintStream.java
@@ -4,14 +4,15 @@
 import java.util.Set;
 
 import ai.timefold.solver.core.api.score.Score;
+import ai.timefold.solver.core.impl.bavet.common.AbstractConcatNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.quad.ConcatQuadQuadNode;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractConcatNode;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetAbstractConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetConcatConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetForeBridgeQuadConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
 
 public final class BavetQuadConcatQuadConstraintStream<Solution_, A, B, C, D>
         extends BavetAbstractQuadConstraintStream<Solution_, A, B, C, D>
@@ -47,7 +48,7 @@ public void collectActiveConstraintStreams(Set<BavetAbstractConstraintStream<Sol
     }
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         TupleLifecycle<QuadTuple<A, B, C, D>> downstream = buildHelper.getAggregatedTupleLifecycle(childStreamList);
         int leftCloneStoreIndex = buildHelper.reserveTupleStoreIndex(leftParent.getTupleSource());
         int rightCloneStoreIndex = buildHelper.reserveTupleStoreIndex(rightParent.getTupleSource());
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetQuadGroupQuadConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetQuadGroupQuadConstraintStream.java
index c01703729e..2f368368e9 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetQuadGroupQuadConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetQuadGroupQuadConstraintStream.java
@@ -1,15 +1,13 @@
 package ai.timefold.solver.core.impl.score.stream.bavet.quad;
 
-import java.util.List;
 import java.util.Objects;
 
 import ai.timefold.solver.core.api.score.Score;
-import ai.timefold.solver.core.api.score.stream.ConstraintStream;
+import ai.timefold.solver.core.impl.bavet.common.GroupNodeConstructor;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.GroupNodeConstructor;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeQuadConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
 
 final class BavetQuadGroupQuadConstraintStream<Solution_, A, B, C, D, NewA, NewB, NewC, NewD>
         extends BavetAbstractQuadConstraintStream<Solution_, A, B, C, D> {
@@ -38,8 +36,8 @@ public boolean guaranteesDistinct() {
     // ************************************************************************
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
-        List<? extends ConstraintStream> aftStreamChildList = aftStream.getChildStreamList();
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
+        var aftStreamChildList = aftStream.getChildStreamList();
         nodeConstructor.build(buildHelper, parent.getTupleSource(), aftStream, aftStreamChildList, this, childStreamList,
                 constraintFactory.getEnvironmentMode());
     }
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetQuadMapQuadConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetQuadMapQuadConstraintStream.java
index 1c53010174..d2c0c1e46d 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetQuadMapQuadConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetQuadMapQuadConstraintStream.java
@@ -4,8 +4,9 @@
 
 import ai.timefold.solver.core.api.function.QuadFunction;
 import ai.timefold.solver.core.api.score.Score;
+import ai.timefold.solver.core.impl.bavet.quad.MapQuadToQuadNode;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeQuadConstraintStream;
 
 final class BavetQuadMapQuadConstraintStream<Solution_, A, B, C, D, NewA, NewB, NewC, NewD>
@@ -42,7 +43,7 @@ public boolean guaranteesDistinct() {
     }
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         assertEmptyChildStreamList();
         int inputStoreIndex = buildHelper.reserveTupleStoreIndex(parent.getTupleSource());
         int outputStoreSize = buildHelper.extractTupleStoreSize(aftStream);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetScoringQuadConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetScoringQuadConstraintStream.java
index 36432cd455..2acade862b 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetScoringQuadConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetScoringQuadConstraintStream.java
@@ -13,7 +13,7 @@
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraint;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetScoringConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.common.inliner.ConstraintMatchSupplier;
 import ai.timefold.solver.core.impl.score.stream.common.inliner.UndoScoreImpacter;
 import ai.timefold.solver.core.impl.score.stream.common.inliner.WeightedScoreImpacter;
@@ -71,7 +71,7 @@ public void setConstraint(BavetConstraint<Solution_> constraint) {
     // ************************************************************************
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         assertEmptyChildStreamList();
         var scoreImpacter = buildScoreImpacter(buildHelper.getScoreInliner().getConstraintMatchPolicy());
         var weightedScoreImpacter = buildHelper.getScoreInliner().buildWeightedScoreImpacter(constraint);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetTriConcatQuadConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetTriConcatQuadConstraintStream.java
index 5a343cae1f..720b774942 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetTriConcatQuadConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetTriConcatQuadConstraintStream.java
@@ -5,15 +5,17 @@
 
 import ai.timefold.solver.core.api.function.TriFunction;
 import ai.timefold.solver.core.api.score.Score;
+import ai.timefold.solver.core.impl.bavet.common.AbstractConcatNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.quad.ConcatQuadTriNode;
+import ai.timefold.solver.core.impl.bavet.quad.ConcatTriQuadNode;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractConcatNode;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetAbstractConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetConcatConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetForeBridgeQuadConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetForeBridgeTriConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
 
 public final class BavetTriConcatQuadConstraintStream<Solution_, A, B, C, D>
         extends BavetAbstractQuadConstraintStream<Solution_, A, B, C, D>
@@ -68,7 +70,7 @@ public void collectActiveConstraintStreams(Set<BavetAbstractConstraintStream<Sol
     }
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         TupleLifecycle<QuadTuple<A, B, C, D>> downstream = buildHelper.getAggregatedTupleLifecycle(childStreamList);
         var leftCloneStoreIndex = buildHelper.reserveTupleStoreIndex(leftParent.getTupleSource());
         var rightCloneStoreIndex = buildHelper.reserveTupleStoreIndex(rightParent.getTupleSource());
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetTriGroupQuadConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetTriGroupQuadConstraintStream.java
index 2d210b577f..13268b46f7 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetTriGroupQuadConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetTriGroupQuadConstraintStream.java
@@ -1,15 +1,13 @@
 package ai.timefold.solver.core.impl.score.stream.bavet.quad;
 
-import java.util.List;
 import java.util.Objects;
 
 import ai.timefold.solver.core.api.score.Score;
-import ai.timefold.solver.core.api.score.stream.ConstraintStream;
+import ai.timefold.solver.core.impl.bavet.common.GroupNodeConstructor;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.GroupNodeConstructor;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeTriConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
 
 final class BavetTriGroupQuadConstraintStream<Solution_, A, B, C, D, NewA, NewB, NewC>
         extends BavetAbstractQuadConstraintStream<Solution_, A, B, C, D> {
@@ -38,8 +36,8 @@ public boolean guaranteesDistinct() {
     // ************************************************************************
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
-        List<? extends ConstraintStream> aftStreamChildList = aftStream.getChildStreamList();
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
+        var aftStreamChildList = aftStream.getChildStreamList();
         nodeConstructor.build(buildHelper, parent.getTupleSource(), aftStream, aftStreamChildList, this, childStreamList,
                 constraintFactory.getEnvironmentMode());
     }
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetTriMapQuadConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetTriMapQuadConstraintStream.java
index 2b2d268de6..4c49e8e8c5 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetTriMapQuadConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetTriMapQuadConstraintStream.java
@@ -4,8 +4,9 @@
 
 import ai.timefold.solver.core.api.function.QuadFunction;
 import ai.timefold.solver.core.api.score.Score;
+import ai.timefold.solver.core.impl.bavet.quad.MapQuadToTriNode;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeTriConstraintStream;
 
 final class BavetTriMapQuadConstraintStream<Solution_, A, B, C, D, NewA, NewB, NewC>
@@ -39,7 +40,7 @@ public boolean guaranteesDistinct() {
     }
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         assertEmptyChildStreamList();
         int inputStoreIndex = buildHelper.reserveTupleStoreIndex(parent.getTupleSource());
         int outputStoreSize = buildHelper.extractTupleStoreSize(aftStream);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetUniConcatQuadConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetUniConcatQuadConstraintStream.java
index e813086925..9cff7ed430 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetUniConcatQuadConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetUniConcatQuadConstraintStream.java
@@ -5,15 +5,17 @@
 import java.util.function.Function;
 
 import ai.timefold.solver.core.api.score.Score;
+import ai.timefold.solver.core.impl.bavet.common.AbstractConcatNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.quad.ConcatQuadUniNode;
+import ai.timefold.solver.core.impl.bavet.quad.ConcatUniQuadNode;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractConcatNode;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetAbstractConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetConcatConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetForeBridgeQuadConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetForeBridgeUniConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
 
 public final class BavetUniConcatQuadConstraintStream<Solution_, A, B, C, D>
         extends BavetAbstractQuadConstraintStream<Solution_, A, B, C, D>
@@ -74,7 +76,7 @@ public void collectActiveConstraintStreams(Set<BavetAbstractConstraintStream<Sol
     }
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         TupleLifecycle<QuadTuple<A, B, C, D>> downstream = buildHelper.getAggregatedTupleLifecycle(childStreamList);
         var leftCloneStoreIndex = buildHelper.reserveTupleStoreIndex(leftParent.getTupleSource());
         var rightCloneStoreIndex = buildHelper.reserveTupleStoreIndex(rightParent.getTupleSource());
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetUniGroupQuadConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetUniGroupQuadConstraintStream.java
index 2a9a81f983..1fdc734219 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetUniGroupQuadConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetUniGroupQuadConstraintStream.java
@@ -1,15 +1,13 @@
 package ai.timefold.solver.core.impl.score.stream.bavet.quad;
 
-import java.util.List;
 import java.util.Objects;
 
 import ai.timefold.solver.core.api.score.Score;
-import ai.timefold.solver.core.api.score.stream.ConstraintStream;
+import ai.timefold.solver.core.impl.bavet.common.GroupNodeConstructor;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.GroupNodeConstructor;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeUniConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
 
 final class BavetUniGroupQuadConstraintStream<Solution_, A, B, C, D, NewA>
         extends BavetAbstractQuadConstraintStream<Solution_, A, B, C, D> {
@@ -38,8 +36,8 @@ public boolean guaranteesDistinct() {
     // ************************************************************************
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
-        List<? extends ConstraintStream> aftStreamChildList = aftStream.getChildStreamList();
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
+        var aftStreamChildList = aftStream.getChildStreamList();
         nodeConstructor.build(buildHelper, parent.getTupleSource(), aftStream, aftStreamChildList, this, childStreamList,
                 constraintFactory.getEnvironmentMode());
     }
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetUniMapQuadConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetUniMapQuadConstraintStream.java
index c7fac31a2e..27d0d3b881 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetUniMapQuadConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/BavetUniMapQuadConstraintStream.java
@@ -4,8 +4,9 @@
 
 import ai.timefold.solver.core.api.function.QuadFunction;
 import ai.timefold.solver.core.api.score.Score;
+import ai.timefold.solver.core.impl.bavet.quad.MapQuadToUniNode;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeUniConstraintStream;
 
 final class BavetUniMapQuadConstraintStream<Solution_, A, B, C, D, NewA>
@@ -34,7 +35,7 @@ public boolean guaranteesDistinct() {
     }
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         assertEmptyChildStreamList();
         int inputStoreIndex = buildHelper.reserveTupleStoreIndex(parent.getTupleSource());
         int outputStoreSize = buildHelper.extractTupleStoreSize(aftStream);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/QuadScorer.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/QuadScorer.java
index 65e74e62f2..8a7f9ecac7 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/QuadScorer.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/quad/QuadScorer.java
@@ -1,8 +1,8 @@
 package ai.timefold.solver.core.impl.score.stream.bavet.quad;
 
 import ai.timefold.solver.core.api.function.PentaFunction;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractScorer;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
 import ai.timefold.solver.core.impl.score.stream.common.inliner.UndoScoreImpacter;
 import ai.timefold.solver.core.impl.score.stream.common.inliner.WeightedScoreImpacter;
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetAbstractTriConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetAbstractTriConstraintStream.java
index b0de0d90a5..4d9c7bd5d5 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetAbstractTriConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetAbstractTriConstraintStream.java
@@ -1,10 +1,10 @@
 package ai.timefold.solver.core.impl.score.stream.bavet.tri;
 
-import static ai.timefold.solver.core.impl.score.stream.bavet.common.GroupNodeConstructor.fourKeysGroupBy;
-import static ai.timefold.solver.core.impl.score.stream.bavet.common.GroupNodeConstructor.oneKeyGroupBy;
-import static ai.timefold.solver.core.impl.score.stream.bavet.common.GroupNodeConstructor.threeKeysGroupBy;
-import static ai.timefold.solver.core.impl.score.stream.bavet.common.GroupNodeConstructor.twoKeysGroupBy;
-import static ai.timefold.solver.core.impl.score.stream.bavet.common.GroupNodeConstructor.zeroKeysGroupBy;
+import static ai.timefold.solver.core.impl.bavet.common.GroupNodeConstructor.fourKeysGroupBy;
+import static ai.timefold.solver.core.impl.bavet.common.GroupNodeConstructor.oneKeyGroupBy;
+import static ai.timefold.solver.core.impl.bavet.common.GroupNodeConstructor.threeKeysGroupBy;
+import static ai.timefold.solver.core.impl.bavet.common.GroupNodeConstructor.twoKeysGroupBy;
+import static ai.timefold.solver.core.impl.bavet.common.GroupNodeConstructor.zeroKeysGroupBy;
 import static ai.timefold.solver.core.impl.score.stream.common.tri.InnerTriConstraintStream.createDefaultIndictedObjectsMapping;
 import static ai.timefold.solver.core.impl.score.stream.common.tri.InnerTriConstraintStream.createDefaultJustificationMapping;
 
@@ -27,11 +27,30 @@
 import ai.timefold.solver.core.api.score.stream.tri.TriConstraintCollector;
 import ai.timefold.solver.core.api.score.stream.tri.TriConstraintStream;
 import ai.timefold.solver.core.api.score.stream.uni.UniConstraintStream;
+import ai.timefold.solver.core.impl.bavet.common.GroupNodeConstructor;
+import ai.timefold.solver.core.impl.bavet.common.index.joiner.QuadJoinerComber;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.tri.Group0Mapping1CollectorTriNode;
+import ai.timefold.solver.core.impl.bavet.tri.Group0Mapping2CollectorTriNode;
+import ai.timefold.solver.core.impl.bavet.tri.Group0Mapping3CollectorTriNode;
+import ai.timefold.solver.core.impl.bavet.tri.Group0Mapping4CollectorTriNode;
+import ai.timefold.solver.core.impl.bavet.tri.Group1Mapping0CollectorTriNode;
+import ai.timefold.solver.core.impl.bavet.tri.Group1Mapping1CollectorTriNode;
+import ai.timefold.solver.core.impl.bavet.tri.Group1Mapping2CollectorTriNode;
+import ai.timefold.solver.core.impl.bavet.tri.Group1Mapping3CollectorTriNode;
+import ai.timefold.solver.core.impl.bavet.tri.Group2Mapping0CollectorTriNode;
+import ai.timefold.solver.core.impl.bavet.tri.Group2Mapping1CollectorTriNode;
+import ai.timefold.solver.core.impl.bavet.tri.Group2Mapping2CollectorTriNode;
+import ai.timefold.solver.core.impl.bavet.tri.Group3Mapping0CollectorTriNode;
+import ai.timefold.solver.core.impl.bavet.tri.Group3Mapping1CollectorTriNode;
+import ai.timefold.solver.core.impl.bavet.tri.Group4Mapping0CollectorTriNode;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
 import ai.timefold.solver.core.impl.score.stream.bavet.bi.BavetAbstractBiConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetAbstractConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetScoringConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.GroupNodeConstructor;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeBiConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeQuadConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeTriConstraintStream;
@@ -40,17 +59,12 @@
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetForeBridgeQuadConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetForeBridgeTriConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetForeBridgeUniConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
 import ai.timefold.solver.core.impl.score.stream.bavet.quad.BavetAbstractQuadConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.quad.BavetJoinQuadConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.quad.BavetTriConcatQuadConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.uni.BavetAbstractUniConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.common.RetrievalSemantics;
 import ai.timefold.solver.core.impl.score.stream.common.ScoreImpactType;
-import ai.timefold.solver.core.impl.score.stream.common.quad.QuadJoinerComber;
 import ai.timefold.solver.core.impl.score.stream.common.tri.InnerTriConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.common.tri.TriConstraintBuilderImpl;
 import ai.timefold.solver.core.impl.util.ConstantLambdaUtils;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetBiConcatTriConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetBiConcatTriConstraintStream.java
index 3becba41ca..360a1e3608 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetBiConcatTriConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetBiConcatTriConstraintStream.java
@@ -5,15 +5,17 @@
 import java.util.function.BiFunction;
 
 import ai.timefold.solver.core.api.score.Score;
+import ai.timefold.solver.core.impl.bavet.common.AbstractConcatNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.tri.ConcatBiTriNode;
+import ai.timefold.solver.core.impl.bavet.tri.ConcatTriBiNode;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractConcatNode;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetAbstractConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetConcatConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetForeBridgeBiConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetForeBridgeTriConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
 
 public final class BavetBiConcatTriConstraintStream<Solution_, A, B, C>
         extends BavetAbstractTriConstraintStream<Solution_, A, B, C>
@@ -68,7 +70,7 @@ public void collectActiveConstraintStreams(Set<BavetAbstractConstraintStream<Sol
     }
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         TupleLifecycle<TriTuple<A, B, C>> downstream = buildHelper.getAggregatedTupleLifecycle(childStreamList);
         var leftCloneStoreIndex = buildHelper.reserveTupleStoreIndex(leftParent.getTupleSource());
         var rightCloneStoreIndex = buildHelper.reserveTupleStoreIndex(rightParent.getTupleSource());
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetBiGroupTriConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetBiGroupTriConstraintStream.java
index a8447058e1..53b5a22428 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetBiGroupTriConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetBiGroupTriConstraintStream.java
@@ -1,15 +1,13 @@
 package ai.timefold.solver.core.impl.score.stream.bavet.tri;
 
-import java.util.List;
 import java.util.Objects;
 
 import ai.timefold.solver.core.api.score.Score;
-import ai.timefold.solver.core.api.score.stream.ConstraintStream;
+import ai.timefold.solver.core.impl.bavet.common.GroupNodeConstructor;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.GroupNodeConstructor;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeBiConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
 
 final class BavetBiGroupTriConstraintStream<Solution_, A, B, C, NewA, NewB>
         extends BavetAbstractTriConstraintStream<Solution_, A, B, C> {
@@ -38,8 +36,8 @@ public boolean guaranteesDistinct() {
     // ************************************************************************
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
-        List<? extends ConstraintStream> aftStreamChildList = aftStream.getChildStreamList();
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
+        var aftStreamChildList = aftStream.getChildStreamList();
         nodeConstructor.build(buildHelper, parent.getTupleSource(), aftStream, aftStreamChildList, this, childStreamList,
                 constraintFactory.getEnvironmentMode());
     }
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetBiMapTriConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetBiMapTriConstraintStream.java
index dcdf22b033..4705afe757 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetBiMapTriConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetBiMapTriConstraintStream.java
@@ -4,8 +4,9 @@
 
 import ai.timefold.solver.core.api.function.TriFunction;
 import ai.timefold.solver.core.api.score.Score;
+import ai.timefold.solver.core.impl.bavet.tri.MapTriToBiNode;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeBiConstraintStream;
 
 final class BavetBiMapTriConstraintStream<Solution_, A, B, C, NewA, NewB>
@@ -37,7 +38,7 @@ public boolean guaranteesDistinct() {
     }
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         assertEmptyChildStreamList();
         int inputStoreIndex = buildHelper.reserveTupleStoreIndex(parent.getTupleSource());
         int outputStoreSize = buildHelper.extractTupleStoreSize(aftStream);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetFilterTriConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetFilterTriConstraintStream.java
index e45471b32a..8fcf0ce178 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetFilterTriConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetFilterTriConstraintStream.java
@@ -4,9 +4,10 @@
 
 import ai.timefold.solver.core.api.function.TriPredicate;
 import ai.timefold.solver.core.api.score.Score;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.tri.ConditionalTriTupleLifecycle;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 
 final class BavetFilterTriConstraintStream<Solution_, A, B, C>
         extends BavetAbstractTriConstraintStream<Solution_, A, B, C> {
@@ -28,7 +29,7 @@ public BavetFilterTriConstraintStream(BavetConstraintFactory<Solution_> constrai
     // ************************************************************************
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         buildHelper.<TriTuple<A, B, C>> putInsertUpdateRetract(this, childStreamList,
                 tupleLifecycle -> new ConditionalTriTupleLifecycle<>(predicate, tupleLifecycle));
     }
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetFlattenLastTriConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetFlattenLastTriConstraintStream.java
index ee72c79017..643b0a2026 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetFlattenLastTriConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetFlattenLastTriConstraintStream.java
@@ -4,8 +4,9 @@
 import java.util.function.Function;
 
 import ai.timefold.solver.core.api.score.Score;
+import ai.timefold.solver.core.impl.bavet.tri.FlattenLastTriNode;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeTriConstraintStream;
 
 final class BavetFlattenLastTriConstraintStream<Solution_, A, B, C, NewC>
@@ -35,7 +36,7 @@ public boolean guaranteesDistinct() {
     }
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         assertEmptyChildStreamList();
         int inputStoreIndex = buildHelper.reserveTupleStoreIndex(parent.getTupleSource());
         int outputStoreSize = buildHelper.extractTupleStoreSize(flattenLastStream);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetIfExistsTriConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetIfExistsTriConstraintStream.java
index 2a4affc50f..4cbcda3ce4 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetIfExistsTriConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetIfExistsTriConstraintStream.java
@@ -5,15 +5,17 @@
 
 import ai.timefold.solver.core.api.function.QuadPredicate;
 import ai.timefold.solver.core.api.score.Score;
+import ai.timefold.solver.core.impl.bavet.common.index.IndexerFactory;
+import ai.timefold.solver.core.impl.bavet.common.index.joiner.DefaultQuadJoiner;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.tri.IndexedIfExistsTriNode;
+import ai.timefold.solver.core.impl.bavet.tri.UnindexedIfExistsTriNode;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetAbstractConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetIfExistsConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetForeBridgeUniConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.index.IndexerFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.common.quad.DefaultQuadJoiner;
 
 final class BavetIfExistsTriConstraintStream<Solution_, A, B, C, D>
         extends BavetAbstractTriConstraintStream<Solution_, A, B, C>
@@ -61,7 +63,7 @@ public BavetAbstractConstraintStream<Solution_> getTupleSource() {
     }
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         TupleLifecycle<TriTuple<A, B, C>> downstream = buildHelper.getAggregatedTupleLifecycle(childStreamList);
         IndexerFactory<D> indexerFactory = new IndexerFactory<>(joiner);
         var node = indexerFactory.hasJoiners()
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetJoinTriConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetJoinTriConstraintStream.java
index dda89c4e12..a264e50e6c 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetJoinTriConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetJoinTriConstraintStream.java
@@ -5,16 +5,18 @@
 
 import ai.timefold.solver.core.api.function.TriPredicate;
 import ai.timefold.solver.core.api.score.Score;
+import ai.timefold.solver.core.impl.bavet.common.index.IndexerFactory;
+import ai.timefold.solver.core.impl.bavet.common.index.joiner.DefaultTriJoiner;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.tri.IndexedJoinTriNode;
+import ai.timefold.solver.core.impl.bavet.tri.UnindexedJoinTriNode;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetAbstractConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetJoinConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetForeBridgeBiConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetForeBridgeUniConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.index.IndexerFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.common.tri.DefaultTriJoiner;
 
 public final class BavetJoinTriConstraintStream<Solution_, A, B, C>
         extends BavetAbstractTriConstraintStream<Solution_, A, B, C>
@@ -54,7 +56,7 @@ public void collectActiveConstraintStreams(Set<BavetAbstractConstraintStream<Sol
     }
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         int outputStoreSize = buildHelper.extractTupleStoreSize(this);
         TupleLifecycle<TriTuple<A, B, C>> downstream = buildHelper.getAggregatedTupleLifecycle(childStreamList);
         IndexerFactory<C> indexerFactory = new IndexerFactory<>(joiner);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetQuadGroupTriConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetQuadGroupTriConstraintStream.java
index d54ac17e96..563eb3cd42 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetQuadGroupTriConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetQuadGroupTriConstraintStream.java
@@ -1,15 +1,13 @@
 package ai.timefold.solver.core.impl.score.stream.bavet.tri;
 
-import java.util.List;
 import java.util.Objects;
 
 import ai.timefold.solver.core.api.score.Score;
-import ai.timefold.solver.core.api.score.stream.ConstraintStream;
+import ai.timefold.solver.core.impl.bavet.common.GroupNodeConstructor;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.GroupNodeConstructor;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeQuadConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
 
 final class BavetQuadGroupTriConstraintStream<Solution_, A, B, C, NewA, NewB, NewC, NewD>
         extends BavetAbstractTriConstraintStream<Solution_, A, B, C> {
@@ -38,8 +36,8 @@ public boolean guaranteesDistinct() {
     // ************************************************************************
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
-        List<? extends ConstraintStream> aftStreamChildList = aftStream.getChildStreamList();
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
+        var aftStreamChildList = aftStream.getChildStreamList();
         nodeConstructor.build(buildHelper, parent.getTupleSource(), aftStream, aftStreamChildList, this, childStreamList,
                 constraintFactory.getEnvironmentMode());
     }
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetQuadMapTriConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetQuadMapTriConstraintStream.java
index f4dea8e434..96e6e209e3 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetQuadMapTriConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetQuadMapTriConstraintStream.java
@@ -4,8 +4,9 @@
 
 import ai.timefold.solver.core.api.function.TriFunction;
 import ai.timefold.solver.core.api.score.Score;
+import ai.timefold.solver.core.impl.bavet.tri.MapTriToQuadNode;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeQuadConstraintStream;
 
 final class BavetQuadMapTriConstraintStream<Solution_, A, B, C, NewA, NewB, NewC, NewD>
@@ -44,7 +45,7 @@ public void setAftBridge(BavetAftBridgeQuadConstraintStream<Solution_, NewA, New
     // ************************************************************************
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         assertEmptyChildStreamList();
         int inputStoreIndex = buildHelper.reserveTupleStoreIndex(parent.getTupleSource());
         int outputStoreSize = buildHelper.extractTupleStoreSize(aftStream);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetScoringTriConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetScoringTriConstraintStream.java
index a612b983bf..c8e2c28201 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetScoringTriConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetScoringTriConstraintStream.java
@@ -13,7 +13,7 @@
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraint;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetScoringConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.common.inliner.ConstraintMatchSupplier;
 import ai.timefold.solver.core.impl.score.stream.common.inliner.UndoScoreImpacter;
 import ai.timefold.solver.core.impl.score.stream.common.inliner.WeightedScoreImpacter;
@@ -71,7 +71,7 @@ public void setConstraint(BavetConstraint<Solution_> constraint) {
     // ************************************************************************
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         assertEmptyChildStreamList();
         var scoreImpacter = buildScoreImpacter(buildHelper.getScoreInliner().getConstraintMatchPolicy());
         var weightedScoreImpacter = buildHelper.getScoreInliner().buildWeightedScoreImpacter(constraint);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetTriConcatTriConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetTriConcatTriConstraintStream.java
index bd5c1c7485..4cff5cedb9 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetTriConcatTriConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetTriConcatTriConstraintStream.java
@@ -4,14 +4,15 @@
 import java.util.Set;
 
 import ai.timefold.solver.core.api.score.Score;
+import ai.timefold.solver.core.impl.bavet.common.AbstractConcatNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.tri.ConcatTriTriNode;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractConcatNode;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetAbstractConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetConcatConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetForeBridgeTriConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
 
 public final class BavetTriConcatTriConstraintStream<Solution_, A, B, C>
         extends BavetAbstractTriConstraintStream<Solution_, A, B, C>
@@ -47,7 +48,7 @@ public void collectActiveConstraintStreams(Set<BavetAbstractConstraintStream<Sol
     }
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         TupleLifecycle<TriTuple<A, B, C>> downstream = buildHelper.getAggregatedTupleLifecycle(childStreamList);
         int leftCloneStoreIndex = buildHelper.reserveTupleStoreIndex(leftParent.getTupleSource());
         int rightCloneStoreIndex = buildHelper.reserveTupleStoreIndex(rightParent.getTupleSource());
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetTriGroupTriConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetTriGroupTriConstraintStream.java
index c853b3172a..cfb364ce07 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetTriGroupTriConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetTriGroupTriConstraintStream.java
@@ -1,15 +1,13 @@
 package ai.timefold.solver.core.impl.score.stream.bavet.tri;
 
-import java.util.List;
 import java.util.Objects;
 
 import ai.timefold.solver.core.api.score.Score;
-import ai.timefold.solver.core.api.score.stream.ConstraintStream;
+import ai.timefold.solver.core.impl.bavet.common.GroupNodeConstructor;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.GroupNodeConstructor;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeTriConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
 
 final class BavetTriGroupTriConstraintStream<Solution_, A, B, C, NewA, NewB, NewC>
         extends BavetAbstractTriConstraintStream<Solution_, A, B, C> {
@@ -38,8 +36,8 @@ public boolean guaranteesDistinct() {
     // ************************************************************************
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
-        List<? extends ConstraintStream> aftStreamChildList = aftStream.getChildStreamList();
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
+        var aftStreamChildList = aftStream.getChildStreamList();
         nodeConstructor.build(buildHelper, parent.getTupleSource(), aftStream, aftStreamChildList, this, childStreamList,
                 constraintFactory.getEnvironmentMode());
     }
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetTriMapTriConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetTriMapTriConstraintStream.java
index e4a3b4024c..8a1cf0f41c 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetTriMapTriConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetTriMapTriConstraintStream.java
@@ -4,8 +4,9 @@
 
 import ai.timefold.solver.core.api.function.TriFunction;
 import ai.timefold.solver.core.api.score.Score;
+import ai.timefold.solver.core.impl.bavet.tri.MapTriToTriNode;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeTriConstraintStream;
 
 final class BavetTriMapTriConstraintStream<Solution_, A, B, C, NewA, NewB, NewC>
@@ -39,7 +40,7 @@ public boolean guaranteesDistinct() {
     }
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         assertEmptyChildStreamList();
         int inputStoreIndex = buildHelper.reserveTupleStoreIndex(parent.getTupleSource());
         int outputStoreSize = buildHelper.extractTupleStoreSize(aftStream);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetUniConcatTriConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetUniConcatTriConstraintStream.java
index a559995f12..3a3bfc1fbc 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetUniConcatTriConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetUniConcatTriConstraintStream.java
@@ -5,15 +5,17 @@
 import java.util.function.Function;
 
 import ai.timefold.solver.core.api.score.Score;
+import ai.timefold.solver.core.impl.bavet.common.AbstractConcatNode;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.tri.ConcatTriUniNode;
+import ai.timefold.solver.core.impl.bavet.tri.ConcatUniTriNode;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractConcatNode;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetAbstractConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetConcatConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetForeBridgeTriConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetForeBridgeUniConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
 
 public final class BavetUniConcatTriConstraintStream<Solution_, A, B, C>
         extends BavetAbstractTriConstraintStream<Solution_, A, B, C>
@@ -71,7 +73,7 @@ public void collectActiveConstraintStreams(Set<BavetAbstractConstraintStream<Sol
     }
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         TupleLifecycle<TriTuple<A, B, C>> downstream = buildHelper.getAggregatedTupleLifecycle(childStreamList);
         var leftCloneStoreIndex = buildHelper.reserveTupleStoreIndex(leftParent.getTupleSource());
         var rightCloneStoreIndex = buildHelper.reserveTupleStoreIndex(rightParent.getTupleSource());
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetUniGroupTriConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetUniGroupTriConstraintStream.java
index 1b0937677d..b76def730a 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetUniGroupTriConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetUniGroupTriConstraintStream.java
@@ -1,15 +1,13 @@
 package ai.timefold.solver.core.impl.score.stream.bavet.tri;
 
-import java.util.List;
 import java.util.Objects;
 
 import ai.timefold.solver.core.api.score.Score;
-import ai.timefold.solver.core.api.score.stream.ConstraintStream;
+import ai.timefold.solver.core.impl.bavet.common.GroupNodeConstructor;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.GroupNodeConstructor;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeUniConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
 
 final class BavetUniGroupTriConstraintStream<Solution_, A, B, C, NewA>
         extends BavetAbstractTriConstraintStream<Solution_, A, B, C> {
@@ -37,8 +35,8 @@ public boolean guaranteesDistinct() {
     // ************************************************************************
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
-        List<? extends ConstraintStream> aftStreamChildList = aftStream.getChildStreamList();
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
+        var aftStreamChildList = aftStream.getChildStreamList();
         nodeConstructor.build(buildHelper, parent.getTupleSource(), aftStream, aftStreamChildList, this, childStreamList,
                 constraintFactory.getEnvironmentMode());
     }
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetUniMapTriConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetUniMapTriConstraintStream.java
index 425d1e1cb0..e8b1aabf38 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetUniMapTriConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/BavetUniMapTriConstraintStream.java
@@ -4,8 +4,9 @@
 
 import ai.timefold.solver.core.api.function.TriFunction;
 import ai.timefold.solver.core.api.score.Score;
+import ai.timefold.solver.core.impl.bavet.tri.MapTriToUniNode;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeUniConstraintStream;
 
 final class BavetUniMapTriConstraintStream<Solution_, A, B, C, NewA>
@@ -34,7 +35,7 @@ public boolean guaranteesDistinct() {
     }
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         assertEmptyChildStreamList();
         int inputStoreIndex = buildHelper.reserveTupleStoreIndex(parent.getTupleSource());
         int outputStoreSize = buildHelper.extractTupleStoreSize(aftStream);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/TriScorer.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/TriScorer.java
index 43d3a82c7d..b378482fe5 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/TriScorer.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/tri/TriScorer.java
@@ -1,8 +1,8 @@
 package ai.timefold.solver.core.impl.score.stream.bavet.tri;
 
 import ai.timefold.solver.core.api.function.QuadFunction;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractScorer;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
 import ai.timefold.solver.core.impl.score.stream.common.inliner.UndoScoreImpacter;
 import ai.timefold.solver.core.impl.score.stream.common.inliner.WeightedScoreImpacter;
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetAbstractUniConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetAbstractUniConstraintStream.java
index 11049e205d..225d14bc69 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetAbstractUniConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetAbstractUniConstraintStream.java
@@ -1,10 +1,10 @@
 package ai.timefold.solver.core.impl.score.stream.bavet.uni;
 
-import static ai.timefold.solver.core.impl.score.stream.bavet.common.GroupNodeConstructor.fourKeysGroupBy;
-import static ai.timefold.solver.core.impl.score.stream.bavet.common.GroupNodeConstructor.oneKeyGroupBy;
-import static ai.timefold.solver.core.impl.score.stream.bavet.common.GroupNodeConstructor.threeKeysGroupBy;
-import static ai.timefold.solver.core.impl.score.stream.bavet.common.GroupNodeConstructor.twoKeysGroupBy;
-import static ai.timefold.solver.core.impl.score.stream.bavet.common.GroupNodeConstructor.zeroKeysGroupBy;
+import static ai.timefold.solver.core.impl.bavet.common.GroupNodeConstructor.fourKeysGroupBy;
+import static ai.timefold.solver.core.impl.bavet.common.GroupNodeConstructor.oneKeyGroupBy;
+import static ai.timefold.solver.core.impl.bavet.common.GroupNodeConstructor.threeKeysGroupBy;
+import static ai.timefold.solver.core.impl.bavet.common.GroupNodeConstructor.twoKeysGroupBy;
+import static ai.timefold.solver.core.impl.bavet.common.GroupNodeConstructor.zeroKeysGroupBy;
 import static ai.timefold.solver.core.impl.score.stream.common.uni.InnerUniConstraintStream.createDefaultIndictedObjectsMapping;
 import static ai.timefold.solver.core.impl.score.stream.common.uni.InnerUniConstraintStream.createDefaultJustificationMapping;
 
@@ -25,13 +25,32 @@
 import ai.timefold.solver.core.api.score.stream.uni.UniConstraintBuilder;
 import ai.timefold.solver.core.api.score.stream.uni.UniConstraintCollector;
 import ai.timefold.solver.core.api.score.stream.uni.UniConstraintStream;
+import ai.timefold.solver.core.impl.bavet.common.GroupNodeConstructor;
+import ai.timefold.solver.core.impl.bavet.common.index.joiner.BiJoinerComber;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.uni.Group0Mapping1CollectorUniNode;
+import ai.timefold.solver.core.impl.bavet.uni.Group0Mapping2CollectorUniNode;
+import ai.timefold.solver.core.impl.bavet.uni.Group0Mapping3CollectorUniNode;
+import ai.timefold.solver.core.impl.bavet.uni.Group0Mapping4CollectorUniNode;
+import ai.timefold.solver.core.impl.bavet.uni.Group1Mapping0CollectorUniNode;
+import ai.timefold.solver.core.impl.bavet.uni.Group1Mapping1CollectorUniNode;
+import ai.timefold.solver.core.impl.bavet.uni.Group1Mapping2CollectorUniNode;
+import ai.timefold.solver.core.impl.bavet.uni.Group1Mapping3CollectorUniNode;
+import ai.timefold.solver.core.impl.bavet.uni.Group2Mapping0CollectorUniNode;
+import ai.timefold.solver.core.impl.bavet.uni.Group2Mapping1CollectorUniNode;
+import ai.timefold.solver.core.impl.bavet.uni.Group2Mapping2CollectorUniNode;
+import ai.timefold.solver.core.impl.bavet.uni.Group3Mapping0CollectorUniNode;
+import ai.timefold.solver.core.impl.bavet.uni.Group3Mapping1CollectorUniNode;
+import ai.timefold.solver.core.impl.bavet.uni.Group4Mapping0CollectorUniNode;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
 import ai.timefold.solver.core.impl.score.stream.bavet.bi.BavetAbstractBiConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.bi.BavetJoinBiConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.bi.BavetUniConcatBiConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetAbstractConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetScoringConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.GroupNodeConstructor;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeBiConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeQuadConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeTriConstraintStream;
@@ -40,17 +59,12 @@
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetForeBridgeQuadConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetForeBridgeTriConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetForeBridgeUniConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
 import ai.timefold.solver.core.impl.score.stream.bavet.quad.BavetAbstractQuadConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.quad.BavetUniConcatQuadConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.tri.BavetAbstractTriConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.tri.BavetUniConcatTriConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.common.RetrievalSemantics;
 import ai.timefold.solver.core.impl.score.stream.common.ScoreImpactType;
-import ai.timefold.solver.core.impl.score.stream.common.bi.BiJoinerComber;
 import ai.timefold.solver.core.impl.score.stream.common.uni.InnerUniConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.common.uni.UniConstraintBuilderImpl;
 import ai.timefold.solver.core.impl.util.ConstantLambdaUtils;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetBiGroupUniConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetBiGroupUniConstraintStream.java
index 9cd0cfb292..18dd310b72 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetBiGroupUniConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetBiGroupUniConstraintStream.java
@@ -1,15 +1,13 @@
 package ai.timefold.solver.core.impl.score.stream.bavet.uni;
 
-import java.util.List;
 import java.util.Objects;
 
 import ai.timefold.solver.core.api.score.Score;
-import ai.timefold.solver.core.api.score.stream.ConstraintStream;
+import ai.timefold.solver.core.impl.bavet.common.GroupNodeConstructor;
+import ai.timefold.solver.core.impl.bavet.common.tuple.BiTuple;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.GroupNodeConstructor;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeBiConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.BiTuple;
 
 final class BavetBiGroupUniConstraintStream<Solution_, A, NewA, NewB>
         extends BavetAbstractUniConstraintStream<Solution_, A> {
@@ -38,8 +36,8 @@ public boolean guaranteesDistinct() {
     // ************************************************************************
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
-        List<? extends ConstraintStream> aftStreamChildList = aftStream.getChildStreamList();
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
+        var aftStreamChildList = aftStream.getChildStreamList();
         nodeConstructor.build(buildHelper, parent.getTupleSource(), aftStream, aftStreamChildList, this, childStreamList,
                 constraintFactory.getEnvironmentMode());
     }
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetBiMapUniConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetBiMapUniConstraintStream.java
index 3047c21736..b193374b7a 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetBiMapUniConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetBiMapUniConstraintStream.java
@@ -4,8 +4,9 @@
 import java.util.function.Function;
 
 import ai.timefold.solver.core.api.score.Score;
+import ai.timefold.solver.core.impl.bavet.uni.MapUniToBiNode;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeBiConstraintStream;
 
 final class BavetBiMapUniConstraintStream<Solution_, A, NewA, NewB>
@@ -40,7 +41,7 @@ public void setAftBridge(BavetAftBridgeBiConstraintStream<Solution_, NewA, NewB>
     // ************************************************************************
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         assertEmptyChildStreamList();
         int inputStoreIndex = buildHelper.reserveTupleStoreIndex(parent.getTupleSource());
         int outputStoreSize = buildHelper.extractTupleStoreSize(aftStream);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetFilterUniConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetFilterUniConstraintStream.java
index 5a4e2b836f..2a38bf6a77 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetFilterUniConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetFilterUniConstraintStream.java
@@ -4,9 +4,10 @@
 import java.util.function.Predicate;
 
 import ai.timefold.solver.core.api.score.Score;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.uni.ConditionalUniTupleLifecycle;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 
 final class BavetFilterUniConstraintStream<Solution_, A>
         extends BavetAbstractUniConstraintStream<Solution_, A> {
@@ -27,7 +28,7 @@ public BavetFilterUniConstraintStream(BavetConstraintFactory<Solution_> constrai
     // ************************************************************************
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         buildHelper.<UniTuple<A>> putInsertUpdateRetract(this, childStreamList,
                 tupleLifecycle -> new ConditionalUniTupleLifecycle<>(predicate, tupleLifecycle));
     }
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetFlattenLastUniConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetFlattenLastUniConstraintStream.java
index 2f9d03da70..0f21ee1acd 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetFlattenLastUniConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetFlattenLastUniConstraintStream.java
@@ -4,8 +4,9 @@
 import java.util.function.Function;
 
 import ai.timefold.solver.core.api.score.Score;
+import ai.timefold.solver.core.impl.bavet.uni.FlattenLastUniNode;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeUniConstraintStream;
 
 final class BavetFlattenLastUniConstraintStream<Solution_, A, NewA>
@@ -35,7 +36,7 @@ public boolean guaranteesDistinct() {
     }
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         assertEmptyChildStreamList();
         int inputStoreIndex = buildHelper.reserveTupleStoreIndex(parent.getTupleSource());
         int outputStoreSize = buildHelper.extractTupleStoreSize(flattenLastStream);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetForEachUniConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetForEachUniConstraintStream.java
index 8ca6d3c669..c98656af43 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetForEachUniConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetForEachUniConstraintStream.java
@@ -5,12 +5,14 @@
 import java.util.function.Predicate;
 
 import ai.timefold.solver.core.api.score.Score;
+import ai.timefold.solver.core.impl.bavet.common.TupleSource;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.uni.ForEachExcludingUnassignedUniNode;
+import ai.timefold.solver.core.impl.bavet.uni.ForEachUniNode;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetAbstractConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.TupleSource;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.common.RetrievalSemantics;
 
 public final class BavetForEachUniConstraintStream<Solution_, A>
@@ -45,10 +47,10 @@ public void collectActiveConstraintStreams(Set<BavetAbstractConstraintStream<Sol
     }
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         TupleLifecycle<UniTuple<A>> tupleLifecycle = buildHelper.getAggregatedTupleLifecycle(childStreamList);
         int outputStoreSize = buildHelper.extractTupleStoreSize(this);
-        var node = filter == null ? new ForEachIncludingUnassignedUniNode<>(forEachClass, tupleLifecycle, outputStoreSize)
+        var node = filter == null ? new ForEachUniNode<>(forEachClass, tupleLifecycle, outputStoreSize)
                 : new ForEachExcludingUnassignedUniNode<>(forEachClass, filter, tupleLifecycle, outputStoreSize);
         buildHelper.addNode(node, this, null);
     }
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetIfExistsUniConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetIfExistsUniConstraintStream.java
index ba69d2cda0..03ae07db7c 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetIfExistsUniConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetIfExistsUniConstraintStream.java
@@ -5,15 +5,17 @@
 import java.util.function.BiPredicate;
 
 import ai.timefold.solver.core.api.score.Score;
+import ai.timefold.solver.core.impl.bavet.common.index.IndexerFactory;
+import ai.timefold.solver.core.impl.bavet.common.index.joiner.DefaultBiJoiner;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.uni.IndexedIfExistsUniNode;
+import ai.timefold.solver.core.impl.bavet.uni.UnindexedIfExistsUniNode;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetAbstractConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetIfExistsConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetForeBridgeUniConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.index.IndexerFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
-import ai.timefold.solver.core.impl.score.stream.common.bi.DefaultBiJoiner;
 
 final class BavetIfExistsUniConstraintStream<Solution_, A, B>
         extends BavetAbstractUniConstraintStream<Solution_, A>
@@ -60,7 +62,7 @@ public BavetAbstractConstraintStream<Solution_> getTupleSource() {
     }
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         TupleLifecycle<UniTuple<A>> downstream = buildHelper.getAggregatedTupleLifecycle(childStreamList);
         IndexerFactory<B> indexerFactory = new IndexerFactory<>(joiner);
         var node = indexerFactory.hasJoiners()
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetQuadGroupUniConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetQuadGroupUniConstraintStream.java
index 27795283dd..837b44638a 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetQuadGroupUniConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetQuadGroupUniConstraintStream.java
@@ -1,15 +1,13 @@
 package ai.timefold.solver.core.impl.score.stream.bavet.uni;
 
-import java.util.List;
 import java.util.Objects;
 
 import ai.timefold.solver.core.api.score.Score;
-import ai.timefold.solver.core.api.score.stream.ConstraintStream;
+import ai.timefold.solver.core.impl.bavet.common.GroupNodeConstructor;
+import ai.timefold.solver.core.impl.bavet.common.tuple.QuadTuple;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.GroupNodeConstructor;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeQuadConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.QuadTuple;
 
 final class BavetQuadGroupUniConstraintStream<Solution_, A, NewA, NewB, NewC, NewD>
         extends BavetAbstractUniConstraintStream<Solution_, A> {
@@ -38,8 +36,8 @@ public boolean guaranteesDistinct() {
     // ************************************************************************
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
-        List<? extends ConstraintStream> aftStreamChildList = aftStream.getChildStreamList();
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
+        var aftStreamChildList = aftStream.getChildStreamList();
         nodeConstructor.build(buildHelper, parent.getTupleSource(), aftStream, aftStreamChildList, this, childStreamList,
                 constraintFactory.getEnvironmentMode());
     }
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetQuadMapUniConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetQuadMapUniConstraintStream.java
index 6f08bade33..1efdbab456 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetQuadMapUniConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetQuadMapUniConstraintStream.java
@@ -4,8 +4,9 @@
 import java.util.function.Function;
 
 import ai.timefold.solver.core.api.score.Score;
+import ai.timefold.solver.core.impl.bavet.uni.MapUniToQuadNode;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeQuadConstraintStream;
 
 final class BavetQuadMapUniConstraintStream<Solution_, A, NewA, NewB, NewC, NewD>
@@ -45,7 +46,7 @@ public void setAftBridge(BavetAftBridgeQuadConstraintStream<Solution_, NewA, New
     // ************************************************************************
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         assertEmptyChildStreamList();
         int inputStoreIndex = buildHelper.reserveTupleStoreIndex(parent.getTupleSource());
         int outputStoreSize = buildHelper.extractTupleStoreSize(aftStream);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetScoringUniConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetScoringUniConstraintStream.java
index 517e54c664..0dd7ca1ba0 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetScoringUniConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetScoringUniConstraintStream.java
@@ -13,7 +13,7 @@
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraint;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetScoringConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.common.inliner.ConstraintMatchSupplier;
 import ai.timefold.solver.core.impl.score.stream.common.inliner.UndoScoreImpacter;
 import ai.timefold.solver.core.impl.score.stream.common.inliner.WeightedScoreImpacter;
@@ -70,7 +70,7 @@ public void setConstraint(BavetConstraint<Solution_> constraint) {
     // ************************************************************************
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         assertEmptyChildStreamList();
         var scoreImpacter = buildScoreImpacter(buildHelper.getScoreInliner().getConstraintMatchPolicy());
         var weightedScoreImpacter = buildHelper.getScoreInliner().buildWeightedScoreImpacter(constraint);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetTriGroupUniConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetTriGroupUniConstraintStream.java
index e1f2d05fd8..fc1bbac126 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetTriGroupUniConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetTriGroupUniConstraintStream.java
@@ -1,15 +1,13 @@
 package ai.timefold.solver.core.impl.score.stream.bavet.uni;
 
-import java.util.List;
 import java.util.Objects;
 
 import ai.timefold.solver.core.api.score.Score;
-import ai.timefold.solver.core.api.score.stream.ConstraintStream;
+import ai.timefold.solver.core.impl.bavet.common.GroupNodeConstructor;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TriTuple;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.GroupNodeConstructor;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeTriConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TriTuple;
 
 final class BavetTriGroupUniConstraintStream<Solution_, A, NewA, NewB, NewC>
         extends BavetAbstractUniConstraintStream<Solution_, A> {
@@ -38,8 +36,8 @@ public boolean guaranteesDistinct() {
     // ************************************************************************
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
-        List<? extends ConstraintStream> aftStreamChildList = aftStream.getChildStreamList();
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
+        var aftStreamChildList = aftStream.getChildStreamList();
         nodeConstructor.build(buildHelper, parent.getTupleSource(), aftStream, aftStreamChildList, this, childStreamList,
                 constraintFactory.getEnvironmentMode());
     }
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetTriMapUniConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetTriMapUniConstraintStream.java
index 7d1e7ec0c5..b8d9968aeb 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetTriMapUniConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetTriMapUniConstraintStream.java
@@ -4,8 +4,9 @@
 import java.util.function.Function;
 
 import ai.timefold.solver.core.api.score.Score;
+import ai.timefold.solver.core.impl.bavet.uni.MapUniToTriNode;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeTriConstraintStream;
 
 final class BavetTriMapUniConstraintStream<Solution_, A, NewA, NewB, NewC>
@@ -42,7 +43,7 @@ public void setAftBridge(BavetAftBridgeTriConstraintStream<Solution_, NewA, NewB
     // ************************************************************************
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         assertEmptyChildStreamList();
         int inputStoreIndex = buildHelper.reserveTupleStoreIndex(parent.getTupleSource());
         int outputStoreSize = buildHelper.extractTupleStoreSize(aftStream);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetUniConcatUniConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetUniConcatUniConstraintStream.java
index 478c59f9f1..0ba6ff6b1e 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetUniConcatUniConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetUniConcatUniConstraintStream.java
@@ -4,13 +4,14 @@
 import java.util.Set;
 
 import ai.timefold.solver.core.api.score.Score;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.uni.ConcatUniUniNode;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetAbstractConstraintStream;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.BavetConcatConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetForeBridgeUniConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
 
 public final class BavetUniConcatUniConstraintStream<Solution_, A>
         extends BavetAbstractUniConstraintStream<Solution_, A>
@@ -44,7 +45,7 @@ public void collectActiveConstraintStreams(Set<BavetAbstractConstraintStream<Sol
     }
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         TupleLifecycle<UniTuple<A>> downstream = buildHelper.getAggregatedTupleLifecycle(childStreamList);
         int leftCloneStoreIndex = buildHelper.reserveTupleStoreIndex(leftParent.getTupleSource());
         int rightCloneStoreIndex = buildHelper.reserveTupleStoreIndex(rightParent.getTupleSource());
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetUniGroupUniConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetUniGroupUniConstraintStream.java
index 409ef44652..b20263b07e 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetUniGroupUniConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetUniGroupUniConstraintStream.java
@@ -1,15 +1,13 @@
 package ai.timefold.solver.core.impl.score.stream.bavet.uni;
 
-import java.util.List;
 import java.util.Objects;
 
 import ai.timefold.solver.core.api.score.Score;
-import ai.timefold.solver.core.api.score.stream.ConstraintStream;
+import ai.timefold.solver.core.impl.bavet.common.GroupNodeConstructor;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.GroupNodeConstructor;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeUniConstraintStream;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
 
 final class BavetUniGroupUniConstraintStream<Solution_, A, NewA>
         extends BavetAbstractUniConstraintStream<Solution_, A> {
@@ -37,8 +35,8 @@ public boolean guaranteesDistinct() {
     // ************************************************************************
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
-        List<? extends ConstraintStream> aftStreamChildList = aftStream.getChildStreamList();
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
+        var aftStreamChildList = aftStream.getChildStreamList();
         nodeConstructor.build(buildHelper, parent.getTupleSource(), aftStream, aftStreamChildList, this, childStreamList,
                 constraintFactory.getEnvironmentMode());
     }
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetUniMapUniConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetUniMapUniConstraintStream.java
index bc8f9a965a..52baa8639b 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetUniMapUniConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/BavetUniMapUniConstraintStream.java
@@ -4,8 +4,9 @@
 import java.util.function.Function;
 
 import ai.timefold.solver.core.api.score.Score;
+import ai.timefold.solver.core.impl.bavet.uni.MapUniToUniNode;
 import ai.timefold.solver.core.impl.score.stream.bavet.BavetConstraintFactory;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.NodeBuildHelper;
+import ai.timefold.solver.core.impl.score.stream.bavet.common.ConstraintNodeBuildHelper;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.bridge.BavetAftBridgeUniConstraintStream;
 
 final class BavetUniMapUniConstraintStream<Solution_, A, NewA>
@@ -34,7 +35,7 @@ public boolean guaranteesDistinct() {
     }
 
     @Override
-    public <Score_ extends Score<Score_>> void buildNode(NodeBuildHelper<Score_> buildHelper) {
+    public <Score_ extends Score<Score_>> void buildNode(ConstraintNodeBuildHelper<Solution_, Score_> buildHelper) {
         assertEmptyChildStreamList();
         int inputStoreIndex = buildHelper.reserveTupleStoreIndex(parent.getTupleSource());
         int outputStoreSize = buildHelper.extractTupleStoreSize(aftStream);
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/ConditionalUniTupleLifecycle.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/ConditionalUniTupleLifecycle.java
deleted file mode 100644
index eccea6dd98..0000000000
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/ConditionalUniTupleLifecycle.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.uni;
-
-import java.util.function.Predicate;
-
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.AbstractConditionalTupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
-
-final class ConditionalUniTupleLifecycle<A> extends AbstractConditionalTupleLifecycle<UniTuple<A>> {
-    private final Predicate<A> predicate;
-
-    public ConditionalUniTupleLifecycle(Predicate<A> predicate, TupleLifecycle<UniTuple<A>> tupleLifecycle) {
-        super(tupleLifecycle);
-        this.predicate = predicate;
-    }
-
-    @Override
-    protected boolean test(UniTuple<A> tuple) {
-        return predicate.test(tuple.factA);
-    }
-}
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/ForEachIncludingUnassignedUniNode.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/ForEachIncludingUnassignedUniNode.java
deleted file mode 100644
index f9dbbea8c8..0000000000
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/ForEachIncludingUnassignedUniNode.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.uni;
-
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
-
-public final class ForEachIncludingUnassignedUniNode<A> extends AbstractForEachUniNode<A> {
-
-    public ForEachIncludingUnassignedUniNode(Class<A> forEachClass, TupleLifecycle<UniTuple<A>> nextNodesTupleLifecycle,
-            int outputStoreSize) {
-        super(forEachClass, nextNodesTupleLifecycle, outputStoreSize);
-    }
-
-    @Override
-    public void update(A a) {
-        UniTuple<A> tuple = tupleMap.get(a);
-        if (tuple == null) {
-            throw new IllegalStateException("The fact (" + a + ") was never inserted, so it cannot update.");
-        }
-        innerUpdate(a, tuple);
-    }
-
-}
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/UniScorer.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/UniScorer.java
index 3216aee2fd..4a69bdc81d 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/UniScorer.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/UniScorer.java
@@ -2,8 +2,8 @@
 
 import java.util.function.BiFunction;
 
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractScorer;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
 import ai.timefold.solver.core.impl.score.stream.common.inliner.UndoScoreImpacter;
 import ai.timefold.solver.core.impl.score.stream.common.inliner.WeightedScoreImpacter;
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/AbstractConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/AbstractConstraintStream.java
index 7a12e68af6..9590fd00bf 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/AbstractConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/AbstractConstraintStream.java
@@ -3,10 +3,11 @@
 import java.util.Objects;
 
 import ai.timefold.solver.core.api.score.stream.ConstraintStream;
+import ai.timefold.solver.core.impl.bavet.common.BavetStream;
 
 import org.jspecify.annotations.NonNull;
 
-public abstract class AbstractConstraintStream<Solution_> implements ConstraintStream {
+public abstract class AbstractConstraintStream<Solution_> implements ConstraintStream, BavetStream {
 
     private final RetrievalSemantics retrievalSemantics;
 
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/InnerConstraintFactory.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/InnerConstraintFactory.java
index f7308a8086..4f4bba7792 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/InnerConstraintFactory.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/InnerConstraintFactory.java
@@ -18,10 +18,10 @@
 import ai.timefold.solver.core.api.score.stream.ConstraintProvider;
 import ai.timefold.solver.core.api.score.stream.bi.BiConstraintStream;
 import ai.timefold.solver.core.api.score.stream.bi.BiJoiner;
+import ai.timefold.solver.core.impl.bavet.common.index.joiner.BiJoinerComber;
+import ai.timefold.solver.core.impl.bavet.common.index.joiner.DefaultBiJoiner;
 import ai.timefold.solver.core.impl.domain.common.accessor.MemberAccessor;
 import ai.timefold.solver.core.impl.domain.solution.descriptor.SolutionDescriptor;
-import ai.timefold.solver.core.impl.score.stream.common.bi.BiJoinerComber;
-import ai.timefold.solver.core.impl.score.stream.common.bi.DefaultBiJoiner;
 import ai.timefold.solver.core.impl.score.stream.common.uni.InnerUniConstraintStream;
 
 import org.jspecify.annotations.NonNull;
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/uni/InnerUniConstraintStream.java b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/uni/InnerUniConstraintStream.java
index 786f718b2c..5788db6e6d 100644
--- a/core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/uni/InnerUniConstraintStream.java
+++ b/core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/uni/InnerUniConstraintStream.java
@@ -18,9 +18,9 @@
 import ai.timefold.solver.core.api.score.stream.bi.BiJoiner;
 import ai.timefold.solver.core.api.score.stream.uni.UniConstraintBuilder;
 import ai.timefold.solver.core.api.score.stream.uni.UniConstraintStream;
+import ai.timefold.solver.core.impl.bavet.common.index.joiner.BiJoinerComber;
 import ai.timefold.solver.core.impl.score.stream.common.RetrievalSemantics;
 import ai.timefold.solver.core.impl.score.stream.common.ScoreImpactType;
-import ai.timefold.solver.core.impl.score.stream.common.bi.BiJoinerComber;
 import ai.timefold.solver.core.impl.util.ConstantLambdaUtils;
 
 import org.jspecify.annotations.NonNull;
diff --git a/core/src/main/java/ai/timefold/solver/core/preview/api/move/BiMoveConstructor.java b/core/src/main/java/ai/timefold/solver/core/preview/api/move/BiMoveConstructor.java
new file mode 100644
index 0000000000..d5c10c38bc
--- /dev/null
+++ b/core/src/main/java/ai/timefold/solver/core/preview/api/move/BiMoveConstructor.java
@@ -0,0 +1,9 @@
+package ai.timefold.solver.core.preview.api.move;
+
+@FunctionalInterface
+public non-sealed interface BiMoveConstructor<Solution_, A, B>
+        extends MoveConstructor<Solution_> {
+
+    Move<Solution_> apply(A a, B b);
+
+}
diff --git a/core/src/main/java/ai/timefold/solver/core/preview/api/move/DataStream.java b/core/src/main/java/ai/timefold/solver/core/preview/api/move/DataStream.java
new file mode 100644
index 0000000000..a25dcce90c
--- /dev/null
+++ b/core/src/main/java/ai/timefold/solver/core/preview/api/move/DataStream.java
@@ -0,0 +1,7 @@
+package ai.timefold.solver.core.preview.api.move;
+
+public interface DataStream<Solution_> {
+
+    Dataset<Solution_, Object> createDataset();
+
+}
diff --git a/core/src/main/java/ai/timefold/solver/core/preview/api/move/Dataset.java b/core/src/main/java/ai/timefold/solver/core/preview/api/move/Dataset.java
new file mode 100644
index 0000000000..4ed8e1ef97
--- /dev/null
+++ b/core/src/main/java/ai/timefold/solver/core/preview/api/move/Dataset.java
@@ -0,0 +1,4 @@
+package ai.timefold.solver.core.preview.api.move;
+
+public interface Dataset<Solution_, A> {
+}
diff --git a/core/src/main/java/ai/timefold/solver/core/preview/api/move/DatasetFactory.java b/core/src/main/java/ai/timefold/solver/core/preview/api/move/DatasetFactory.java
new file mode 100644
index 0000000000..1e91262553
--- /dev/null
+++ b/core/src/main/java/ai/timefold/solver/core/preview/api/move/DatasetFactory.java
@@ -0,0 +1,40 @@
+package ai.timefold.solver.core.preview.api.move;
+
+import java.util.Collection;
+
+import org.jspecify.annotations.NonNull;
+
+public interface DatasetFactory<Solution_> {
+
+    /**
+     * Create a cached stream of all possible values of a class.
+     * Read from the planning solution.
+     *
+     * @param clz
+     * @return
+     * @param <A>
+     */
+    <A> @NonNull UniDataStream<Solution_, A> forEach(@NonNull Class<A> clz);
+
+    /**
+     * Create a cached stream of arbitrary values.
+     * Read from the planning solution.
+     *
+     * @param clz
+     * @param extractor
+     * @param <A>
+     * @return
+     */
+    <A> @NonNull UniDataStream<Solution_, A> forEach(@NonNull Class<A> clz, @NonNull SolutionExtractor<Solution_, A> extractor);
+
+    /**
+     * Create a cached stream of arbitrary values.
+     *
+     * @param clz
+     * @param collection
+     * @param <A>
+     * @return
+     */
+    <A> @NonNull UniDataStream<Solution_, A> forEach(@NonNull Class<A> clz, @NonNull Collection<A> collection);
+
+}
diff --git a/core/src/main/java/ai/timefold/solver/core/preview/api/move/MoveConstructor.java b/core/src/main/java/ai/timefold/solver/core/preview/api/move/MoveConstructor.java
new file mode 100644
index 0000000000..728e5b5754
--- /dev/null
+++ b/core/src/main/java/ai/timefold/solver/core/preview/api/move/MoveConstructor.java
@@ -0,0 +1,5 @@
+package ai.timefold.solver.core.preview.api.move;
+
+public sealed interface MoveConstructor<Solution_> permits BiMoveConstructor {
+
+}
diff --git a/core/src/main/java/ai/timefold/solver/core/preview/api/move/MoveProvider.java b/core/src/main/java/ai/timefold/solver/core/preview/api/move/MoveProvider.java
new file mode 100644
index 0000000000..bf4ddd8cc4
--- /dev/null
+++ b/core/src/main/java/ai/timefold/solver/core/preview/api/move/MoveProvider.java
@@ -0,0 +1,8 @@
+package ai.timefold.solver.core.preview.api.move;
+
+import java.util.function.BiFunction;
+
+@FunctionalInterface
+public interface MoveProvider<Solution_>
+        extends BiFunction<DatasetFactory<Solution_>, Picker<Solution_>, MoveConstructor<Solution_>> {
+}
diff --git a/core/src/main/java/ai/timefold/solver/core/preview/api/move/MutableSolutionView.java b/core/src/main/java/ai/timefold/solver/core/preview/api/move/MutableSolutionView.java
index 0282a4556b..0ef2b7aeae 100644
--- a/core/src/main/java/ai/timefold/solver/core/preview/api/move/MutableSolutionView.java
+++ b/core/src/main/java/ai/timefold/solver/core/preview/api/move/MutableSolutionView.java
@@ -29,6 +29,77 @@
  */
 public interface MutableSolutionView<Solution_> extends SolutionView<Solution_> {
 
+    /**
+     * Puts a given value at a particular index in a given entity's {@link PlanningListVariable planning list variable}.
+     * Moves all values at or after the index to the right.
+     *
+     * @param variableMetaModel Describes the variable to be changed.
+     * @param value The value to be assigned to a list variable.
+     * @param destinationEntity The entity whose list variable is to be changed.
+     * @param destinationIndex The index at which the value is to be assigned.
+     * @param <Entity_>
+     * @param <Value_>
+     */
+    <Entity_, Value_> void assignValue(@NonNull PlanningListVariableMetaModel<Solution_, Entity_, Value_> variableMetaModel,
+            @NonNull Value_ value, @NonNull Entity_ destinationEntity, int destinationIndex);
+
+    /**
+     * Removes a given value from the {@link PlanningListVariable planning list variable} that it's part of.
+     * Shifts any later values to the left.
+     *
+     * @param variableMetaModel Describes the variable to be changed.
+     * @param value The value to be removed from a list variable.
+     * @param <Entity_>
+     * @param <Value_>
+     * @throws IllegalStateException if the value is not assigned to a list variable
+     */
+    default <Entity_, Value_> void unassignValue(
+            @NonNull PlanningListVariableMetaModel<Solution_, Entity_, Value_> variableMetaModel,
+            @NonNull Value_ value) {
+        var locationInList = getPositionOf(variableMetaModel, value)
+                .ensureAssigned(() -> """
+                        The value (%s) is not assigned to a list variable.
+                        This may indicate score corruption or a problem with the move's implementation."""
+                        .formatted(value));
+        unassignValue(variableMetaModel, value, locationInList.entity(), locationInList.index());
+    }
+
+    /**
+     * Removes a value from a given entity's {@link PlanningListVariable planning list variable} at a given index.
+     * Shifts any later values to the left.
+     *
+     * @param variableMetaModel Describes the variable to be changed.
+     * @param entity The entity whose element is to be removed from a list variable.
+     * @param index >= 0
+     * @param <Entity_>
+     * @param <Value_>
+     * @return the removed value
+     * @throws IllegalArgumentException if the index is out of bounds
+     */
+    default <Entity_, Value_> @NonNull Value_ unassignValue(
+            @NonNull PlanningListVariableMetaModel<Solution_, Entity_, Value_> variableMetaModel, @NonNull Entity_ entity,
+            int index) {
+        var value = getValueAtIndex(variableMetaModel, entity, index);
+        unassignValue(variableMetaModel, value, entity, index);
+        return value;
+    }
+
+    /**
+     * Removes a given value from a given entity's {@link PlanningListVariable planning list variable} at a given index.
+     * Shifts any later values to the left.
+     *
+     * @param variableMetaModel Describes the variable to be changed.
+     * @param value The value to be unassigned from a list variable.
+     * @param entity The entity whose value is to be unassigned from a list variable.
+     * @param index >= 0
+     * @param <Entity_>
+     * @param <Value_>
+     * @throws IllegalArgumentException if the index is out of bounds
+     * @throws IllegalStateException if the actual value at the given index is not the given value
+     */
+    <Entity_, Value_> void unassignValue(@NonNull PlanningListVariableMetaModel<Solution_, Entity_, Value_> variableMetaModel,
+            @NonNull Value_ value, @NonNull Entity_ entity, int index);
+
     /**
      * Reads the value of a @{@link PlanningVariable basic planning variable} of a given entity.
      * 
@@ -47,9 +118,10 @@ <Entity_, Value_> void changeVariable(@NonNull PlanningVariableMetaModel<Solutio
      * @param sourceIndex >= 0
      * @param destinationEntity The second entity whose variable value is to be changed.
      * @param destinationIndex >= 0
+     * @return the value that was moved; null if nothing was moved
      * @throws IndexOutOfBoundsException if the index is out of bounds
      */
-    <Entity_, Value_> void moveValueBetweenLists(
+    <Entity_, Value_> @Nullable Value_ moveValueBetweenLists(
             @NonNull PlanningListVariableMetaModel<Solution_, Entity_, Value_> variableMetaModel,
             @NonNull Entity_ sourceEntity, int sourceIndex, @NonNull Entity_ destinationEntity, int destinationIndex);
 
@@ -60,9 +132,11 @@ <Entity_, Value_> void moveValueBetweenLists(
      * @param entity The entity whose variable value is to be changed.
      * @param sourceIndex >= 0
      * @param destinationIndex >= 0
+     * @return the value that was moved; null if nothing was moved
      * @throws IndexOutOfBoundsException if the index is out of bounds
      */
-    <Entity_, Value_> void moveValueInList(@NonNull PlanningListVariableMetaModel<Solution_, Entity_, Value_> variableMetaModel,
+    <Entity_, Value_> @Nullable Value_ moveValueInList(
+            @NonNull PlanningListVariableMetaModel<Solution_, Entity_, Value_> variableMetaModel,
             @NonNull Entity_ entity, int sourceIndex, int destinationIndex);
 
     /**
diff --git a/core/src/main/java/ai/timefold/solver/core/preview/api/move/Picker.java b/core/src/main/java/ai/timefold/solver/core/preview/api/move/Picker.java
new file mode 100644
index 0000000000..cd54a77c82
--- /dev/null
+++ b/core/src/main/java/ai/timefold/solver/core/preview/api/move/Picker.java
@@ -0,0 +1,5 @@
+package ai.timefold.solver.core.preview.api.move;
+
+public interface Picker<Solution_> {
+
+}
diff --git a/core/src/main/java/ai/timefold/solver/core/preview/api/move/SolutionExtractor.java b/core/src/main/java/ai/timefold/solver/core/preview/api/move/SolutionExtractor.java
new file mode 100644
index 0000000000..523f825b43
--- /dev/null
+++ b/core/src/main/java/ai/timefold/solver/core/preview/api/move/SolutionExtractor.java
@@ -0,0 +1,9 @@
+package ai.timefold.solver.core.preview.api.move;
+
+import java.util.function.BiFunction;
+import java.util.stream.Stream;
+
+@FunctionalInterface
+public interface SolutionExtractor<Solution_, A>
+        extends BiFunction<SolutionView<Solution_>, Solution_, Stream<A>> {
+}
diff --git a/core/src/main/java/ai/timefold/solver/core/preview/api/move/SolutionView.java b/core/src/main/java/ai/timefold/solver/core/preview/api/move/SolutionView.java
index 83a375a9dc..2a500f9dad 100644
--- a/core/src/main/java/ai/timefold/solver/core/preview/api/move/SolutionView.java
+++ b/core/src/main/java/ai/timefold/solver/core/preview/api/move/SolutionView.java
@@ -43,11 +43,11 @@ public interface SolutionView<Solution_> {
      * @param variableMetaModel Describes the variable whose value is to be read.
      * @param entity The entity whose variable is to be read.
      * @param index >= 0
-     * @return maybe null; the value of the variable on the entity at the index
+     * @return The value at the given index in the list variable.
      * @throws NullPointerException if the value of the list variable is null
      * @throws IndexOutOfBoundsException if the index is out of bounds
      */
-    <Entity_, Value_> @Nullable Value_ getValueAtIndex(
+    <Entity_, Value_> @NonNull Value_ getValueAtIndex(
             @NonNull PlanningListVariableMetaModel<Solution_, Entity_, Value_> variableMetaModel, @NonNull Entity_ entity,
             int index);
 
diff --git a/core/src/main/java/ai/timefold/solver/core/preview/api/move/UniDataStream.java b/core/src/main/java/ai/timefold/solver/core/preview/api/move/UniDataStream.java
new file mode 100644
index 0000000000..24e7315bdc
--- /dev/null
+++ b/core/src/main/java/ai/timefold/solver/core/preview/api/move/UniDataStream.java
@@ -0,0 +1,171 @@
+package ai.timefold.solver.core.preview.api.move;
+
+import static ai.timefold.solver.core.impl.util.ConstantLambdaUtils.notEquals;
+
+import java.util.Arrays;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
+
+import ai.timefold.solver.core.api.domain.entity.PlanningEntity;
+import ai.timefold.solver.core.api.score.stream.Joiners;
+import ai.timefold.solver.core.api.score.stream.bi.BiJoiner;
+
+import org.jspecify.annotations.NonNull;
+
+public interface UniDataStream<Solution_, A> extends DataStream<Solution_> {
+
+    /**
+     * Exhaustively test each fact against the {@link Predicate}
+     * and match if {@link Predicate#test(Object)} returns true.
+     */
+    @NonNull
+    UniDataStream<Solution_, A> filter(@NonNull Predicate<A> predicate);
+
+    /**
+     * Create a new {@link UniDataStream} for every A where B exists for which all {@link BiJoiner}s are true
+     * (for the properties they extract from both facts).
+     *
+     * @param <B> the type of the second matched fact
+     * @return a stream that matches every A where B exists for which the {@link BiJoiner}s are true
+     */
+    @SuppressWarnings("unchecked")
+    <B> @NonNull UniDataStream<Solution_, A> ifExists(@NonNull Class<B> otherClass, @NonNull BiJoiner<A, B>... joiners);
+
+    /**
+     * Create a new {@link UniDataStream} for every A where B exists for which all {@link BiJoiner}s are true
+     * (for the properties it extracts from both facts).
+     *
+     * @param <B> the type of the second matched fact
+     * @return a stream that matches every A where B exists for which the {@link BiJoiner}s are true
+     */
+    @SuppressWarnings("unchecked")
+    <B> @NonNull UniDataStream<Solution_, A> ifExists(@NonNull UniDataStream<Solution_, B> otherStream,
+            @NonNull BiJoiner<A, B>... joiners);
+
+    /**
+     * Create a new {@link UniDataStream} for every A where B exists for which the {@link BiJoiner}s are true
+     * (for the properties they extract from both facts).
+     * For classes annotated with {@link PlanningEntity},
+     * this method also includes entities with null variables,
+     * or entities that are not assigned to any list variable.
+     *
+     * @param <B> the type of the second matched fact
+     * @return a stream that matches every A where B exists for which the {@link BiJoiner}s are true
+     */
+    @SuppressWarnings("unchecked")
+    <B> @NonNull UniDataStream<Solution_, A> ifExistsIncludingUnassigned(@NonNull Class<B> otherClass,
+            @NonNull BiJoiner<A, B>... joiners);
+
+    /**
+     * Create a new {@link UniDataStream} for every A, if another A exists that does not {@link Object#equals(Object)}
+     * the first, and for which the {@link BiJoiner}s are true (for the properties they extract from both facts).
+     *
+     * @return a stream that matches every A where a different A exists for which the {@link BiJoiner}s are true
+     */
+    @SuppressWarnings("unchecked")
+    default @NonNull UniDataStream<Solution_, A> ifExistsOther(@NonNull Class<A> otherClass,
+            @NonNull BiJoiner<A, A>... joiners) {
+        BiJoiner<A, A> otherness = Joiners.filtering(notEquals());
+
+        @SuppressWarnings("unchecked")
+        BiJoiner<A, A>[] allJoiners = Stream.concat(Arrays.stream(joiners), Stream.of(otherness))
+                .toArray(BiJoiner[]::new);
+        return ifExists(otherClass, allJoiners);
+    }
+
+    /**
+     * Create a new {@link UniDataStream} for every A,
+     * if another A exists that does not {@link Object#equals(Object)} the first,
+     * and for which the {@link BiJoiner}s are true (for the properties they extract from both facts).
+     * For classes annotated with {@link PlanningEntity},
+     * this method also includes entities with null variables,
+     * or entities that are not assigned to any list variable.
+     *
+     * @return a stream that matches every A where a different A exists for which the {@link BiJoiner}s are true
+     */
+    @SuppressWarnings("unchecked")
+    default @NonNull UniDataStream<Solution_, A> ifExistsOtherIncludingUnassigned(@NonNull Class<A> otherClass,
+            @NonNull BiJoiner<A, A>... joiners) {
+        BiJoiner<A, A> otherness = Joiners.filtering(notEquals());
+
+        @SuppressWarnings("unchecked")
+        BiJoiner<A, A>[] allJoiners = Stream.concat(Arrays.stream(joiners), Stream.of(otherness))
+                .toArray(BiJoiner[]::new);
+        return ifExistsIncludingUnassigned(otherClass, allJoiners);
+    }
+
+    /**
+     * Create a new {@link UniDataStream} for every A where B does not exist for which the {@link BiJoiner}s are true
+     * (for the properties they extract from both facts).
+     *
+     * @param <B> the type of the second matched fact
+     * @return a stream that matches every A where B does not exist for which the {@link BiJoiner}s are true
+     */
+    @SuppressWarnings("unchecked")
+    <B> @NonNull UniDataStream<Solution_, A> ifNotExists(@NonNull Class<B> otherClass, @NonNull BiJoiner<A, B>... joiners);
+
+    /**
+     * Create a new {@link UniDataStream} for every A where B does not exist for which the {@link BiJoiner}s are true
+     * (for the properties they extract from both facts).
+     *
+     * @param <B> the type of the second matched fact
+     * @return a stream that matches every A where B does not exist for which the {@link BiJoiner}s are true
+     */
+    @SuppressWarnings("unchecked")
+    <B> @NonNull UniDataStream<Solution_, A> ifNotExists(@NonNull UniDataStream<Solution_, B> otherStream,
+            @NonNull BiJoiner<A, B>... joiners);
+
+    /**
+     * Create a new {@link UniDataStream} for every A where B does not exist for which the {@link BiJoiner}s are true
+     * (for the properties they extract from both facts).
+     * For classes annotated with {@link PlanningEntity},
+     * this method also includes entities with null variables,
+     * or entities that are not assigned to any list variable.
+     *
+     * @param <B> the type of the second matched fact
+     * @return a stream that matches every A where B does not exist for which the {@link BiJoiner}s are true
+     */
+    @SuppressWarnings("unchecked")
+    <B> @NonNull UniDataStream<Solution_, A> ifNotExistsIncludingUnassigned(@NonNull Class<B> otherClass,
+            @NonNull BiJoiner<A, B>... joiners);
+
+    /**
+     * Create a new {@link UniDataStream} for every A, if no other A exists that does not {@link Object#equals(Object)}
+     * the first,
+     * for which the {@link BiJoiner}s are true (for the properties they extract from both facts).
+     *
+     * @return a stream that matches every A where a different A does not exist
+     */
+    @SuppressWarnings("unchecked")
+    default @NonNull UniDataStream<Solution_, A> ifNotExistsOther(@NonNull Class<A> otherClass,
+            @NonNull BiJoiner<A, A>... joiners) {
+        BiJoiner<A, A> otherness = Joiners.filtering(notEquals());
+
+        @SuppressWarnings("unchecked")
+        BiJoiner<A, A>[] allJoiners = Stream.concat(Arrays.stream(joiners), Stream.of(otherness))
+                .toArray(BiJoiner[]::new);
+        return ifNotExists(otherClass, allJoiners);
+    }
+
+    /**
+     * Create a new {@link UniDataStream} for every A,
+     * if no other A exists that does not {@link Object#equals(Object)} the first,
+     * for which the {@link BiJoiner}s are true (for the properties they extract from both facts).
+     * For classes annotated with {@link PlanningEntity},
+     * this method also includes entities with null variables,
+     * or entities that are not assigned to any list variable.
+     *
+     * @return a stream that matches every A where a different A does not exist
+     */
+    @SuppressWarnings("unchecked")
+    default @NonNull UniDataStream<Solution_, A> ifNotExistsOtherIncludingUnassigned(@NonNull Class<A> otherClass,
+            @NonNull BiJoiner<A, A>... joiners) {
+        BiJoiner<A, A> otherness = Joiners.filtering(notEquals());
+
+        @SuppressWarnings("unchecked")
+        BiJoiner<A, A>[] allJoiners = Stream.concat(Arrays.stream(joiners), Stream.of(otherness))
+                .toArray(BiJoiner[]::new);
+        return ifNotExistsIncludingUnassigned(otherClass, allJoiners);
+    }
+
+}
diff --git a/core/src/test/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/AbstractIndexerTest.java b/core/src/test/java/ai/timefold/solver/core/impl/bavet/common/index/AbstractIndexerTest.java
similarity index 93%
rename from core/src/test/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/AbstractIndexerTest.java
rename to core/src/test/java/ai/timefold/solver/core/impl/bavet/common/index/AbstractIndexerTest.java
index 6d87ec0aed..db0bc8a2a4 100644
--- a/core/src/test/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/AbstractIndexerTest.java
+++ b/core/src/test/java/ai/timefold/solver/core/impl/bavet/common/index/AbstractIndexerTest.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common.index;
+package ai.timefold.solver.core.impl.bavet.common.index;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/core/src/test/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/EqualsAndComparisonIndexerTest.java b/core/src/test/java/ai/timefold/solver/core/impl/bavet/common/index/EqualsAndComparisonIndexerTest.java
similarity index 92%
rename from core/src/test/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/EqualsAndComparisonIndexerTest.java
rename to core/src/test/java/ai/timefold/solver/core/impl/bavet/common/index/EqualsAndComparisonIndexerTest.java
index 1a96a73a63..5b296c0d93 100644
--- a/core/src/test/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/EqualsAndComparisonIndexerTest.java
+++ b/core/src/test/java/ai/timefold/solver/core/impl/bavet/common/index/EqualsAndComparisonIndexerTest.java
@@ -1,11 +1,11 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common.index;
+package ai.timefold.solver.core.impl.bavet.common.index;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import ai.timefold.solver.core.api.score.stream.Joiners;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
-import ai.timefold.solver.core.impl.score.stream.common.bi.DefaultBiJoiner;
+import ai.timefold.solver.core.impl.bavet.common.index.joiner.DefaultBiJoiner;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 import ai.timefold.solver.core.impl.util.ElementAwareListEntry;
 
 import org.junit.jupiter.api.Test;
diff --git a/core/src/test/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/EqualsIndexerTest.java b/core/src/test/java/ai/timefold/solver/core/impl/bavet/common/index/EqualsIndexerTest.java
similarity index 92%
rename from core/src/test/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/EqualsIndexerTest.java
rename to core/src/test/java/ai/timefold/solver/core/impl/bavet/common/index/EqualsIndexerTest.java
index 1503a996a4..59645277ed 100644
--- a/core/src/test/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/EqualsIndexerTest.java
+++ b/core/src/test/java/ai/timefold/solver/core/impl/bavet/common/index/EqualsIndexerTest.java
@@ -1,11 +1,11 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common.index;
+package ai.timefold.solver.core.impl.bavet.common.index;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import ai.timefold.solver.core.api.score.stream.Joiners;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
-import ai.timefold.solver.core.impl.score.stream.common.bi.DefaultBiJoiner;
+import ai.timefold.solver.core.impl.bavet.common.index.joiner.DefaultBiJoiner;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 import ai.timefold.solver.core.impl.util.ElementAwareListEntry;
 import ai.timefold.solver.core.impl.util.Pair;
 
diff --git a/core/src/test/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/NoneIndexerTest.java b/core/src/test/java/ai/timefold/solver/core/impl/bavet/common/index/NoneIndexerTest.java
similarity index 94%
rename from core/src/test/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/NoneIndexerTest.java
rename to core/src/test/java/ai/timefold/solver/core/impl/bavet/common/index/NoneIndexerTest.java
index a1336a77c4..90737d4b7e 100644
--- a/core/src/test/java/ai/timefold/solver/core/impl/score/stream/bavet/common/index/NoneIndexerTest.java
+++ b/core/src/test/java/ai/timefold/solver/core/impl/bavet/common/index/NoneIndexerTest.java
@@ -1,10 +1,10 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.common.index;
+package ai.timefold.solver.core.impl.bavet.common.index;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 import ai.timefold.solver.core.impl.util.ElementAwareListEntry;
 
 import org.junit.jupiter.api.Test;
diff --git a/core/src/test/java/ai/timefold/solver/core/impl/score/stream/common/JoinerTypeTest.java b/core/src/test/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/JoinerTypeTest.java
similarity index 76%
rename from core/src/test/java/ai/timefold/solver/core/impl/score/stream/common/JoinerTypeTest.java
rename to core/src/test/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/JoinerTypeTest.java
index 2922b871c7..abec836107 100644
--- a/core/src/test/java/ai/timefold/solver/core/impl/score/stream/common/JoinerTypeTest.java
+++ b/core/src/test/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/JoinerTypeTest.java
@@ -1,13 +1,13 @@
-package ai.timefold.solver.core.impl.score.stream.common;
+package ai.timefold.solver.core.impl.bavet.common.index.joiner;
 
-import static ai.timefold.solver.core.impl.score.stream.JoinerType.CONTAINING;
-import static ai.timefold.solver.core.impl.score.stream.JoinerType.DISJOINT;
-import static ai.timefold.solver.core.impl.score.stream.JoinerType.EQUAL;
-import static ai.timefold.solver.core.impl.score.stream.JoinerType.GREATER_THAN;
-import static ai.timefold.solver.core.impl.score.stream.JoinerType.GREATER_THAN_OR_EQUAL;
-import static ai.timefold.solver.core.impl.score.stream.JoinerType.INTERSECTING;
-import static ai.timefold.solver.core.impl.score.stream.JoinerType.LESS_THAN;
-import static ai.timefold.solver.core.impl.score.stream.JoinerType.LESS_THAN_OR_EQUAL;
+import static ai.timefold.solver.core.impl.bavet.common.index.joiner.JoinerType.CONTAINING;
+import static ai.timefold.solver.core.impl.bavet.common.index.joiner.JoinerType.DISJOINT;
+import static ai.timefold.solver.core.impl.bavet.common.index.joiner.JoinerType.EQUAL;
+import static ai.timefold.solver.core.impl.bavet.common.index.joiner.JoinerType.GREATER_THAN;
+import static ai.timefold.solver.core.impl.bavet.common.index.joiner.JoinerType.GREATER_THAN_OR_EQUAL;
+import static ai.timefold.solver.core.impl.bavet.common.index.joiner.JoinerType.INTERSECTING;
+import static ai.timefold.solver.core.impl.bavet.common.index.joiner.JoinerType.LESS_THAN;
+import static ai.timefold.solver.core.impl.bavet.common.index.joiner.JoinerType.LESS_THAN_OR_EQUAL;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Arrays;
diff --git a/core/src/test/java/ai/timefold/solver/core/impl/score/stream/common/JoinersTest.java b/core/src/test/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/JoinersTest.java
similarity index 99%
rename from core/src/test/java/ai/timefold/solver/core/impl/score/stream/common/JoinersTest.java
rename to core/src/test/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/JoinersTest.java
index 6978c2837a..ffb8b5c2d7 100644
--- a/core/src/test/java/ai/timefold/solver/core/impl/score/stream/common/JoinersTest.java
+++ b/core/src/test/java/ai/timefold/solver/core/impl/bavet/common/index/joiner/JoinersTest.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.score.stream.common;
+package ai.timefold.solver.core.impl.bavet.common.index.joiner;
 
 import static org.assertj.core.api.SoftAssertions.assertSoftly;
 
@@ -10,10 +10,6 @@
 import ai.timefold.solver.core.api.function.QuadFunction;
 import ai.timefold.solver.core.api.function.TriFunction;
 import ai.timefold.solver.core.api.score.stream.Joiners;
-import ai.timefold.solver.core.impl.score.stream.common.bi.DefaultBiJoiner;
-import ai.timefold.solver.core.impl.score.stream.common.penta.DefaultPentaJoiner;
-import ai.timefold.solver.core.impl.score.stream.common.quad.DefaultQuadJoiner;
-import ai.timefold.solver.core.impl.score.stream.common.tri.DefaultTriJoiner;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/core/src/test/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/FlattenLastUniNodeTest.java b/core/src/test/java/ai/timefold/solver/core/impl/bavet/uni/FlattenLastUniNodeTest.java
similarity index 94%
rename from core/src/test/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/FlattenLastUniNodeTest.java
rename to core/src/test/java/ai/timefold/solver/core/impl/bavet/uni/FlattenLastUniNodeTest.java
index 6f5b295cdd..5ee31af0f8 100644
--- a/core/src/test/java/ai/timefold/solver/core/impl/score/stream/bavet/uni/FlattenLastUniNodeTest.java
+++ b/core/src/test/java/ai/timefold/solver/core/impl/bavet/uni/FlattenLastUniNodeTest.java
@@ -1,4 +1,4 @@
-package ai.timefold.solver.core.impl.score.stream.bavet.uni;
+package ai.timefold.solver.core.impl.bavet.uni;
 
 import static org.mockito.Mockito.argThat;
 import static org.mockito.Mockito.reset;
@@ -12,10 +12,10 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-import ai.timefold.solver.core.impl.score.stream.bavet.common.AbstractFlattenLastNode;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.Propagator;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.TupleLifecycle;
-import ai.timefold.solver.core.impl.score.stream.bavet.common.tuple.UniTuple;
+import ai.timefold.solver.core.impl.bavet.common.AbstractFlattenLastNode;
+import ai.timefold.solver.core.impl.bavet.common.Propagator;
+import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
+import ai.timefold.solver.core.impl.bavet.common.tuple.UniTuple;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
diff --git a/core/src/test/java/ai/timefold/solver/core/impl/heuristic/selector/move/generic/list/ListChangeMoveTest.java b/core/src/test/java/ai/timefold/solver/core/impl/heuristic/selector/move/generic/list/ListChangeMoveTest.java
index 54f0cca31a..ee5055582a 100644
--- a/core/src/test/java/ai/timefold/solver/core/impl/heuristic/selector/move/generic/list/ListChangeMoveTest.java
+++ b/core/src/test/java/ai/timefold/solver/core/impl/heuristic/selector/move/generic/list/ListChangeMoveTest.java
@@ -108,7 +108,7 @@ void doAndUndoMoveOnTheSameEntity(int destinationIndex, List<String> expectedVal
         move.doMoveOnly(scoreDirector);
         // ...V2 ends up at the destinationIndex
         assertThat(e.getValueList().indexOf(v2)).isEqualTo(destinationIndex);
-        assertThat(variableDescriptor.getElement(e, destinationIndex)).isEqualTo(v2);
+        assertThat((TestdataListValue) variableDescriptor.getElement(e, destinationIndex)).isEqualTo(v2);
         // ...and the modified value list matches the expectation.
         assertThat(e.getValueList()).map(TestdataObject::toString).isEqualTo(expectedValueList);
 
diff --git a/core/src/test/java/ai/timefold/solver/core/impl/move/dataset/IndexedListTest.java b/core/src/test/java/ai/timefold/solver/core/impl/move/dataset/IndexedListTest.java
new file mode 100644
index 0000000000..3dd3c8a7a5
--- /dev/null
+++ b/core/src/test/java/ai/timefold/solver/core/impl/move/dataset/IndexedListTest.java
@@ -0,0 +1,110 @@
+package ai.timefold.solver.core.impl.move.dataset;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import org.junit.jupiter.api.Test;
+
+class IndexedListTest {
+
+    @Test
+    void addElementIncreasesSize() {
+        var list = new IndexedList<String>();
+        list.add(0, "A");
+        assertThat(list).hasSize(1);
+    }
+
+    @Test
+    void addElementAtIndex() {
+        var list = new IndexedList<String>();
+        list.add(0, "A");
+        list.add(1, "B");
+        list.add(1, "C");
+        assertThat(list)
+                .containsExactly("A", "C", "B");
+    }
+
+    @Test
+    void addDuplicateElementThrowsException() {
+        var list = new IndexedList<String>();
+        list.add(0, "A");
+        assertThatThrownBy(() -> list.add(1, "A"))
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessageContaining("The element (A) was already added to the list.");
+    }
+
+    @Test
+    void setElementUpdatesValue() {
+        var list = new IndexedList<String>();
+        list.add(0, "A");
+        list.set(0, "B");
+        assertThat(list)
+                .first()
+                .isEqualTo("B");
+    }
+
+    @Test
+    void setElementAtInvalidIndexThrowsException() {
+        var list = new IndexedList<String>();
+        assertThatThrownBy(() -> list.set(0, "A"))
+                .isInstanceOf(IndexOutOfBoundsException.class)
+                .hasMessageContaining("The index (0) must be between 0 and -1.");
+    }
+
+    @Test
+    void removeElementDecreasesSize() {
+        var list = new IndexedList<String>();
+        list.add(0, "A");
+        list.add(1, "B");
+        assertThat(list.remove(0))
+                .isEqualTo("A");
+        assertThat(list)
+                .hasSize(1);
+    }
+
+    @Test
+    void removeElementAtIndex() {
+        var list = new IndexedList<String>();
+        list.add(0, "A");
+        list.add(1, "B");
+        list.add(2, "C");
+        assertThat(list.remove(1))
+                .isEqualTo("B");
+        assertThat(list.get(0))
+                .isEqualTo("A");
+        assertThat(list.get(1))
+                .isEqualTo("C");
+    }
+
+    @Test
+    void indexOfElement() {
+        var list = new IndexedList<String>();
+        list.add(0, "A");
+        list.add(1, "B");
+        assertThat(list.indexOf("B"))
+                .isEqualTo(1);
+    }
+
+    @Test
+    void indexOfNonExistentElement() {
+        var list = new IndexedList<String>();
+        assertThat(list.indexOf("A"))
+                .isEqualTo(-1);
+    }
+
+    @Test
+    void getElementAtIndex() {
+        var list = new IndexedList<String>();
+        list.add(0, "A");
+        assertThat(list)
+                .first()
+                .isEqualTo("A");
+    }
+
+    @Test
+    void getElementAtInvalidIndexThrowsException() {
+        var list = new IndexedList<String>();
+        assertThatThrownBy(() -> list.get(0))
+                .isInstanceOf(IndexOutOfBoundsException.class);
+    }
+}
\ No newline at end of file