chore(store): rename store package

53 files changed, 145 insertions, 144 deletions

diff --git a/store/src/main/java/tools/refinery/data/map/ContinousHashProvider.java b/store/src/main/java/tools/refinery/store/map/ContinousHashProvider.java
index 6a54a3ff..75f1e2ab 100644
--- a/store/src/main/java/tools/refinery/data/map/ContinousHashProvider.java
+++ b/store/src/main/java/tools/refinery/store/map/ContinousHashProvider.java
@@ -1,6 +1,6 @@
-package tools.refinery.data.map;
+package tools.refinery.store.map;
 
-import tools.refinery.data.map.internal.Node;
+import tools.refinery.store.map.internal.Node;
 
 /**
  * A class representing an equivalence relation for a type {@code K} with a
diff --git a/store/src/main/java/tools/refinery/data/map/Cursor.java b/store/src/main/java/tools/refinery/store/map/Cursor.java
index a137e6c1..9c465ddc 100644
--- a/store/src/main/java/tools/refinery/data/map/Cursor.java
+++ b/store/src/main/java/tools/refinery/store/map/Cursor.java
@@ -1,4 +1,4 @@
-package tools.refinery.data.map;
+package tools.refinery.store.map;
 
 import java.util.List;
 
diff --git a/store/src/main/java/tools/refinery/data/map/CursorAsIterator.java b/store/src/main/java/tools/refinery/store/map/CursorAsIterator.java
index 02a49ba1..65ae6648 100644
--- a/store/src/main/java/tools/refinery/data/map/CursorAsIterator.java
+++ b/store/src/main/java/tools/refinery/store/map/CursorAsIterator.java
@@ -1,4 +1,4 @@
-package tools.refinery.data.map;
+package tools.refinery.store.map;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
diff --git a/store/src/main/java/tools/refinery/data/map/DiffCursor.java b/store/src/main/java/tools/refinery/store/map/DiffCursor.java
index 747aa610..701f3ec8 100644
--- a/store/src/main/java/tools/refinery/data/map/DiffCursor.java
+++ b/store/src/main/java/tools/refinery/store/map/DiffCursor.java
@@ -1,4 +1,4 @@
-package tools.refinery.data.map;
+package tools.refinery.store.map;
 
 public interface DiffCursor<K, V> extends Cursor<K,V> {
         public V getFromValue();
diff --git a/store/src/main/java/tools/refinery/data/map/MapAsIterable.java b/store/src/main/java/tools/refinery/store/map/MapAsIterable.java
index 05bdbef2..6b986732 100644
--- a/store/src/main/java/tools/refinery/data/map/MapAsIterable.java
+++ b/store/src/main/java/tools/refinery/store/map/MapAsIterable.java
@@ -1,4 +1,4 @@
-package tools.refinery.data.map;
+package tools.refinery.store.map;
 
 import java.util.Iterator;
 import java.util.function.BiFunction;
diff --git a/store/src/main/java/tools/refinery/data/map/Versioned.java b/store/src/main/java/tools/refinery/store/map/Versioned.java
index eb364b87..6a23e9d5 100644
--- a/store/src/main/java/tools/refinery/data/map/Versioned.java
+++ b/store/src/main/java/tools/refinery/store/map/Versioned.java
@@ -1,4 +1,4 @@
-package tools.refinery.data.map;
+package tools.refinery.store.map;
 
 public interface Versioned {
         public long commit();
diff --git a/store/src/main/java/tools/refinery/data/map/VersionedMap.java b/store/src/main/java/tools/refinery/store/map/VersionedMap.java
index d57e3ee5..a8a64d08 100644
--- a/store/src/main/java/tools/refinery/data/map/VersionedMap.java
+++ b/store/src/main/java/tools/refinery/store/map/VersionedMap.java
@@ -1,4 +1,4 @@
-package tools.refinery.data.map;
+package tools.refinery.store.map;
 
 public interface VersionedMap<K,V> extends Versioned{
         public V get(K key);
diff --git a/store/src/main/java/tools/refinery/data/map/VersionedMapStore.java b/store/src/main/java/tools/refinery/store/map/VersionedMapStore.java
index 029cf9e7..a8d7fb1a 100644
--- a/store/src/main/java/tools/refinery/data/map/VersionedMapStore.java
+++ b/store/src/main/java/tools/refinery/store/map/VersionedMapStore.java
@@ -1,4 +1,4 @@
-package tools.refinery.data.map;
+package tools.refinery.store.map;
 
 import java.util.Set;
 
diff --git a/store/src/main/java/tools/refinery/data/map/VersionedMapStoreConfiguration.java b/store/src/main/java/tools/refinery/store/map/VersionedMapStoreConfiguration.java
index 162ec4ca..723e5ec4 100644
--- a/store/src/main/java/tools/refinery/data/map/VersionedMapStoreConfiguration.java
+++ b/store/src/main/java/tools/refinery/store/map/VersionedMapStoreConfiguration.java
@@ -1,4 +1,4 @@
-package tools.refinery.data.map;
+package tools.refinery.store.map;
 
 public class VersionedMapStoreConfiguration {
         
diff --git a/store/src/main/java/tools/refinery/data/map/VersionedMapStoreImpl.java b/store/src/main/java/tools/refinery/store/map/VersionedMapStoreImpl.java
index c194faf8..a626a5e8 100644
--- a/store/src/main/java/tools/refinery/data/map/VersionedMapStoreImpl.java
+++ b/store/src/main/java/tools/refinery/store/map/VersionedMapStoreImpl.java
@@ -1,4 +1,4 @@
-package tools.refinery.data.map;
+package tools.refinery.store.map;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -9,10 +9,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import tools.refinery.data.map.internal.ImmutableNode;
-import tools.refinery.data.map.internal.MapDiffCursor;
-import tools.refinery.data.map.internal.Node;
-import tools.refinery.data.map.internal.VersionedMapImpl;
+import tools.refinery.store.map.internal.ImmutableNode;
+import tools.refinery.store.map.internal.MapDiffCursor;
+import tools.refinery.store.map.internal.Node;
+import tools.refinery.store.map.internal.VersionedMapImpl;
 
 public class VersionedMapStoreImpl<K, V> implements VersionedMapStore<K, V> {
         // Configuration
diff --git a/store/src/main/java/tools/refinery/data/map/internal/HashClash.java b/store/src/main/java/tools/refinery/store/map/internal/HashClash.java
index 640feb95..5402ed4a 100644
--- a/store/src/main/java/tools/refinery/data/map/internal/HashClash.java
+++ b/store/src/main/java/tools/refinery/store/map/internal/HashClash.java
@@ -1,4 +1,4 @@
-package tools.refinery.data.map.internal;
+package tools.refinery.store.map.internal;
 
 enum HashClash {
         /**
diff --git a/store/src/main/java/tools/refinery/data/map/internal/ImmutableNode.java b/store/src/main/java/tools/refinery/store/map/internal/ImmutableNode.java
index 99e27bb6..f68734ab 100644
--- a/store/src/main/java/tools/refinery/data/map/internal/ImmutableNode.java
+++ b/store/src/main/java/tools/refinery/store/map/internal/ImmutableNode.java
@@ -1,9 +1,9 @@
-package tools.refinery.data.map.internal;
+package tools.refinery.store.map.internal;
 
 import java.util.Arrays;
 import java.util.Map;
 
-import tools.refinery.data.map.ContinousHashProvider;
+import tools.refinery.store.map.ContinousHashProvider;
 
 public class ImmutableNode<K, V> extends Node<K, V> {
         /**
diff --git a/store/src/main/java/tools/refinery/data/map/internal/MapCursor.java b/store/src/main/java/tools/refinery/store/map/internal/MapCursor.java
index 44ed1f45..b90f5b71 100644
--- a/store/src/main/java/tools/refinery/data/map/internal/MapCursor.java
+++ b/store/src/main/java/tools/refinery/store/map/internal/MapCursor.java
@@ -1,12 +1,12 @@
-package tools.refinery.data.map.internal;
+package tools.refinery.store.map.internal;
 
 import java.util.ArrayDeque;
 import java.util.ConcurrentModificationException;
 import java.util.Iterator;
 import java.util.List;
 
-import tools.refinery.data.map.Cursor;
-import tools.refinery.data.map.VersionedMap;
+import tools.refinery.store.map.Cursor;
+import tools.refinery.store.map.VersionedMap;
 
 public class MapCursor<K,V> implements Cursor<K,V> {
         // Constants
diff --git a/store/src/main/java/tools/refinery/data/map/internal/MapDiffCursor.java b/store/src/main/java/tools/refinery/store/map/internal/MapDiffCursor.java
index dcff3c06..42333635 100644
--- a/store/src/main/java/tools/refinery/data/map/internal/MapDiffCursor.java
+++ b/store/src/main/java/tools/refinery/store/map/internal/MapDiffCursor.java
@@ -1,12 +1,12 @@
-package tools.refinery.data.map.internal;
+package tools.refinery.store.map.internal;
 
 import java.util.List;
 import java.util.stream.Stream;
 
-import tools.refinery.data.map.ContinousHashProvider;
-import tools.refinery.data.map.Cursor;
-import tools.refinery.data.map.DiffCursor;
-import tools.refinery.data.map.VersionedMap;
+import tools.refinery.store.map.ContinousHashProvider;
+import tools.refinery.store.map.Cursor;
+import tools.refinery.store.map.DiffCursor;
+import tools.refinery.store.map.VersionedMap;
 
 /**
  * A cursor representing the difference between two states of a map.
diff --git a/store/src/main/java/tools/refinery/data/map/internal/MutableNode.java b/store/src/main/java/tools/refinery/store/map/internal/MutableNode.java
index 5522051a..7e94758c 100644
--- a/store/src/main/java/tools/refinery/data/map/internal/MutableNode.java
+++ b/store/src/main/java/tools/refinery/store/map/internal/MutableNode.java
@@ -1,9 +1,9 @@
-package tools.refinery.data.map.internal;
+package tools.refinery.store.map.internal;
 
 import java.util.Arrays;
 import java.util.Map;
 
-import tools.refinery.data.map.ContinousHashProvider;
+import tools.refinery.store.map.ContinousHashProvider;
 
 public class MutableNode<K, V> extends Node<K, V> {
         int cachedHash;
diff --git a/store/src/main/java/tools/refinery/data/map/internal/Node.java b/store/src/main/java/tools/refinery/store/map/internal/Node.java
index b99275d9..234a4ff3 100644
--- a/store/src/main/java/tools/refinery/data/map/internal/Node.java
+++ b/store/src/main/java/tools/refinery/store/map/internal/Node.java
@@ -1,8 +1,8 @@
-package tools.refinery.data.map.internal;
+package tools.refinery.store.map.internal;
 
 import java.util.Map;
 
-import tools.refinery.data.map.ContinousHashProvider;
+import tools.refinery.store.map.ContinousHashProvider;
 
 public abstract class Node<K,V>{
         public static final int BRANCHING_FACTOR_BITS = 5;
diff --git a/store/src/main/java/tools/refinery/data/map/internal/OldValueBox.java b/store/src/main/java/tools/refinery/store/map/internal/OldValueBox.java
index 641c831b..5534c703 100644
--- a/store/src/main/java/tools/refinery/data/map/internal/OldValueBox.java
+++ b/store/src/main/java/tools/refinery/store/map/internal/OldValueBox.java
@@ -1,4 +1,4 @@
-package tools.refinery.data.map.internal;
+package tools.refinery.store.map.internal;
 
 public class OldValueBox<V>{
         V oldValue;
diff --git a/store/src/main/java/tools/refinery/data/map/internal/VersionedMapImpl.java b/store/src/main/java/tools/refinery/store/map/internal/VersionedMapImpl.java
index 8aa9686f..346fe596 100644
--- a/store/src/main/java/tools/refinery/data/map/internal/VersionedMapImpl.java
+++ b/store/src/main/java/tools/refinery/store/map/internal/VersionedMapImpl.java
@@ -1,14 +1,14 @@
-package tools.refinery.data.map.internal;
+package tools.refinery.store.map.internal;
 
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
-import tools.refinery.data.map.ContinousHashProvider;
-import tools.refinery.data.map.Cursor;
-import tools.refinery.data.map.DiffCursor;
-import tools.refinery.data.map.VersionedMap;
-import tools.refinery.data.map.VersionedMapStoreImpl;
+import tools.refinery.store.map.ContinousHashProvider;
+import tools.refinery.store.map.Cursor;
+import tools.refinery.store.map.DiffCursor;
+import tools.refinery.store.map.VersionedMap;
+import tools.refinery.store.map.VersionedMapStoreImpl;
 
 /**
  * Not threadSafe in itself
diff --git a/store/src/main/java/tools/refinery/data/model/Model.java b/store/src/main/java/tools/refinery/store/model/Model.java
index 2d0b350a..a42d711a 100644
--- a/store/src/main/java/tools/refinery/data/model/Model.java
+++ b/store/src/main/java/tools/refinery/store/model/Model.java
@@ -1,10 +1,10 @@
-package tools.refinery.data.model;
+package tools.refinery.store.model;
 
 import java.util.Set;
 
-import tools.refinery.data.map.Cursor;
-import tools.refinery.data.map.Versioned;
-import tools.refinery.data.model.representation.DataRepresentation;
+import tools.refinery.store.map.Cursor;
+import tools.refinery.store.map.Versioned;
+import tools.refinery.store.model.representation.DataRepresentation;
 
 public interface Model extends Versioned{
         @SuppressWarnings("squid:S1452")
diff --git a/store/src/main/java/tools/refinery/data/model/ModelCursor.java b/store/src/main/java/tools/refinery/store/model/ModelCursor.java
index e3537c7d..a835cf69 100644
--- a/store/src/main/java/tools/refinery/data/model/ModelCursor.java
+++ b/store/src/main/java/tools/refinery/store/model/ModelCursor.java
@@ -1,9 +1,9 @@
-package tools.refinery.data.model;
+package tools.refinery.store.model;
 
 import java.util.Map;
 
-import tools.refinery.data.map.Cursor;
-import tools.refinery.data.model.representation.DataRepresentation;
+import tools.refinery.store.map.Cursor;
+import tools.refinery.store.model.representation.DataRepresentation;
 
 public class ModelCursor {
         final Map<DataRepresentation<?, ?>,Cursor<?,?>> cursors;
diff --git a/store/src/main/java/tools/refinery/data/model/ModelDiffCursor.java b/store/src/main/java/tools/refinery/store/model/ModelDiffCursor.java
index cd3eb316..91990fa6 100644
--- a/store/src/main/java/tools/refinery/data/model/ModelDiffCursor.java
+++ b/store/src/main/java/tools/refinery/store/model/ModelDiffCursor.java
@@ -1,10 +1,10 @@
-package tools.refinery.data.model;
+package tools.refinery.store.model;
 
 import java.util.Map;
 
-import tools.refinery.data.map.Cursor;
-import tools.refinery.data.map.DiffCursor;
-import tools.refinery.data.model.representation.DataRepresentation;
+import tools.refinery.store.map.Cursor;
+import tools.refinery.store.map.DiffCursor;
+import tools.refinery.store.model.representation.DataRepresentation;
 
 public class ModelDiffCursor {
         final Map<DataRepresentation<?, ?>,DiffCursor<?,?>> diffcursors;
diff --git a/store/src/main/java/tools/refinery/data/model/ModelStore.java b/store/src/main/java/tools/refinery/store/model/ModelStore.java
index 03c1bcca..682a0e78 100644
--- a/store/src/main/java/tools/refinery/data/model/ModelStore.java
+++ b/store/src/main/java/tools/refinery/store/model/ModelStore.java
@@ -1,8 +1,8 @@
-package tools.refinery.data.model;
+package tools.refinery.store.model;
 
 import java.util.Set;
 
-import tools.refinery.data.model.representation.DataRepresentation;
+import tools.refinery.store.model.representation.DataRepresentation;
 
 public interface ModelStore {
         @SuppressWarnings("squid:S1452")
diff --git a/store/src/main/java/tools/refinery/data/model/ModelStoreImpl.java b/store/src/main/java/tools/refinery/store/model/ModelStoreImpl.java
index fcad1d99..97406cbb 100644
--- a/store/src/main/java/tools/refinery/data/model/ModelStoreImpl.java
+++ b/store/src/main/java/tools/refinery/store/model/ModelStoreImpl.java
@@ -1,22 +1,23 @@
-package tools.refinery.data.model;
+package tools.refinery.store.model;
 
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.Set;
 
-import tools.refinery.data.map.ContinousHashProvider;
-import tools.refinery.data.map.DiffCursor;
-import tools.refinery.data.map.VersionedMap;
-import tools.refinery.data.map.VersionedMapStore;
-import tools.refinery.data.map.VersionedMapStoreImpl;
-import tools.refinery.data.model.internal.ModelImpl;
-import tools.refinery.data.model.internal.SimilarRelationEquivalenceClass;
-import tools.refinery.data.model.representation.AuxilaryData;
-import tools.refinery.data.model.representation.DataRepresentation;
-import tools.refinery.data.model.representation.Relation;
+import tools.refinery.store.map.ContinousHashProvider;
+import tools.refinery.store.map.DiffCursor;
+import tools.refinery.store.map.VersionedMap;
+import tools.refinery.store.map.VersionedMapStore;
+import tools.refinery.store.map.VersionedMapStoreImpl;
+import tools.refinery.store.model.internal.ModelImpl;
+import tools.refinery.store.model.internal.SimilarRelationEquivalenceClass;
+import tools.refinery.store.model.representation.AuxilaryData;
+import tools.refinery.store.model.representation.DataRepresentation;
+import tools.refinery.store.model.representation.Relation;
+
+import java.util.Set;
 
 public class ModelStoreImpl implements ModelStore {
 
diff --git a/store/src/main/java/tools/refinery/data/model/Tuple.java b/store/src/main/java/tools/refinery/store/model/Tuple.java
index 1bffae9e..0aae3727 100644
--- a/store/src/main/java/tools/refinery/data/model/Tuple.java
+++ b/store/src/main/java/tools/refinery/store/model/Tuple.java
@@ -1,4 +1,4 @@
-package tools.refinery.data.model;
+package tools.refinery.store.model;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/store/src/main/java/tools/refinery/data/model/TupleHashProvider.java b/store/src/main/java/tools/refinery/store/model/TupleHashProvider.java
index d70130e3..7a01311a 100644
--- a/store/src/main/java/tools/refinery/data/model/TupleHashProvider.java
+++ b/store/src/main/java/tools/refinery/store/model/TupleHashProvider.java
@@ -1,6 +1,6 @@
-package tools.refinery.data.model;
+package tools.refinery.store.model;
 
-import tools.refinery.data.map.ContinousHashProvider;
+import tools.refinery.store.map.ContinousHashProvider;
 
 public class TupleHashProvider implements ContinousHashProvider<Tuple> {
         protected static TupleHashProvider instance;
diff --git a/store/src/main/java/tools/refinery/data/model/TupleHashProviderBitMagic.java b/store/src/main/java/tools/refinery/store/model/TupleHashProviderBitMagic.java
index b13b6eca..5b053229 100644
--- a/store/src/main/java/tools/refinery/data/model/TupleHashProviderBitMagic.java
+++ b/store/src/main/java/tools/refinery/store/model/TupleHashProviderBitMagic.java
@@ -1,6 +1,6 @@
-package tools.refinery.data.model;
+package tools.refinery.store.model;
 
-import tools.refinery.data.map.ContinousHashProvider;
+import tools.refinery.store.map.ContinousHashProvider;
 
 public class TupleHashProviderBitMagic implements ContinousHashProvider<Tuple> {
 
diff --git a/store/src/main/java/tools/refinery/data/model/internal/ModelImpl.java b/store/src/main/java/tools/refinery/store/model/internal/ModelImpl.java
index dbf2a000..2a5f2925 100644
--- a/store/src/main/java/tools/refinery/data/model/internal/ModelImpl.java
+++ b/store/src/main/java/tools/refinery/store/model/internal/ModelImpl.java
@@ -1,18 +1,18 @@
-package tools.refinery.data.model.internal;
+package tools.refinery.store.model.internal;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
-import tools.refinery.data.map.ContinousHashProvider;
-import tools.refinery.data.map.Cursor;
-import tools.refinery.data.map.DiffCursor;
-import tools.refinery.data.map.VersionedMap;
-import tools.refinery.data.map.internal.MapDiffCursor;
-import tools.refinery.data.model.Model;
-import tools.refinery.data.model.ModelDiffCursor;
-import tools.refinery.data.model.ModelStore;
-import tools.refinery.data.model.representation.DataRepresentation;
+import tools.refinery.store.map.ContinousHashProvider;
+import tools.refinery.store.map.Cursor;
+import tools.refinery.store.map.DiffCursor;
+import tools.refinery.store.map.VersionedMap;
+import tools.refinery.store.map.internal.MapDiffCursor;
+import tools.refinery.store.model.Model;
+import tools.refinery.store.model.ModelDiffCursor;
+import tools.refinery.store.model.ModelStore;
+import tools.refinery.store.model.representation.DataRepresentation;
 
 public class ModelImpl implements Model {
         private final ModelStore store;
diff --git a/store/src/main/java/tools/refinery/data/model/internal/SimilarRelationEquivalenceClass.java b/store/src/main/java/tools/refinery/store/model/internal/SimilarRelationEquivalenceClass.java
index 7f073c0c..9d1b1dd0 100644
--- a/store/src/main/java/tools/refinery/data/model/internal/SimilarRelationEquivalenceClass.java
+++ b/store/src/main/java/tools/refinery/store/model/internal/SimilarRelationEquivalenceClass.java
@@ -1,10 +1,10 @@
-package tools.refinery.data.model.internal;
+package tools.refinery.store.model.internal;
 
 import java.util.Objects;
 
-import tools.refinery.data.map.ContinousHashProvider;
-import tools.refinery.data.model.Tuple;
-import tools.refinery.data.model.representation.Relation;
+import tools.refinery.store.map.ContinousHashProvider;
+import tools.refinery.store.model.Tuple;
+import tools.refinery.store.model.representation.Relation;
 
 public class SimilarRelationEquivalenceClass {
         final ContinousHashProvider<Tuple> hashProvider;
diff --git a/store/src/main/java/tools/refinery/data/model/representation/AuxilaryData.java b/store/src/main/java/tools/refinery/store/model/representation/AuxilaryData.java
index 9a68506f..ddd8a5f2 100644
--- a/store/src/main/java/tools/refinery/data/model/representation/AuxilaryData.java
+++ b/store/src/main/java/tools/refinery/store/model/representation/AuxilaryData.java
@@ -1,6 +1,6 @@
-package tools.refinery.data.model.representation;
+package tools.refinery.store.model.representation;
 
-import tools.refinery.data.map.ContinousHashProvider;
+import tools.refinery.store.map.ContinousHashProvider;
 
 public class AuxilaryData<K,V> extends DataRepresentation<K, V> {
         private final String name;
diff --git a/store/src/main/java/tools/refinery/data/model/representation/DataRepresentation.java b/store/src/main/java/tools/refinery/store/model/representation/DataRepresentation.java
index c22abdab..585e7b88 100644
--- a/store/src/main/java/tools/refinery/data/model/representation/DataRepresentation.java
+++ b/store/src/main/java/tools/refinery/store/model/representation/DataRepresentation.java
@@ -1,6 +1,6 @@
-package tools.refinery.data.model.representation;
+package tools.refinery.store.model.representation;
 
-import tools.refinery.data.map.ContinousHashProvider;
+import tools.refinery.store.map.ContinousHashProvider;
 
 public abstract class DataRepresentation<K, V> {
         protected final ContinousHashProvider<K> hashProvider;
diff --git a/store/src/main/java/tools/refinery/data/model/representation/Relation.java b/store/src/main/java/tools/refinery/store/model/representation/Relation.java
index 3ae07249..fc2a3185 100644
--- a/store/src/main/java/tools/refinery/data/model/representation/Relation.java
+++ b/store/src/main/java/tools/refinery/store/model/representation/Relation.java
@@ -1,7 +1,7 @@
-package tools.refinery.data.model.representation;
+package tools.refinery.store.model.representation;
 
-import tools.refinery.data.model.Tuple;
-import tools.refinery.data.model.TupleHashProvider;
+import tools.refinery.store.model.Tuple;
+import tools.refinery.store.model.TupleHashProvider;
 
 public class Relation<D> extends DataRepresentation<Tuple, D> {
         private final String name;
diff --git a/store/src/main/java/tools/refinery/data/model/representation/TruthValue.java b/store/src/main/java/tools/refinery/store/model/representation/TruthValue.java
index 795285a6..610713f3 100644
--- a/store/src/main/java/tools/refinery/data/model/representation/TruthValue.java
+++ b/store/src/main/java/tools/refinery/store/model/representation/TruthValue.java
@@ -1,4 +1,4 @@
-package tools.refinery.data.model.representation;
+package tools.refinery.store.model.representation;
 
 public enum TruthValue {
         TRUE("true"),
diff --git a/store/src/main/java/tools/refinery/data/query/RelationalScope.java b/store/src/main/java/tools/refinery/store/query/RelationalScope.java
index d6d6133b..5fe8083a 100644
--- a/store/src/main/java/tools/refinery/data/query/RelationalScope.java
+++ b/store/src/main/java/tools/refinery/store/query/RelationalScope.java
@@ -1,4 +1,4 @@
-package tools.refinery.data.query;
+package tools.refinery.store.query;
 
 import java.util.Set;
 
@@ -8,11 +8,11 @@ import org.eclipse.viatra.query.runtime.api.scope.IEngineContext;
 import org.eclipse.viatra.query.runtime.api.scope.IIndexingErrorListener;
 import org.eclipse.viatra.query.runtime.api.scope.QueryScope;
 
-import tools.refinery.data.model.Model;
-import tools.refinery.data.model.Tuple;
-import tools.refinery.data.query.internal.RelationUpdateListener;
-import tools.refinery.data.query.internal.RelationalEngineContext;
-import tools.refinery.data.query.view.RelationView;
+import tools.refinery.store.model.Model;
+import tools.refinery.store.model.Tuple;
+import tools.refinery.store.query.internal.RelationUpdateListener;
+import tools.refinery.store.query.internal.RelationalEngineContext;
+import tools.refinery.store.query.view.RelationView;
 
 public class RelationalScope extends QueryScope{
         private final Model model;
diff --git a/store/src/main/java/tools/refinery/data/query/building/DNFAnd.java b/store/src/main/java/tools/refinery/store/query/building/DNFAnd.java
index 2de68d38..48dabce2 100644
--- a/store/src/main/java/tools/refinery/data/query/building/DNFAnd.java
+++ b/store/src/main/java/tools/refinery/store/query/building/DNFAnd.java
@@ -1,4 +1,4 @@
-package tools.refinery.data.query.building;
+package tools.refinery.store.query.building;
 
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/store/src/main/java/tools/refinery/data/query/building/DNFAtom.java b/store/src/main/java/tools/refinery/store/query/building/DNFAtom.java
index a91f27b6..b047d7c8 100644
--- a/store/src/main/java/tools/refinery/data/query/building/DNFAtom.java
+++ b/store/src/main/java/tools/refinery/store/query/building/DNFAtom.java
@@ -1,4 +1,4 @@
-package tools.refinery.data.query.building;
+package tools.refinery.store.query.building;
 
 import java.util.Collection;
 import java.util.Iterator;
diff --git a/store/src/main/java/tools/refinery/data/query/building/DNFPredicate.java b/store/src/main/java/tools/refinery/store/query/building/DNFPredicate.java
index b25e5a7d..f0c9ac42 100644
--- a/store/src/main/java/tools/refinery/data/query/building/DNFPredicate.java
+++ b/store/src/main/java/tools/refinery/store/query/building/DNFPredicate.java
@@ -1,4 +1,4 @@
-package tools.refinery.data.query.building;
+package tools.refinery.store.query.building;
 
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/store/src/main/java/tools/refinery/data/query/building/EquivalenceAtom.java b/store/src/main/java/tools/refinery/store/query/building/EquivalenceAtom.java
index b1934391..fede2518 100644
--- a/store/src/main/java/tools/refinery/data/query/building/EquivalenceAtom.java
+++ b/store/src/main/java/tools/refinery/store/query/building/EquivalenceAtom.java
@@ -1,4 +1,4 @@
-package tools.refinery.data.query.building;
+package tools.refinery.store.query.building;
 
 import java.util.Map;
 import java.util.Set;
diff --git a/store/src/main/java/tools/refinery/data/query/building/PredicateAtom.java b/store/src/main/java/tools/refinery/store/query/building/PredicateAtom.java
index e15448dd..42394922 100644
--- a/store/src/main/java/tools/refinery/data/query/building/PredicateAtom.java
+++ b/store/src/main/java/tools/refinery/store/query/building/PredicateAtom.java
@@ -1,4 +1,4 @@
-package tools.refinery.data.query.building;
+package tools.refinery.store.query.building;
 
 import java.util.List;
 import java.util.Map;
diff --git a/store/src/main/java/tools/refinery/data/query/building/PredicateBuilder_string.java b/store/src/main/java/tools/refinery/store/query/building/PredicateBuilder_string.java
index 8e852900..b99407a3 100644
--- a/store/src/main/java/tools/refinery/data/query/building/PredicateBuilder_string.java
+++ b/store/src/main/java/tools/refinery/store/query/building/PredicateBuilder_string.java
@@ -1,11 +1,11 @@
-package tools.refinery.data.query.building;
+package tools.refinery.store.query.building;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 
-import tools.refinery.data.query.view.RelationView;
+import tools.refinery.store.query.view.RelationView;
 
 public class PredicateBuilder_string {
         private PredicateBuilder_string() {}
diff --git a/store/src/main/java/tools/refinery/data/query/building/RelationAtom.java b/store/src/main/java/tools/refinery/store/query/building/RelationAtom.java
index 315122fe..1238f1d7 100644
--- a/store/src/main/java/tools/refinery/data/query/building/RelationAtom.java
+++ b/store/src/main/java/tools/refinery/store/query/building/RelationAtom.java
@@ -1,11 +1,11 @@
-package tools.refinery.data.query.building;
+package tools.refinery.store.query.building;
 
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import tools.refinery.data.query.view.FilteredRelationView;
-import tools.refinery.data.query.view.RelationView;
+import tools.refinery.store.query.view.FilteredRelationView;
+import tools.refinery.store.query.view.RelationView;
 
 public class RelationAtom implements DNFAtom {
         RelationView<?> view;
diff --git a/store/src/main/java/tools/refinery/data/query/building/Variable.java b/store/src/main/java/tools/refinery/store/query/building/Variable.java
index 5c2a2f1e..9ea7ce83 100644
--- a/store/src/main/java/tools/refinery/data/query/building/Variable.java
+++ b/store/src/main/java/tools/refinery/store/query/building/Variable.java
@@ -1,4 +1,4 @@
-package tools.refinery.data.query.building;
+package tools.refinery.store.query.building;
 
 public class Variable {
         private final String name;
diff --git a/store/src/main/java/tools/refinery/data/query/internal/DummyBaseIndexer.java b/store/src/main/java/tools/refinery/store/query/internal/DummyBaseIndexer.java
index f0fb7c95..49637071 100644
--- a/store/src/main/java/tools/refinery/data/query/internal/DummyBaseIndexer.java
+++ b/store/src/main/java/tools/refinery/store/query/internal/DummyBaseIndexer.java
@@ -1,4 +1,4 @@
-package tools.refinery.data.query.internal;
+package tools.refinery.store.query.internal;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.concurrent.Callable;
diff --git a/store/src/main/java/tools/refinery/data/query/internal/PredicateTranslator.java b/store/src/main/java/tools/refinery/store/query/internal/PredicateTranslator.java
index f9b6c17f..6b050182 100644
--- a/store/src/main/java/tools/refinery/data/query/internal/PredicateTranslator.java
+++ b/store/src/main/java/tools/refinery/store/query/internal/PredicateTranslator.java
@@ -1,4 +1,4 @@
-package tools.refinery.data.query.internal;
+package tools.refinery.store.query.internal;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -29,8 +29,8 @@ import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PQuery;
 import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
 
-import tools.refinery.data.query.RelationalScope;
-import tools.refinery.data.query.view.RelationView;
+import tools.refinery.store.query.RelationalScope;
+import tools.refinery.store.query.view.RelationView;
 
 public class PredicateTranslator extends BasePQuery {
 
diff --git a/store/src/main/java/tools/refinery/data/query/internal/RelationUpdateListener.java b/store/src/main/java/tools/refinery/store/query/internal/RelationUpdateListener.java
index a3b319c8..cf5260f6 100644
--- a/store/src/main/java/tools/refinery/data/query/internal/RelationUpdateListener.java
+++ b/store/src/main/java/tools/refinery/store/query/internal/RelationUpdateListener.java
@@ -1,4 +1,4 @@
-package tools.refinery.data.query.internal;
+package tools.refinery.store.query.internal;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -8,8 +8,8 @@ import java.util.Set;
 import org.eclipse.viatra.query.runtime.matchers.context.IQueryRuntimeContextListener;
 import org.eclipse.viatra.query.runtime.matchers.tuple.ITuple;
 
-import tools.refinery.data.model.Tuple;
-import tools.refinery.data.query.view.RelationView;
+import tools.refinery.store.model.Tuple;
+import tools.refinery.store.query.view.RelationView;
 
 public class RelationUpdateListener {
         private final Map<RelationView<?>,Set<RelationUpdateListenerEntry<?>>> view2Listeners;
diff --git a/store/src/main/java/tools/refinery/data/query/internal/RelationUpdateListenerEntry.java b/store/src/main/java/tools/refinery/store/query/internal/RelationUpdateListenerEntry.java
index 45be26b1..860a80b7 100644
--- a/store/src/main/java/tools/refinery/data/query/internal/RelationUpdateListenerEntry.java
+++ b/store/src/main/java/tools/refinery/store/query/internal/RelationUpdateListenerEntry.java
@@ -1,4 +1,4 @@
-package tools.refinery.data.query.internal;
+package tools.refinery.store.query.internal;
 
 import java.util.Arrays;
 import java.util.Objects;
@@ -7,8 +7,8 @@ import org.eclipse.viatra.query.runtime.matchers.context.IQueryRuntimeContextLis
 import org.eclipse.viatra.query.runtime.matchers.tuple.ITuple;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
 
-import tools.refinery.data.model.Tuple;
-import tools.refinery.data.query.view.RelationView;
+import tools.refinery.store.model.Tuple;
+import tools.refinery.store.query.view.RelationView;
 
 public class RelationUpdateListenerEntry<D> {
         final RelationView<D> key;
diff --git a/store/src/main/java/tools/refinery/data/query/internal/RelationalEngineContext.java b/store/src/main/java/tools/refinery/store/query/internal/RelationalEngineContext.java
index 08ab8927..691baf81 100644
--- a/store/src/main/java/tools/refinery/data/query/internal/RelationalEngineContext.java
+++ b/store/src/main/java/tools/refinery/store/query/internal/RelationalEngineContext.java
@@ -1,10 +1,10 @@
-package tools.refinery.data.query.internal;
+package tools.refinery.store.query.internal;
 
 import org.eclipse.viatra.query.runtime.api.scope.IBaseIndex;
 import org.eclipse.viatra.query.runtime.api.scope.IEngineContext;
 import org.eclipse.viatra.query.runtime.matchers.context.IQueryRuntimeContext;
 
-import tools.refinery.data.model.Model;
+import tools.refinery.store.model.Model;
 
 public class RelationalEngineContext implements IEngineContext{
         private final IBaseIndex baseIndex = new DummyBaseIndexer();
diff --git a/store/src/main/java/tools/refinery/data/query/internal/RelationalQueryMetaContext.java b/store/src/main/java/tools/refinery/store/query/internal/RelationalQueryMetaContext.java
index 6226b483..05fb0904 100644
--- a/store/src/main/java/tools/refinery/data/query/internal/RelationalQueryMetaContext.java
+++ b/store/src/main/java/tools/refinery/store/query/internal/RelationalQueryMetaContext.java
@@ -1,4 +1,4 @@
-package tools.refinery.data.query.internal;
+package tools.refinery.store.query.internal;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -11,7 +11,7 @@ import org.eclipse.viatra.query.runtime.matchers.context.AbstractQueryMetaContex
 import org.eclipse.viatra.query.runtime.matchers.context.IInputKey;
 import org.eclipse.viatra.query.runtime.matchers.context.InputKeyImplication;
 
-import tools.refinery.data.query.view.RelationView;
+import tools.refinery.store.query.view.RelationView;
 
 /**
  * The meta context information for String scopes.
diff --git a/store/src/main/java/tools/refinery/data/query/internal/RelationalRuntimeContext.java b/store/src/main/java/tools/refinery/store/query/internal/RelationalRuntimeContext.java
index 8ee185af..da118f26 100644
--- a/store/src/main/java/tools/refinery/data/query/internal/RelationalRuntimeContext.java
+++ b/store/src/main/java/tools/refinery/store/query/internal/RelationalRuntimeContext.java
@@ -1,7 +1,7 @@
-package tools.refinery.data.query.internal;
+package tools.refinery.store.query.internal;
 
-import static tools.refinery.data.util.CollectionsUtil.filter;
-import static tools.refinery.data.util.CollectionsUtil.map;
+import static tools.refinery.store.util.CollectionsUtil.filter;
+import static tools.refinery.store.util.CollectionsUtil.map;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.Iterator;
@@ -20,8 +20,8 @@ import org.eclipse.viatra.query.runtime.matchers.tuple.TupleMask;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
 import org.eclipse.viatra.query.runtime.matchers.util.Accuracy;
 
-import tools.refinery.data.model.Model;
-import tools.refinery.data.query.view.RelationView;
+import tools.refinery.store.model.Model;
+import tools.refinery.store.query.view.RelationView;
 
 public class RelationalRuntimeContext implements IQueryRuntimeContext {
         private final RelationalQueryMetaContext metaContext = new RelationalQueryMetaContext();
diff --git a/store/src/main/java/tools/refinery/data/query/view/FilteredRelationView.java b/store/src/main/java/tools/refinery/store/query/view/FilteredRelationView.java
index b33a47af..2e264c44 100644
--- a/store/src/main/java/tools/refinery/data/query/view/FilteredRelationView.java
+++ b/store/src/main/java/tools/refinery/store/query/view/FilteredRelationView.java
@@ -1,11 +1,11 @@
-package tools.refinery.data.query.view;
+package tools.refinery.store.query.view;
 
 import java.util.function.BiPredicate;
 
-import tools.refinery.data.model.Model;
-import tools.refinery.data.model.Tuple;
-import tools.refinery.data.model.Tuple.Tuple1;
-import tools.refinery.data.model.representation.Relation;
+import tools.refinery.store.model.Model;
+import tools.refinery.store.model.Tuple;
+import tools.refinery.store.model.Tuple.Tuple1;
+import tools.refinery.store.model.representation.Relation;
 
 public class FilteredRelationView<D> extends RelationView<D>{
         private final BiPredicate<Tuple,D> predicate;
diff --git a/store/src/main/java/tools/refinery/data/query/view/FunctionalRelationView.java b/store/src/main/java/tools/refinery/store/query/view/FunctionalRelationView.java
index eaffb389..f54d4428 100644
--- a/store/src/main/java/tools/refinery/data/query/view/FunctionalRelationView.java
+++ b/store/src/main/java/tools/refinery/store/query/view/FunctionalRelationView.java
@@ -1,9 +1,9 @@
-package tools.refinery.data.query.view;
+package tools.refinery.store.query.view;
 
-import tools.refinery.data.model.Model;
-import tools.refinery.data.model.Tuple;
-import tools.refinery.data.model.Tuple.Tuple1;
-import tools.refinery.data.model.representation.Relation;
+import tools.refinery.store.model.Model;
+import tools.refinery.store.model.Tuple;
+import tools.refinery.store.model.Tuple.Tuple1;
+import tools.refinery.store.model.representation.Relation;
 
 public class FunctionalRelationView<D> extends RelationView<D> {
 
diff --git a/store/src/main/java/tools/refinery/data/query/view/KeyOnlyRelationView.java b/store/src/main/java/tools/refinery/store/query/view/KeyOnlyRelationView.java
index 2cc10752..1d1932cc 100644
--- a/store/src/main/java/tools/refinery/data/query/view/KeyOnlyRelationView.java
+++ b/store/src/main/java/tools/refinery/store/query/view/KeyOnlyRelationView.java
@@ -1,7 +1,7 @@
-package tools.refinery.data.query.view;
+package tools.refinery.store.query.view;
 
-import tools.refinery.data.model.Tuple;
-import tools.refinery.data.model.representation.Relation;
+import tools.refinery.store.model.Tuple;
+import tools.refinery.store.model.representation.Relation;
 
 public class KeyOnlyRelationView extends FilteredRelationView<Boolean>{
 
diff --git a/store/src/main/java/tools/refinery/data/query/view/RelationView.java b/store/src/main/java/tools/refinery/store/query/view/RelationView.java
index 10b67221..2c2a37c4 100644
--- a/store/src/main/java/tools/refinery/data/query/view/RelationView.java
+++ b/store/src/main/java/tools/refinery/store/query/view/RelationView.java
@@ -1,13 +1,13 @@
-package tools.refinery.data.query.view;
+package tools.refinery.store.query.view;
 
 import java.util.Objects;
 
 import org.eclipse.viatra.query.runtime.matchers.context.common.BaseInputKeyWrapper;
 
-import tools.refinery.data.map.CursorAsIterator;
-import tools.refinery.data.model.Model;
-import tools.refinery.data.model.Tuple;
-import tools.refinery.data.model.representation.Relation;
+import tools.refinery.store.map.CursorAsIterator;
+import tools.refinery.store.model.Model;
+import tools.refinery.store.model.Tuple;
+import tools.refinery.store.model.representation.Relation;
 
 /**
  * Represents a view of a {@link Relation} that can be queried.
diff --git a/store/src/main/java/tools/refinery/data/util/CollectionsUtil.java b/store/src/main/java/tools/refinery/store/util/CollectionsUtil.java
index bd813b20..841d0dfa 100644
--- a/store/src/main/java/tools/refinery/data/util/CollectionsUtil.java
+++ b/store/src/main/java/tools/refinery/store/util/CollectionsUtil.java
@@ -1,4 +1,4 @@
-package tools.refinery.data.util;
+package tools.refinery.store.util;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;