Refactoring packages related to VersionedMapDeltaImpl + VersionedMapStoreStateImpl, update builder.

- details of the maps goes to internal packages
- ModelStoreBuilderImpl uses VersionedMapStoreFactoryBuilder

28 files changed, 148 insertions, 196 deletions

diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/ContinousHashProvider.java b/subprojects/store/src/main/java/tools/refinery/store/map/ContinuousHashProvider.java
index 8e451230..abc044d0 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/map/ContinousHashProvider.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/ContinuousHashProvider.java
@@ -5,17 +5,17 @@
  */
 package tools.refinery.store.map;
 
-import tools.refinery.store.map.internal.Node;
+import tools.refinery.store.map.internal.state.Node;
 
 /**
  * A class representing an equivalence relation for a type {@code K} with a
  * continuous hash function.
- * 
+ *
  * @author Oszkar Semerath
  *
  * @param <K> Target java type.
  */
-public interface ContinousHashProvider<K> {
+public interface ContinuousHashProvider<K> {
         public static final int EFFECTIVE_BITS = Node.EFFECTIVE_BITS;
         public static final int EFFECTIVE_BIT_MASK = (1 << (EFFECTIVE_BITS)) - 1;
 
@@ -38,9 +38,9 @@ public interface ContinousHashProvider<K> {
          * {@link #EFFECTIVE_BITS}
          * </ul>
          * Check {@link #equals} for further details.
-         * 
+         *
          * @param key   The target data object.
-         * @param index The depth of the the hash code. Needs to be non-negative.
+         * @param index The depth of the hash code. Needs to be non-negative.
          * @return A hash code.
          */
         public int getHash(K key, int index);
@@ -53,7 +53,7 @@ public interface ContinousHashProvider<K> {
                 if (key1.equals(key2)) {
                         return 0;
                 } else {
-                        for (int i = 0; i < ContinousHashProvider.MAX_PRACTICAL_DEPTH; i++) {
+                        for (int i = 0; i < ContinuousHashProvider.MAX_PRACTICAL_DEPTH; i++) {
                                 int hash1 = getEffectiveHash(key1, i);
                                 int hash2 = getEffectiveHash(key2, i);
                                 for(int j = 0; j<Integer.SIZE/Node.BRANCHING_FACTOR_BITS; j++) {
@@ -68,7 +68,7 @@ public interface ContinousHashProvider<K> {
                         }
                         throw new IllegalArgumentException("Two different keys (" + key1 + " and " + key2
                                         + ") have the same hashcode over the practical depth limitation ("
-                                        + ContinousHashProvider.MAX_PRACTICAL_DEPTH + ")!");
+                                        + ContinuousHashProvider.MAX_PRACTICAL_DEPTH + ")!");
                 }
         }
 }
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/internal/IteratorAsCursor.java b/subprojects/store/src/main/java/tools/refinery/store/map/IteratorAsCursor.java
index d1ab8bb1..29b03edf 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/map/internal/IteratorAsCursor.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/IteratorAsCursor.java
@@ -1,16 +1,14 @@
 /*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.map.internal;
+package tools.refinery.store.map;
 
-import java.util.*;
+import java.util.Iterator;
+import java.util.Map;
 import java.util.Map.Entry;
-
-import tools.refinery.store.map.AnyVersionedMap;
-import tools.refinery.store.map.Cursor;
-import tools.refinery.store.map.VersionedMap;
+import java.util.Set;
 
 public class IteratorAsCursor<K, V> implements Cursor<K, V> {
         final Iterator<Entry<K, V>> iterator;
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/VersionedMapStoreFactoryBuilder.java b/subprojects/store/src/main/java/tools/refinery/store/map/VersionedMapStoreFactoryBuilder.java
index 6329a2f6..6b4fc2a0 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/map/VersionedMapStoreFactoryBuilder.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/VersionedMapStoreFactoryBuilder.java
@@ -22,7 +22,7 @@ public interface VersionedMapStoreFactoryBuilder<K,V> {
         VersionedMapStoreFactoryBuilder<K,V> strategy(StoreStrategy strategy);
         VersionedMapStoreFactoryBuilder<K,V> stateBasedImmutableWhenCommitting(boolean transformToImmutable);
         VersionedMapStoreFactoryBuilder<K,V> stateBasedSharingStrategy(SharingStrategy sharingStrategy);
-        VersionedMapStoreFactoryBuilder<K,V> stateBasedHashProvider(ContinousHashProvider<K> hashProvider);
+        VersionedMapStoreFactoryBuilder<K,V> stateBasedHashProvider(ContinuousHashProvider<K> hashProvider);
         VersionedMapStoreFactoryBuilder<K,V> deltaTransactionStrategy(DeltaTransactionStrategy deltaStrategy);
 
         VersionedMapStoreFactory<K,V> build();
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/internal/HashClash.java b/subprojects/store/src/main/java/tools/refinery/store/map/internal/HashClash.java
deleted file mode 100644
index a357fbce..00000000
--- a/subprojects/store/src/main/java/tools/refinery/store/map/internal/HashClash.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.store.map.internal;
-
-enum HashClash {
-        /**
-         * Not stuck.
-         */
-        NONE,
-
-        /**
-         * Clashed, next we should return the key of cursor 1.
-         */
-        STUCK_CURSOR_1,
-
-        /**
-         * Clashed, next we should return the key of cursor 2.
-         */
-        STUCK_CURSOR_2
-}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/internal/VersionedMapStoreFactoryBuilderImpl.java b/subprojects/store/src/main/java/tools/refinery/store/map/internal/VersionedMapStoreFactoryBuilderImpl.java
index cf117d95..47470236 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/map/internal/VersionedMapStoreFactoryBuilderImpl.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/internal/VersionedMapStoreFactoryBuilderImpl.java
@@ -5,9 +5,11 @@
  */
 package tools.refinery.store.map.internal;
 
-import tools.refinery.store.map.ContinousHashProvider;
+import tools.refinery.store.map.ContinuousHashProvider;
 import tools.refinery.store.map.VersionedMapStoreFactory;
 import tools.refinery.store.map.VersionedMapStoreFactoryBuilder;
+import tools.refinery.store.map.internal.delta.DeltaBasedVersionedMapStoreFactory;
+import tools.refinery.store.map.internal.state.StateBasedVersionedMapStoreFactory;
 
 public class VersionedMapStoreFactoryBuilderImpl<K, V> implements VersionedMapStoreFactoryBuilder<K, V> {
 
@@ -16,14 +18,14 @@ public class VersionedMapStoreFactoryBuilderImpl<K, V> implements VersionedMapSt
         private StoreStrategy strategy = null;
         private Boolean transformToImmutable = null;
         private SharingStrategy sharingStrategy = null;
-        private ContinousHashProvider<K> continousHashProvider = null;
+        private ContinuousHashProvider<K> continuousHashProvider = null;
         private DeltaTransactionStrategy deltaTransactionStrategy = null;
 
         private StoreStrategy checkStrategy() {
                 StoreStrategy currentStrategy = strategy;
                 currentStrategy = mergeStrategies(currentStrategy, transformToImmutable, StoreStrategy.STATE);
                 currentStrategy = mergeStrategies(currentStrategy, sharingStrategy, StoreStrategy.STATE);
-                currentStrategy = mergeStrategies(currentStrategy, continousHashProvider, StoreStrategy.STATE);
+                currentStrategy = mergeStrategies(currentStrategy, continuousHashProvider, StoreStrategy.STATE);
                 currentStrategy = mergeStrategies(currentStrategy, deltaTransactionStrategy, StoreStrategy.DELTA);
                 return currentStrategy;
         }
@@ -77,8 +79,8 @@ public class VersionedMapStoreFactoryBuilderImpl<K, V> implements VersionedMapSt
         }
 
         @Override
-        public VersionedMapStoreFactoryBuilder<K, V> stateBasedHashProvider(ContinousHashProvider<K> hashProvider) {
-                this.continousHashProvider = hashProvider;
+        public VersionedMapStoreFactoryBuilder<K, V> stateBasedHashProvider(ContinuousHashProvider<K> hashProvider) {
+                this.continuousHashProvider = hashProvider;
                 checkStrategy();
                 return this;
         }
@@ -110,13 +112,13 @@ public class VersionedMapStoreFactoryBuilderImpl<K, V> implements VersionedMapSt
                 }
                 return switch (strategyToUse) {
                         case STATE -> {
-                                if(continousHashProvider == null) {
+                                if(continuousHashProvider == null) {
                                         throw new IllegalArgumentException("Continuous hash provider is missing!");
                                 }
                                 yield new StateBasedVersionedMapStoreFactory<>(defaultValue,
                                                 getOrDefault(transformToImmutable,true),
                                                 getOrDefault(sharingStrategy, SharingStrategy.SHARED_NODE_CACHE_IN_GROUP),
-                                                continousHashProvider);
+                                                continuousHashProvider);
                         }
                         case DELTA -> new DeltaBasedVersionedMapStoreFactory<>(defaultValue,
                                         getOrDefault(deltaTransactionStrategy, DeltaTransactionStrategy.LIST));
@@ -130,7 +132,7 @@ public class VersionedMapStoreFactoryBuilderImpl<K, V> implements VersionedMapSt
                                 ", strategy=" + strategy +
                                 ", stateBasedImmutableWhenCommitting=" + transformToImmutable +
                                 ", stateBasedNodeSharingStrategy=" + sharingStrategy +
-                                ", hashProvider=" + continousHashProvider +
+                                ", hashProvider=" + continuousHashProvider +
                                 ", deltaStorageStrategy=" + deltaTransactionStrategy +
                                 '}';
         }
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/internal/DeltaBasedVersionedMapStoreFactory.java b/subprojects/store/src/main/java/tools/refinery/store/map/internal/delta/DeltaBasedVersionedMapStoreFactory.java
index fe490f46..cedcdc0b 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/map/internal/DeltaBasedVersionedMapStoreFactory.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/internal/delta/DeltaBasedVersionedMapStoreFactory.java
@@ -1,12 +1,11 @@
 /*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.map.internal;
+package tools.refinery.store.map.internal.delta;
 
 import tools.refinery.store.map.VersionedMapStore;
-import tools.refinery.store.map.VersionedMapStoreDeltaImpl;
 import tools.refinery.store.map.VersionedMapStoreFactory;
 import tools.refinery.store.map.VersionedMapStoreFactoryBuilder;
 
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/internal/DeltaDiffCursor.java b/subprojects/store/src/main/java/tools/refinery/store/map/internal/delta/DeltaDiffCursor.java
index cc9003e3..ce10b246 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/map/internal/DeltaDiffCursor.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/internal/delta/DeltaDiffCursor.java
@@ -1,9 +1,9 @@
 /*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.map.internal;
+package tools.refinery.store.map.internal.delta;
 
 import tools.refinery.store.map.AnyVersionedMap;
 import tools.refinery.store.map.DiffCursor;
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/internal/MapDelta.java b/subprojects/store/src/main/java/tools/refinery/store/map/internal/delta/MapDelta.java
index 2674236c..0c0cc906 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/map/internal/MapDelta.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/internal/delta/MapDelta.java
@@ -1,9 +1,9 @@
 /*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.map.internal;
+package tools.refinery.store.map.internal.delta;
 
 public record MapDelta<K, V>(K key, V oldValue, V newValue) {
         public K getKey() {
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/internal/MapTransaction.java b/subprojects/store/src/main/java/tools/refinery/store/map/internal/delta/MapTransaction.java
index d63522cd..7f9ccd7f 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/map/internal/MapTransaction.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/internal/delta/MapTransaction.java
@@ -1,9 +1,9 @@
 /*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.map.internal;
+package tools.refinery.store.map.internal.delta;
 
 import java.util.Arrays;
 import java.util.Objects;
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/internal/UncommittedDeltaArrayStore.java b/subprojects/store/src/main/java/tools/refinery/store/map/internal/delta/UncommittedDeltaArrayStore.java
index ba59cfef..1f6a9000 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/map/internal/UncommittedDeltaArrayStore.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/internal/delta/UncommittedDeltaArrayStore.java
@@ -1,9 +1,9 @@
 /*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.map.internal;
+package tools.refinery.store.map.internal.delta;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/internal/UncommittedDeltaMapStore.java b/subprojects/store/src/main/java/tools/refinery/store/map/internal/delta/UncommittedDeltaMapStore.java
index 61a34351..644884a6 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/map/internal/UncommittedDeltaMapStore.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/internal/delta/UncommittedDeltaMapStore.java
@@ -1,9 +1,9 @@
 /*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.map.internal;
+package tools.refinery.store.map.internal.delta;
 
 import java.util.*;
 import java.util.Map.Entry;
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/internal/UncommittedDeltaStore.java b/subprojects/store/src/main/java/tools/refinery/store/map/internal/delta/UncommittedDeltaStore.java
index 438b5561..ecd33c5f 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/map/internal/UncommittedDeltaStore.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/internal/delta/UncommittedDeltaStore.java
@@ -1,9 +1,9 @@
 /*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.map.internal;
+package tools.refinery.store.map.internal.delta;
 
 public interface UncommittedDeltaStore<K, V> {
         void processChange(K key, V oldValue, V newValue);
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/internal/VersionedMapDeltaImpl.java b/subprojects/store/src/main/java/tools/refinery/store/map/internal/delta/VersionedMapDeltaImpl.java
index ae47feda..5bb864ac 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/map/internal/VersionedMapDeltaImpl.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/internal/delta/VersionedMapDeltaImpl.java
@@ -1,13 +1,14 @@
 /*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.map.internal;
+package tools.refinery.store.map.internal.delta;
 
 import java.util.*;
 
 import tools.refinery.store.map.*;
+import tools.refinery.store.map.IteratorAsCursor;
 
 public class VersionedMapDeltaImpl<K, V> implements VersionedMap<K, V> {
         protected final VersionedMapStoreDeltaImpl<K, V> store;
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/VersionedMapStoreDeltaImpl.java b/subprojects/store/src/main/java/tools/refinery/store/map/internal/delta/VersionedMapStoreDeltaImpl.java
index 0c61bd09..7f56ea77 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/map/VersionedMapStoreDeltaImpl.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/internal/delta/VersionedMapStoreDeltaImpl.java
@@ -1,13 +1,15 @@
 /*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.map;
+package tools.refinery.store.map.internal.delta;
 
-import java.util.*;
+import tools.refinery.store.map.DiffCursor;
+import tools.refinery.store.map.VersionedMap;
+import tools.refinery.store.map.VersionedMapStore;
 
-import tools.refinery.store.map.internal.*;
+import java.util.*;
 
 public class VersionedMapStoreDeltaImpl<K, V> implements VersionedMapStore<K, V> {
         // Configuration
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/internal/ImmutableNode.java b/subprojects/store/src/main/java/tools/refinery/store/map/internal/state/ImmutableNode.java
index d052318f..722f9ed7 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/map/internal/ImmutableNode.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/internal/state/ImmutableNode.java
@@ -1,14 +1,14 @@
 /*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.map.internal;
+package tools.refinery.store.map.internal.state;
 
 import java.util.Arrays;
 import java.util.Map;
 
-import tools.refinery.store.map.ContinousHashProvider;
+import tools.refinery.store.map.ContinuousHashProvider;
 
 public class ImmutableNode<K, V> extends Node<K, V> {
         /**
@@ -104,7 +104,7 @@ public class ImmutableNode<K, V> extends Node<K, V> {
         }
 
         @Override
-        public V getValue(K key, ContinousHashProvider<? super K> hashProvider, V defaultValue, int hash, int depth) {
+        public V getValue(K key, ContinuousHashProvider<? super K> hashProvider, V defaultValue, int hash, int depth) {
                 int selectedHashFragment = hashFragment(hash, shiftDepth(depth));
                 int bitposition = 1 << selectedHashFragment;
                 // If the key is stored as a data
@@ -133,7 +133,7 @@ public class ImmutableNode<K, V> extends Node<K, V> {
         }
 
         @Override
-        public Node<K, V> putValue(K key, V value, OldValueBox<V> oldValue, ContinousHashProvider<? super K> hashProvider, V defaultValue, int hash, int depth) {
+        public Node<K, V> putValue(K key, V value, OldValueBox<V> oldValue, ContinuousHashProvider<? super K> hashProvider, V defaultValue, int hash, int depth) {
                 int selectedHashFragment = hashFragment(hash, shiftDepth(depth));
                 int bitPosition = 1 << selectedHashFragment;
                 if ((dataMap & bitPosition) != 0) {
@@ -145,7 +145,7 @@ public class ImmutableNode<K, V> extends Node<K, V> {
                                         MutableNode<K, V> mutable = this.toMutable();
                                         return mutable.removeEntry(selectedHashFragment, oldValue);
                                 } else if (value == content[keyIndex + 1]) {
-                                        // dont change
+                                        // don't change
                                         oldValue.setOldValue(value);
                                         return this;
                                 } else {
@@ -155,7 +155,7 @@ public class ImmutableNode<K, V> extends Node<K, V> {
                                 }
                         } else {
                                 if (value == defaultValue) {
-                                        // dont change
+                                        // don't change
                                         oldValue.setOldValue(defaultValue);
                                         return this;
                                 } else {
@@ -339,7 +339,7 @@ public class ImmutableNode<K, V> extends Node<K, V> {
         }
 
         @Override
-        public void checkIntegrity(ContinousHashProvider<? super K> hashProvider, V defaultValue, int depth) {
+        public void checkIntegrity(ContinuousHashProvider<? super K> hashProvider, V defaultValue, int depth) {
                 if (depth > 0) {
                         boolean orphaned = Integer.bitCount(dataMap) == 1 && nodeMap == 0;
                         if (orphaned) {
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/internal/InOrderMapCursor.java b/subprojects/store/src/main/java/tools/refinery/store/map/internal/state/InOrderMapCursor.java
index cb3f366f..7cc91004 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/map/internal/InOrderMapCursor.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/internal/state/InOrderMapCursor.java
@@ -1,9 +1,9 @@
 /*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.map.internal;
+package tools.refinery.store.map.internal.state;
 
 import tools.refinery.store.map.AnyVersionedMap;
 import tools.refinery.store.map.ContentHashCode;
@@ -29,7 +29,7 @@ public class InOrderMapCursor<K, V> implements Cursor<K, V> {
         final VersionedMap<K, V> map;
         final int creationHash;
 
-        public InOrderMapCursor(VersionedMapImpl<K, V> map) {
+        public InOrderMapCursor(VersionedMapStateImpl<K, V> map) {
                 // Initializing tree stack
                 super();
                 this.nodeStack = new ArrayDeque<>();
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/internal/MapCursor.java b/subprojects/store/src/main/java/tools/refinery/store/map/internal/state/MapCursor.java
index d42519b2..0db50d04 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/map/internal/MapCursor.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/internal/state/MapCursor.java
@@ -1,9 +1,9 @@
 /*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.map.internal;
+package tools.refinery.store.map.internal.state;
 
 import tools.refinery.store.map.AnyVersionedMap;
 import tools.refinery.store.map.ContentHashCode;
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/internal/MapDiffCursor.java b/subprojects/store/src/main/java/tools/refinery/store/map/internal/state/MapDiffCursor.java
index fb1d5d2b..083bf8cf 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/map/internal/MapDiffCursor.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/internal/state/MapDiffCursor.java
@@ -1,9 +1,9 @@
 /*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.map.internal;
+package tools.refinery.store.map.internal.state;
 
 import tools.refinery.store.map.AnyVersionedMap;
 import tools.refinery.store.map.Cursor;
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/internal/MutableNode.java b/subprojects/store/src/main/java/tools/refinery/store/map/internal/state/MutableNode.java
index bb85deb9..408ed62c 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/map/internal/MutableNode.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/internal/state/MutableNode.java
@@ -1,11 +1,11 @@
 /*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.map.internal;
+package tools.refinery.store.map.internal.state;
 
-import tools.refinery.store.map.ContinousHashProvider;
+import tools.refinery.store.map.ContinuousHashProvider;
 
 import java.util.Arrays;
 import java.util.Map;
@@ -20,7 +20,7 @@ public class MutableNode<K, V> extends Node<K, V> {
                 invalidateHash();
         }
 
-        public static <K, V> MutableNode<K, V> initialize(K key, V value, ContinousHashProvider<? super K> hashProvider, V defaultValue) {
+        public static <K, V> MutableNode<K, V> initialize(K key, V value, ContinuousHashProvider<? super K> hashProvider, V defaultValue) {
                 if (value == defaultValue) {
                         return null;
                 } else {
@@ -58,7 +58,7 @@ public class MutableNode<K, V> extends Node<K, V> {
         }
 
         @Override
-        public V getValue(K key, ContinousHashProvider<? super K> hashProvider, V defaultValue, int hash, int depth) {
+        public V getValue(K key, ContinuousHashProvider<? super K> hashProvider, V defaultValue, int hash, int depth) {
                 int selectedHashFragment = hashFragment(hash, shiftDepth(depth));
                 @SuppressWarnings("unchecked") K keyCandidate = (K) this.content[2 * selectedHashFragment];
                 if (keyCandidate != null) {
@@ -81,7 +81,7 @@ public class MutableNode<K, V> extends Node<K, V> {
         }
 
         @Override
-        public Node<K, V> putValue(K key, V value, OldValueBox<V> oldValueBox, ContinousHashProvider<? super K> hashProvider, V defaultValue, int hash, int depth) {
+        public Node<K, V> putValue(K key, V value, OldValueBox<V> oldValueBox, ContinuousHashProvider<? super K> hashProvider, V defaultValue, int hash, int depth) {
                 int selectedHashFragment = hashFragment(hash, shiftDepth(depth));
                 @SuppressWarnings("unchecked") K keyCandidate = (K) content[2 * selectedHashFragment];
                 if (keyCandidate != null) {
@@ -217,7 +217,7 @@ public class MutableNode<K, V> extends Node<K, V> {
         }
 
         @SuppressWarnings("unchecked")
-        private Node<K, V> moveDownAndSplit(ContinousHashProvider<? super K> hashProvider, K newKey, V newValue, K previousKey, int hashOfNewKey, int depth, int selectedHashFragmentOfCurrentDepth) {
+        private Node<K, V> moveDownAndSplit(ContinuousHashProvider<? super K> hashProvider, K newKey, V newValue, K previousKey, int hashOfNewKey, int depth, int selectedHashFragmentOfCurrentDepth) {
                 V previousValue = (V) content[2 * selectedHashFragmentOfCurrentDepth + 1];
 
                 MutableNode<K, V> newSubNode = newNodeWithTwoEntries(hashProvider, previousKey, previousValue, hashProvider.getHash(previousKey, hashDepth(depth)), newKey, newValue, hashOfNewKey, incrementDepth(depth));
@@ -230,7 +230,7 @@ public class MutableNode<K, V> extends Node<K, V> {
 
         // Pass everything as parameters for performance.
         @SuppressWarnings("squid:S107")
-        private MutableNode<K, V> newNodeWithTwoEntries(ContinousHashProvider<? super K> hashProvider, K key1, V value1, int oldHash1, K key2, V value2, int oldHash2, int newDepth) {
+        private MutableNode<K, V> newNodeWithTwoEntries(ContinuousHashProvider<? super K> hashProvider, K key1, V value1, int oldHash1, K key2, V value2, int oldHash2, int newDepth) {
                 int newHash1 = newHash(hashProvider, key1, oldHash1, newDepth);
                 int newHash2 = newHash(hashProvider, key2, oldHash2, newDepth);
                 int newFragment1 = hashFragment(newHash1, shiftDepth(newDepth));
@@ -418,7 +418,7 @@ public class MutableNode<K, V> extends Node<K, V> {
         }
 
         @Override
-        public void checkIntegrity(ContinousHashProvider<? super K> hashProvider, V defaultValue, int depth) {
+        public void checkIntegrity(ContinuousHashProvider<? super K> hashProvider, V defaultValue, int depth) {
                 // check for orphan nodes
                 if (depth > 0) {
                         int orphaned = isOrphaned();
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/internal/Node.java b/subprojects/store/src/main/java/tools/refinery/store/map/internal/state/Node.java
index 4b44f760..0ecf2712 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/map/internal/Node.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/internal/state/Node.java
@@ -1,13 +1,13 @@
 /*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.map.internal;
+package tools.refinery.store.map.internal.state;
 
 import java.util.Map;
 
-import tools.refinery.store.map.ContinousHashProvider;
+import tools.refinery.store.map.ContinuousHashProvider;
 
 public abstract class Node<K, V> {
         public static final int BRANCHING_FACTOR_BITS = 5;
@@ -77,14 +77,14 @@ public abstract class Node<K, V> {
          * @param depth The depth.
          * @return The new hash code.
          */
-        protected int newHash(final ContinousHashProvider<? super K> hashProvider, K key, int hash, int depth) {
+        protected int newHash(final ContinuousHashProvider<? super K> hashProvider, K key, int hash, int depth) {
                 final int shiftDepth = shiftDepth(depth);
                 if (shiftDepth == 0) {
                         final int hashDepth = hashDepth(depth);
-                        if (hashDepth >= ContinousHashProvider.MAX_PRACTICAL_DEPTH) {
+                        if (hashDepth >= ContinuousHashProvider.MAX_PRACTICAL_DEPTH) {
                                 throw new IllegalArgumentException(
                                                 "Key " + key + " have the clashing hashcode over the practical depth limitation ("
-                                                                + ContinousHashProvider.MAX_PRACTICAL_DEPTH + ")!");
+                                                                + ContinuousHashProvider.MAX_PRACTICAL_DEPTH + ")!");
                         }
                         return hashProvider.getHash(key, hashDepth);
                 } else {
@@ -92,11 +92,11 @@ public abstract class Node<K, V> {
                 }
         }
 
-        public abstract V getValue(K key, ContinousHashProvider<? super K> hashProvider, V defaultValue, int hash,
+        public abstract V getValue(K key, ContinuousHashProvider<? super K> hashProvider, V defaultValue, int hash,
                                                            int depth);
 
         public abstract Node<K, V> putValue(K key, V value, OldValueBox<V> old,
-                                                                                ContinousHashProvider<? super K> hashProvider, V defaultValue, int hash, int depth);
+                                                                                ContinuousHashProvider<? super K> hashProvider, V defaultValue, int hash, int depth);
 
         public abstract long getSize();
 
@@ -126,6 +126,6 @@ public abstract class Node<K, V> {
                 return stringBuilder.toString();
         }
 
-        public void checkIntegrity(ContinousHashProvider<? super K> hashProvider, V defaultValue, int depth) {
+        public void checkIntegrity(ContinuousHashProvider<? super K> hashProvider, V defaultValue, int depth) {
         }
 }
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/internal/OldValueBox.java b/subprojects/store/src/main/java/tools/refinery/store/map/internal/state/OldValueBox.java
index 354af51d..1b0a4b0c 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/map/internal/OldValueBox.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/internal/state/OldValueBox.java
@@ -1,9 +1,9 @@
 /*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.map.internal;
+package tools.refinery.store.map.internal.state;
 
 public class OldValueBox<V>{
         V oldValue;
@@ -20,5 +20,5 @@ public class OldValueBox<V>{
                 this.oldValue = ouldValue;
                 isSet = true;
         }
-        
+
 }
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/internal/StateBasedVersionedMapStoreFactory.java b/subprojects/store/src/main/java/tools/refinery/store/map/internal/state/StateBasedVersionedMapStoreFactory.java
index 1c3ab27b..9409ace0 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/map/internal/StateBasedVersionedMapStoreFactory.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/internal/state/StateBasedVersionedMapStoreFactory.java
@@ -1,9 +1,9 @@
 /*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.map.internal;
+package tools.refinery.store.map.internal.state;
 
 import tools.refinery.store.map.*;
 
@@ -11,14 +11,14 @@ import java.util.List;
 
 public class StateBasedVersionedMapStoreFactory<K, V> implements VersionedMapStoreFactory<K, V> {
         private final V defaultValue;
-        private final ContinousHashProvider<K> continousHashProvider;
-        private final VersionedMapStoreConfiguration config;
+        private final ContinuousHashProvider<K> continuousHashProvider;
+        private final VersionedMapStoreStateConfiguration config;
 
-        public StateBasedVersionedMapStoreFactory(V defaultValue, Boolean transformToImmutable, VersionedMapStoreFactoryBuilder.SharingStrategy sharingStrategy, ContinousHashProvider<K> continousHashProvider) {
+        public StateBasedVersionedMapStoreFactory(V defaultValue, Boolean transformToImmutable, VersionedMapStoreFactoryBuilder.SharingStrategy sharingStrategy, ContinuousHashProvider<K> continuousHashProvider) {
                 this.defaultValue = defaultValue;
-                this.continousHashProvider = continousHashProvider;
+                this.continuousHashProvider = continuousHashProvider;
 
-                this.config = new VersionedMapStoreConfiguration(
+                this.config = new VersionedMapStoreStateConfiguration(
                                 transformToImmutable,
                                 sharingStrategy == VersionedMapStoreFactoryBuilder.SharingStrategy.SHARED_NODE_CACHE || sharingStrategy == VersionedMapStoreFactoryBuilder.SharingStrategy.SHARED_NODE_CACHE_IN_GROUP,
                                 sharingStrategy == VersionedMapStoreFactoryBuilder.SharingStrategy.SHARED_NODE_CACHE_IN_GROUP);
@@ -26,13 +26,13 @@ public class StateBasedVersionedMapStoreFactory<K, V> implements VersionedMapSto
 
         @Override
         public VersionedMapStore<K, V> createOne() {
-                return new VersionedMapStoreImpl<>(continousHashProvider, defaultValue, config);
+                return new VersionedMapStoreStateImpl<>(continuousHashProvider, defaultValue, config);
 
         }
 
         @Override
         public List<VersionedMapStore<K, V>> createGroup(int amount) {
-                return VersionedMapStoreImpl.createSharedVersionedMapStores(amount, continousHashProvider, defaultValue,
+                return VersionedMapStoreStateImpl.createSharedVersionedMapStores(amount, continuousHashProvider, defaultValue,
                                 config);
         }
 }
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/internal/VersionedMapImpl.java b/subprojects/store/src/main/java/tools/refinery/store/map/internal/state/VersionedMapStateImpl.java
index c107f7e0..817fc70b 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/map/internal/VersionedMapImpl.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/internal/state/VersionedMapStateImpl.java
@@ -1,9 +1,9 @@
 /*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.map.internal;
+package tools.refinery.store.map.internal.state;
 
 import tools.refinery.store.map.*;
 
@@ -19,18 +19,18 @@ import java.util.Objects;
  * @param <V>
  * @author Oszkar Semerath
  */
-public class VersionedMapImpl<K, V> implements VersionedMap<K, V> {
-        protected final VersionedMapStoreImpl<K, V> store;
+public class VersionedMapStateImpl<K, V> implements VersionedMap<K, V> {
+        protected final VersionedMapStoreStateImpl<K, V> store;
 
-        protected final ContinousHashProvider<K> hashProvider;
+        protected final ContinuousHashProvider<K> hashProvider;
         protected final V defaultValue;
         protected Node<K, V> root;
 
         private final OldValueBox<V> oldValueBox = new OldValueBox<>();
 
-        public VersionedMapImpl(
-                        VersionedMapStoreImpl<K, V> store,
-                        ContinousHashProvider<K> hashProvider,
+        public VersionedMapStateImpl(
+                        VersionedMapStoreStateImpl<K, V> store,
+                        ContinuousHashProvider<K> hashProvider,
                         V defaultValue) {
                 this.store = store;
                 this.hashProvider = hashProvider;
@@ -38,9 +38,9 @@ public class VersionedMapImpl<K, V> implements VersionedMap<K, V> {
                 this.root = null;
         }
 
-        public VersionedMapImpl(
-                        VersionedMapStoreImpl<K, V> store,
-                        ContinousHashProvider<K> hashProvider,
+        public VersionedMapStateImpl(
+                        VersionedMapStoreStateImpl<K, V> store,
+                        ContinuousHashProvider<K> hashProvider,
                         V defaultValue, Node<K, V> data) {
                 this.store = store;
                 this.hashProvider = hashProvider;
@@ -53,7 +53,7 @@ public class VersionedMapImpl<K, V> implements VersionedMap<K, V> {
                 return defaultValue;
         }
 
-        public ContinousHashProvider<K> getHashProvider() {
+        public ContinuousHashProvider<K> getHashProvider() {
                 return hashProvider;
         }
 
@@ -117,7 +117,7 @@ public class VersionedMapImpl<K, V> implements VersionedMap<K, V> {
         @Override
         public DiffCursor<K, V> getDiffCursor(long toVersion) {
                 InOrderMapCursor<K, V> fromCursor = new InOrderMapCursor<>(this);
-                VersionedMapImpl<K, V> toMap = (VersionedMapImpl<K, V>) this.store.createMap(toVersion);
+                VersionedMapStateImpl<K, V> toMap = (VersionedMapStateImpl<K, V>) this.store.createMap(toVersion);
                 InOrderMapCursor<K, V> toCursor = new InOrderMapCursor<>(toMap);
                 return new MapDiffCursor<>(this.defaultValue, fromCursor, toCursor);
         }
@@ -166,6 +166,6 @@ public class VersionedMapImpl<K, V> implements VersionedMap<K, V> {
 
         @Override
         public boolean contentEquals(AnyVersionedMap other) {
-                return other instanceof VersionedMapImpl<?, ?> otherImpl && Objects.equals(root, otherImpl.root);
+                return other instanceof VersionedMapStateImpl<?, ?> otherImpl && Objects.equals(root, otherImpl.root);
         }
 }
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/VersionedMapStoreConfiguration.java b/subprojects/store/src/main/java/tools/refinery/store/map/internal/state/VersionedMapStoreStateConfiguration.java
index b00cd961..45f30cc7 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/map/VersionedMapStoreConfiguration.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/internal/state/VersionedMapStoreStateConfiguration.java
@@ -1,17 +1,20 @@
 /*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.map;
+package tools.refinery.store.map.internal.state;
 
-public class VersionedMapStoreConfiguration {
+import tools.refinery.store.map.ContinuousHashProvider;
+import tools.refinery.store.map.VersionedMapStore;
 
-        public VersionedMapStoreConfiguration() {
+public class VersionedMapStoreStateConfiguration {
+
+        public VersionedMapStoreStateConfiguration() {
 
         }
-        public VersionedMapStoreConfiguration(boolean immutableWhenCommitting, boolean sharedNodeCacheInStore,
-                        boolean sharedNodeCacheInStoreGroups) {
+        public VersionedMapStoreStateConfiguration(boolean immutableWhenCommitting, boolean sharedNodeCacheInStore,
+                                                                                           boolean sharedNodeCacheInStoreGroups) {
                 super();
                 this.immutableWhenCommitting = immutableWhenCommitting;
                 this.sharedNodeCacheInStore = sharedNodeCacheInStore;
@@ -42,8 +45,8 @@ public class VersionedMapStoreConfiguration {
 
         /**
          * If true, all sub-nodes are cached within a group of
-         * {@link VersionedMapStoreImpl#createSharedVersionedMapStores(int, ContinousHashProvider, Object, VersionedMapStoreConfiguration)}.
-         * If {@link VersionedMapStoreConfiguration#sharedNodeCacheInStore} is
+         * {@link VersionedMapStoreStateImpl#createSharedVersionedMapStores(int, ContinuousHashProvider, Object, VersionedMapStoreStateConfiguration)}.
+         * If {@link VersionedMapStoreStateConfiguration#sharedNodeCacheInStore} is
          * <code>false</code>, then it has currently no impact.
          */
         private boolean sharedNodeCacheInStoreGroups = true;
diff --git a/subprojects/store/src/main/java/tools/refinery/store/map/VersionedMapStoreImpl.java b/subprojects/store/src/main/java/tools/refinery/store/map/internal/state/VersionedMapStoreStateImpl.java
index a934d59e..0651772a 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/map/VersionedMapStoreImpl.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/map/internal/state/VersionedMapStoreStateImpl.java
@@ -1,20 +1,20 @@
 /*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.store.map;
+package tools.refinery.store.map.internal.state;
 
-import tools.refinery.store.map.internal.*;
+import tools.refinery.store.map.*;
 
 import java.util.*;
 
-public class VersionedMapStoreImpl<K, V> implements VersionedMapStore<K, V> {
+public class VersionedMapStoreStateImpl<K, V> implements VersionedMapStore<K, V> {
         // Configuration
         private final boolean immutableWhenCommitting;
 
         // Static data
-        protected final ContinousHashProvider<K> hashProvider;
+        protected final ContinuousHashProvider<K> hashProvider;
         protected final V defaultValue;
 
         // Dynamic data
@@ -22,8 +22,8 @@ public class VersionedMapStoreImpl<K, V> implements VersionedMapStore<K, V> {
         protected final Map<Node<K, V>, ImmutableNode<K, V>> nodeCache;
         protected long nextID = 0;
 
-        public VersionedMapStoreImpl(ContinousHashProvider<K> hashProvider, V defaultValue,
-                        VersionedMapStoreConfiguration config) {
+        public VersionedMapStoreStateImpl(ContinuousHashProvider<K> hashProvider, V defaultValue,
+                                                                          VersionedMapStoreStateConfiguration config) {
                 this.immutableWhenCommitting = config.isImmutableWhenCommitting();
                 this.hashProvider = hashProvider;
                 this.defaultValue = defaultValue;
@@ -34,21 +34,21 @@ public class VersionedMapStoreImpl<K, V> implements VersionedMapStore<K, V> {
                 }
         }
 
-        private VersionedMapStoreImpl(ContinousHashProvider<K> hashProvider, V defaultValue,
-                        Map<Node<K, V>, ImmutableNode<K, V>> nodeCache, VersionedMapStoreConfiguration config) {
+        private VersionedMapStoreStateImpl(ContinuousHashProvider<K> hashProvider, V defaultValue,
+                                                                           Map<Node<K, V>, ImmutableNode<K, V>> nodeCache, VersionedMapStoreStateConfiguration config) {
                 this.immutableWhenCommitting = config.isImmutableWhenCommitting();
                 this.hashProvider = hashProvider;
                 this.defaultValue = defaultValue;
                 this.nodeCache = nodeCache;
         }
 
-        public VersionedMapStoreImpl(ContinousHashProvider<K> hashProvider, V defaultValue) {
-                this(hashProvider, defaultValue, new VersionedMapStoreConfiguration());
+        public VersionedMapStoreStateImpl(ContinuousHashProvider<K> hashProvider, V defaultValue) {
+                this(hashProvider, defaultValue, new VersionedMapStoreStateConfiguration());
         }
 
         public static <K, V> List<VersionedMapStore<K, V>> createSharedVersionedMapStores(int amount,
-                        ContinousHashProvider<K> hashProvider, V defaultValue,
-                        VersionedMapStoreConfiguration config) {
+                                                                                                                                                                          ContinuousHashProvider<K> hashProvider, V defaultValue,
+                                                                                                                                                                          VersionedMapStoreStateConfiguration config) {
                 List<VersionedMapStore<K, V>> result = new ArrayList<>(amount);
                 if (config.isSharedNodeCacheInStoreGroups()) {
                         Map<Node<K, V>, ImmutableNode<K, V>> nodeCache;
@@ -58,19 +58,19 @@ public class VersionedMapStoreImpl<K, V> implements VersionedMapStore<K, V> {
                                 nodeCache = null;
                         }
                         for (int i = 0; i < amount; i++) {
-                                result.add(new VersionedMapStoreImpl<>(hashProvider, defaultValue, nodeCache, config));
+                                result.add(new VersionedMapStoreStateImpl<>(hashProvider, defaultValue, nodeCache, config));
                         }
                 } else {
                         for (int i = 0; i < amount; i++) {
-                                result.add(new VersionedMapStoreImpl<>(hashProvider, defaultValue, config));
+                                result.add(new VersionedMapStoreStateImpl<>(hashProvider, defaultValue, config));
                         }
                 }
                 return result;
         }
 
         public static <K, V> List<VersionedMapStore<K, V>> createSharedVersionedMapStores(int amount,
-                        ContinousHashProvider<K> hashProvider, V defaultValue) {
-                return createSharedVersionedMapStores(amount, hashProvider, defaultValue, new VersionedMapStoreConfiguration());
+                                                                                                                                                                          ContinuousHashProvider<K> hashProvider, V defaultValue) {
+                return createSharedVersionedMapStores(amount, hashProvider, defaultValue, new VersionedMapStoreStateConfiguration());
         }
 
         @Override
@@ -80,13 +80,13 @@ public class VersionedMapStoreImpl<K, V> implements VersionedMapStore<K, V> {
 
         @Override
         public VersionedMap<K, V> createMap() {
-                return new VersionedMapImpl<>(this, hashProvider, defaultValue);
+                return new VersionedMapStateImpl<>(this, hashProvider, defaultValue);
         }
 
         @Override
         public VersionedMap<K, V> createMap(long state) {
                 ImmutableNode<K, V> data = revert(state);
-                return new VersionedMapImpl<>(this, hashProvider, defaultValue, data);
+                return new VersionedMapStateImpl<>(this, hashProvider, defaultValue, data);
         }
 
         public synchronized ImmutableNode<K, V> revert(long state) {
@@ -100,7 +100,7 @@ public class VersionedMapStoreImpl<K, V> implements VersionedMapStore<K, V> {
                 }
         }
 
-        public synchronized long commit(Node<K, V> data, VersionedMapImpl<K, V> mapToUpdateRoot) {
+        public synchronized long commit(Node<K, V> data, VersionedMapStateImpl<K, V> mapToUpdateRoot) {
                 ImmutableNode<K, V> immutable;
                 if (data != null) {
                         immutable = data.toImmutable(this.nodeCache);
@@ -120,8 +120,8 @@ public class VersionedMapStoreImpl<K, V> implements VersionedMapStore<K, V> {
 
         @Override
         public DiffCursor<K, V> getDiffCursor(long fromState, long toState) {
-                VersionedMapImpl<K, V> map1 = (VersionedMapImpl<K, V>) createMap(fromState);
-                VersionedMapImpl<K, V> map2 = (VersionedMapImpl<K, V>) createMap(toState);
+                VersionedMapStateImpl<K, V> map1 = (VersionedMapStateImpl<K, V>) createMap(fromState);
+                VersionedMapStateImpl<K, V> map2 = (VersionedMapStateImpl<K, V>) createMap(toState);
                 InOrderMapCursor<K, V> cursor1 = new InOrderMapCursor<>(map1);
                 InOrderMapCursor<K, V> cursor2 = new InOrderMapCursor<>(map2);
                 return new MapDiffCursor<>(this.defaultValue, cursor1, cursor2);
diff --git a/subprojects/store/src/main/java/tools/refinery/store/model/TupleHashProvider.java b/subprojects/store/src/main/java/tools/refinery/store/model/TupleHashProvider.java
index fdd4425e..3c94541f 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/model/TupleHashProvider.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/model/TupleHashProvider.java
@@ -5,12 +5,12 @@
  */
 package tools.refinery.store.model;
 
-import tools.refinery.store.map.ContinousHashProvider;
+import tools.refinery.store.map.ContinuousHashProvider;
 import tools.refinery.store.tuple.Tuple;
 import tools.refinery.store.tuple.Tuple1;
 import tools.refinery.store.tuple.Tuple2;
 
-public class TupleHashProvider implements ContinousHashProvider<Tuple> {
+public class TupleHashProvider implements ContinuousHashProvider<Tuple> {
         protected static final int[] primes = new int[] { 2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59,
                         61, 67, 71, 73, 79, 83, 89, 97, 101, 103, 107, 109, 113, 127, 131, 137, 139, 149, 151, 157, 163, 167, 173,
                         179, 181, 191, 193, 197, 199, 211, 223, 227, 229, 233, 239, 241, 251, 257, 263, 269, 271, 277, 281, 283,
diff --git a/subprojects/store/src/main/java/tools/refinery/store/model/TupleHashProviderBitMagic.java b/subprojects/store/src/main/java/tools/refinery/store/model/TupleHashProviderBitMagic.java
deleted file mode 100644
index 14116a90..00000000
--- a/subprojects/store/src/main/java/tools/refinery/store/model/TupleHashProviderBitMagic.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.store.model;
-
-import tools.refinery.store.map.ContinousHashProvider;
-import tools.refinery.store.tuple.Tuple;
-
-public class TupleHashProviderBitMagic implements ContinousHashProvider<Tuple> {
-
-        @Override
-        public int getHash(Tuple key, int index) {
-                if(key.getSize() == 1) {
-                        return key.get(0);
-                }
-
-                int result = 0;
-                final int startBitIndex = index*30;
-                final int finalBitIndex = startBitIndex+30;
-                final int arity = key.getSize();
-
-                for(int i = startBitIndex; i<=finalBitIndex; i++) {
-                        final int selectedKey = key.get(i%arity);
-                        final int selectedPosition = 1<<(i/arity);
-                        if((selectedKey&selectedPosition) != 0) {
-                                result |= 1<<(i%30);
-                        }
-                }
-
-                return result;
-        }
-}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/model/internal/ModelStoreBuilderImpl.java b/subprojects/store/src/main/java/tools/refinery/store/model/internal/ModelStoreBuilderImpl.java
index aafbe130..2cc7b19c 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/model/internal/ModelStoreBuilderImpl.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/model/internal/ModelStoreBuilderImpl.java
@@ -8,10 +8,10 @@ package tools.refinery.store.model.internal;
 import tools.refinery.store.adapter.AdapterUtils;
 import tools.refinery.store.adapter.ModelAdapterBuilder;
 import tools.refinery.store.map.VersionedMapStore;
-import tools.refinery.store.map.VersionedMapStoreImpl;
+import tools.refinery.store.map.VersionedMapStoreFactory;
+import tools.refinery.store.map.VersionedMapStoreFactoryBuilder;
 import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.model.ModelStoreBuilder;
-import tools.refinery.store.model.TupleHashProvider;
 import tools.refinery.store.representation.AnySymbol;
 import tools.refinery.store.representation.Symbol;
 import tools.refinery.store.tuple.Tuple;
@@ -77,8 +77,12 @@ public class ModelStoreBuilderImpl implements ModelStoreBuilder {
         private <T> void createStores(Map<AnySymbol, VersionedMapStore<Tuple, ?>> stores,
                                                                   SymbolEquivalenceClass<T> equivalenceClass, List<AnySymbol> symbols) {
                 int size = symbols.size();
-                var storeGroup = VersionedMapStoreImpl.createSharedVersionedMapStores(size, TupleHashProvider.INSTANCE,
-                                equivalenceClass.defaultValue());
+                VersionedMapStoreFactory<Tuple,T> mapFactory = VersionedMapStore
+                                .<Tuple,T>builder()
+                                .strategy(VersionedMapStoreFactoryBuilder.StoreStrategy.DELTA)
+                                .defaultValue(equivalenceClass.defaultValue())
+                                .build();
+                var storeGroup = mapFactory.createGroup(size);
                 for (int i = 0; i < size; i++) {
                         stores.put(symbols.get(i), storeGroup.get(i));
                 }