chore: change package name

71 files changed, 267 insertions, 247 deletions

diff --git a/store/src/jmh/java/org/eclipse/viatra/solver/data/map/benchmarks/ImmutablePutBenchmark.java b/store/src/jmh/java/tools/refinery/data/map/benchmarks/ImmutablePutBenchmark.java
index f0af443f..bc5e056f 100644
--- a/store/src/jmh/java/org/eclipse/viatra/solver/data/map/benchmarks/ImmutablePutBenchmark.java
+++ b/store/src/jmh/java/tools/refinery/data/map/benchmarks/ImmutablePutBenchmark.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.data.map.benchmarks;
+package tools.refinery.data.map.benchmarks;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/store/src/jmh/java/org/eclipse/viatra/solver/data/map/benchmarks/ImmutablePutExecutionPlan.java b/store/src/jmh/java/tools/refinery/data/map/benchmarks/ImmutablePutExecutionPlan.java
index 6cac74af..084381a0 100644
--- a/store/src/jmh/java/org/eclipse/viatra/solver/data/map/benchmarks/ImmutablePutExecutionPlan.java
+++ b/store/src/jmh/java/tools/refinery/data/map/benchmarks/ImmutablePutExecutionPlan.java
@@ -1,12 +1,12 @@
-package org.eclipse.viatra.solver.data.map.benchmarks;
+package tools.refinery.data.map.benchmarks;
 
 import java.util.Random;
 
-import org.eclipse.viatra.solver.data.map.ContinousHashProvider;
-import org.eclipse.viatra.solver.data.map.VersionedMapStore;
-import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl;
-import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl;
-import org.eclipse.viatra.solver.data.map.tests.utils.MapTestEnvironment;
+import tools.refinery.data.map.ContinousHashProvider;
+import tools.refinery.data.map.VersionedMapStore;
+import tools.refinery.data.map.VersionedMapStoreImpl;
+import tools.refinery.data.map.internal.VersionedMapImpl;
+import tools.refinery.data.map.tests.utils.MapTestEnvironment;
 import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.Param;
 import org.openjdk.jmh.annotations.Scope;
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/map/ContinousHashProvider.java b/store/src/main/java/tools/refinery/data/map/ContinousHashProvider.java
index dd64f901..6a54a3ff 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/map/ContinousHashProvider.java
+++ b/store/src/main/java/tools/refinery/data/map/ContinousHashProvider.java
@@ -1,6 +1,6 @@
-package org.eclipse.viatra.solver.data.map;
+package tools.refinery.data.map;
 
-import org.eclipse.viatra.solver.data.map.internal.Node;
+import tools.refinery.data.map.internal.Node;
 
 /**
  * A class representing an equivalence relation for a type {@code K} with a
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/map/Cursor.java b/store/src/main/java/tools/refinery/data/map/Cursor.java
index e45b1f20..a137e6c1 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/map/Cursor.java
+++ b/store/src/main/java/tools/refinery/data/map/Cursor.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.data.map;
+package tools.refinery.data.map;
 
 import java.util.List;
 
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/map/CursorAsIterator.java b/store/src/main/java/tools/refinery/data/map/CursorAsIterator.java
index b29b3119..02a49ba1 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/map/CursorAsIterator.java
+++ b/store/src/main/java/tools/refinery/data/map/CursorAsIterator.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.data.map;
+package tools.refinery.data.map;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/map/DiffCursor.java b/store/src/main/java/tools/refinery/data/map/DiffCursor.java
index f0af1436..747aa610 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/map/DiffCursor.java
+++ b/store/src/main/java/tools/refinery/data/map/DiffCursor.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.data.map;
+package tools.refinery.data.map;
 
 public interface DiffCursor<K, V> extends Cursor<K,V> {
         public V getFromValue();
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/map/MapAsIterable.java b/store/src/main/java/tools/refinery/data/map/MapAsIterable.java
index 22b5e6c1..05bdbef2 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/map/MapAsIterable.java
+++ b/store/src/main/java/tools/refinery/data/map/MapAsIterable.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.data.map;
+package tools.refinery.data.map;
 
 import java.util.Iterator;
 import java.util.function.BiFunction;
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/map/Versioned.java b/store/src/main/java/tools/refinery/data/map/Versioned.java
index e46be237..eb364b87 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/map/Versioned.java
+++ b/store/src/main/java/tools/refinery/data/map/Versioned.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.data.map;
+package tools.refinery.data.map;
 
 public interface Versioned {
         public long commit();
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/map/VersionedMap.java b/store/src/main/java/tools/refinery/data/map/VersionedMap.java
index 3a35b9f0..d57e3ee5 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/map/VersionedMap.java
+++ b/store/src/main/java/tools/refinery/data/map/VersionedMap.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.data.map;
+package tools.refinery.data.map;
 
 public interface VersionedMap<K,V> extends Versioned{
         public V get(K key);
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/map/VersionedMapStore.java b/store/src/main/java/tools/refinery/data/map/VersionedMapStore.java
index 0ff0773f..029cf9e7 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/map/VersionedMapStore.java
+++ b/store/src/main/java/tools/refinery/data/map/VersionedMapStore.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.data.map;
+package tools.refinery.data.map;
 
 import java.util.Set;
 
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/map/VersionedMapStoreConfiguration.java b/store/src/main/java/tools/refinery/data/map/VersionedMapStoreConfiguration.java
index be768e98..162ec4ca 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/map/VersionedMapStoreConfiguration.java
+++ b/store/src/main/java/tools/refinery/data/map/VersionedMapStoreConfiguration.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.data.map;
+package tools.refinery.data.map;
 
 public class VersionedMapStoreConfiguration {
         
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/map/VersionedMapStoreImpl.java b/store/src/main/java/tools/refinery/data/map/VersionedMapStoreImpl.java
index 83d0e8cd..c194faf8 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/map/VersionedMapStoreImpl.java
+++ b/store/src/main/java/tools/refinery/data/map/VersionedMapStoreImpl.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.data.map;
+package tools.refinery.data.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 org.eclipse.viatra.solver.data.map.internal.ImmutableNode;
-import org.eclipse.viatra.solver.data.map.internal.MapDiffCursor;
-import org.eclipse.viatra.solver.data.map.internal.Node;
-import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl;
+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;
 
 public class VersionedMapStoreImpl<K, V> implements VersionedMapStore<K, V> {
         // Configuration
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/map/internal/HashClash.java b/store/src/main/java/tools/refinery/data/map/internal/HashClash.java
index c70fb8b8..640feb95 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/map/internal/HashClash.java
+++ b/store/src/main/java/tools/refinery/data/map/internal/HashClash.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.data.map.internal;
+package tools.refinery.data.map.internal;
 
 enum HashClash {
         /**
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/map/internal/ImmutableNode.java b/store/src/main/java/tools/refinery/data/map/internal/ImmutableNode.java
index b507763f..99e27bb6 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/map/internal/ImmutableNode.java
+++ b/store/src/main/java/tools/refinery/data/map/internal/ImmutableNode.java
@@ -1,9 +1,9 @@
-package org.eclipse.viatra.solver.data.map.internal;
+package tools.refinery.data.map.internal;
 
 import java.util.Arrays;
 import java.util.Map;
 
-import org.eclipse.viatra.solver.data.map.ContinousHashProvider;
+import tools.refinery.data.map.ContinousHashProvider;
 
 public class ImmutableNode<K, V> extends Node<K, V> {
         /**
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/map/internal/MapCursor.java b/store/src/main/java/tools/refinery/data/map/internal/MapCursor.java
index cc5a3982..44ed1f45 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/map/internal/MapCursor.java
+++ b/store/src/main/java/tools/refinery/data/map/internal/MapCursor.java
@@ -1,12 +1,12 @@
-package org.eclipse.viatra.solver.data.map.internal;
+package tools.refinery.data.map.internal;
 
 import java.util.ArrayDeque;
 import java.util.ConcurrentModificationException;
 import java.util.Iterator;
 import java.util.List;
 
-import org.eclipse.viatra.solver.data.map.Cursor;
-import org.eclipse.viatra.solver.data.map.VersionedMap;
+import tools.refinery.data.map.Cursor;
+import tools.refinery.data.map.VersionedMap;
 
 public class MapCursor<K,V> implements Cursor<K,V> {
         // Constants
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/map/internal/MapDiffCursor.java b/store/src/main/java/tools/refinery/data/map/internal/MapDiffCursor.java
index 35d20539..dcff3c06 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/map/internal/MapDiffCursor.java
+++ b/store/src/main/java/tools/refinery/data/map/internal/MapDiffCursor.java
@@ -1,12 +1,12 @@
-package org.eclipse.viatra.solver.data.map.internal;
+package tools.refinery.data.map.internal;
 
 import java.util.List;
 import java.util.stream.Stream;
 
-import org.eclipse.viatra.solver.data.map.ContinousHashProvider;
-import org.eclipse.viatra.solver.data.map.Cursor;
-import org.eclipse.viatra.solver.data.map.DiffCursor;
-import org.eclipse.viatra.solver.data.map.VersionedMap;
+import tools.refinery.data.map.ContinousHashProvider;
+import tools.refinery.data.map.Cursor;
+import tools.refinery.data.map.DiffCursor;
+import tools.refinery.data.map.VersionedMap;
 
 /**
  * A cursor representing the difference between two states of a map.
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/map/internal/MutableNode.java b/store/src/main/java/tools/refinery/data/map/internal/MutableNode.java
index b5fee673..5522051a 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/map/internal/MutableNode.java
+++ b/store/src/main/java/tools/refinery/data/map/internal/MutableNode.java
@@ -1,9 +1,9 @@
-package org.eclipse.viatra.solver.data.map.internal;
+package tools.refinery.data.map.internal;
 
 import java.util.Arrays;
 import java.util.Map;
 
-import org.eclipse.viatra.solver.data.map.ContinousHashProvider;
+import tools.refinery.data.map.ContinousHashProvider;
 
 public class MutableNode<K, V> extends Node<K, V> {
         int cachedHash;
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/map/internal/Node.java b/store/src/main/java/tools/refinery/data/map/internal/Node.java
index d40f980a..b99275d9 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/map/internal/Node.java
+++ b/store/src/main/java/tools/refinery/data/map/internal/Node.java
@@ -1,8 +1,8 @@
-package org.eclipse.viatra.solver.data.map.internal;
+package tools.refinery.data.map.internal;
 
 import java.util.Map;
 
-import org.eclipse.viatra.solver.data.map.ContinousHashProvider;
+import tools.refinery.data.map.ContinousHashProvider;
 
 public abstract class Node<K,V>{
         public static final int BRANCHING_FACTOR_BITS = 5;
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/map/internal/OldValueBox.java b/store/src/main/java/tools/refinery/data/map/internal/OldValueBox.java
index 23502857..641c831b 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/map/internal/OldValueBox.java
+++ b/store/src/main/java/tools/refinery/data/map/internal/OldValueBox.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.data.map.internal;
+package tools.refinery.data.map.internal;
 
 public class OldValueBox<V>{
         V oldValue;
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/map/internal/VersionedMapImpl.java b/store/src/main/java/tools/refinery/data/map/internal/VersionedMapImpl.java
index de41e602..8aa9686f 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/map/internal/VersionedMapImpl.java
+++ b/store/src/main/java/tools/refinery/data/map/internal/VersionedMapImpl.java
@@ -1,14 +1,14 @@
-package org.eclipse.viatra.solver.data.map.internal;
+package tools.refinery.data.map.internal;
 
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.eclipse.viatra.solver.data.map.ContinousHashProvider;
-import org.eclipse.viatra.solver.data.map.Cursor;
-import org.eclipse.viatra.solver.data.map.DiffCursor;
-import org.eclipse.viatra.solver.data.map.VersionedMap;
-import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl;
+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;
 
 /**
  * Not threadSafe in itself
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/model/Model.java b/store/src/main/java/tools/refinery/data/model/Model.java
index 2b21e3e7..2d0b350a 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/model/Model.java
+++ b/store/src/main/java/tools/refinery/data/model/Model.java
@@ -1,10 +1,10 @@
-package org.eclipse.viatra.solver.data.model;
+package tools.refinery.data.model;
 
 import java.util.Set;
 
-import org.eclipse.viatra.solver.data.map.Cursor;
-import org.eclipse.viatra.solver.data.map.Versioned;
-import org.eclipse.viatra.solver.data.model.representation.DataRepresentation;
+import tools.refinery.data.map.Cursor;
+import tools.refinery.data.map.Versioned;
+import tools.refinery.data.model.representation.DataRepresentation;
 
 public interface Model extends Versioned{
         @SuppressWarnings("squid:S1452")
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/model/ModelCursor.java b/store/src/main/java/tools/refinery/data/model/ModelCursor.java
index 3157c9f0..e3537c7d 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/model/ModelCursor.java
+++ b/store/src/main/java/tools/refinery/data/model/ModelCursor.java
@@ -1,9 +1,9 @@
-package org.eclipse.viatra.solver.data.model;
+package tools.refinery.data.model;
 
 import java.util.Map;
 
-import org.eclipse.viatra.solver.data.map.Cursor;
-import org.eclipse.viatra.solver.data.model.representation.DataRepresentation;
+import tools.refinery.data.map.Cursor;
+import tools.refinery.data.model.representation.DataRepresentation;
 
 public class ModelCursor {
         final Map<DataRepresentation<?, ?>,Cursor<?,?>> cursors;
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/model/ModelDiffCursor.java b/store/src/main/java/tools/refinery/data/model/ModelDiffCursor.java
index d3551e47..cd3eb316 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/model/ModelDiffCursor.java
+++ b/store/src/main/java/tools/refinery/data/model/ModelDiffCursor.java
@@ -1,10 +1,10 @@
-package org.eclipse.viatra.solver.data.model;
+package tools.refinery.data.model;
 
 import java.util.Map;
 
-import org.eclipse.viatra.solver.data.map.Cursor;
-import org.eclipse.viatra.solver.data.map.DiffCursor;
-import org.eclipse.viatra.solver.data.model.representation.DataRepresentation;
+import tools.refinery.data.map.Cursor;
+import tools.refinery.data.map.DiffCursor;
+import tools.refinery.data.model.representation.DataRepresentation;
 
 public class ModelDiffCursor {
         final Map<DataRepresentation<?, ?>,DiffCursor<?,?>> diffcursors;
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/model/ModelStore.java b/store/src/main/java/tools/refinery/data/model/ModelStore.java
index 35ac72b5..03c1bcca 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/model/ModelStore.java
+++ b/store/src/main/java/tools/refinery/data/model/ModelStore.java
@@ -1,8 +1,8 @@
-package org.eclipse.viatra.solver.data.model;
+package tools.refinery.data.model;
 
 import java.util.Set;
 
-import org.eclipse.viatra.solver.data.model.representation.DataRepresentation;
+import tools.refinery.data.model.representation.DataRepresentation;
 
 public interface ModelStore {
         @SuppressWarnings("squid:S1452")
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/model/ModelStoreImpl.java b/store/src/main/java/tools/refinery/data/model/ModelStoreImpl.java
index a97fb27a..fcad1d99 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/model/ModelStoreImpl.java
+++ b/store/src/main/java/tools/refinery/data/model/ModelStoreImpl.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.data.model;
+package tools.refinery.data.model;
 
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -7,16 +7,16 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import org.eclipse.viatra.solver.data.map.ContinousHashProvider;
-import org.eclipse.viatra.solver.data.map.DiffCursor;
-import org.eclipse.viatra.solver.data.map.VersionedMap;
-import org.eclipse.viatra.solver.data.map.VersionedMapStore;
-import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl;
-import org.eclipse.viatra.solver.data.model.internal.ModelImpl;
-import org.eclipse.viatra.solver.data.model.internal.SimilarRelationEquivalenceClass;
-import org.eclipse.viatra.solver.data.model.representation.AuxilaryData;
-import org.eclipse.viatra.solver.data.model.representation.DataRepresentation;
-import org.eclipse.viatra.solver.data.model.representation.Relation;
+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;
 
 public class ModelStoreImpl implements ModelStore {
 
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/model/Tuple.java b/store/src/main/java/tools/refinery/data/model/Tuple.java
index ca6548a4..1bffae9e 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/model/Tuple.java
+++ b/store/src/main/java/tools/refinery/data/model/Tuple.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.data.model;
+package tools.refinery.data.model;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/model/TupleHashProvider.java b/store/src/main/java/tools/refinery/data/model/TupleHashProvider.java
index 6c37aa37..d70130e3 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/model/TupleHashProvider.java
+++ b/store/src/main/java/tools/refinery/data/model/TupleHashProvider.java
@@ -1,6 +1,6 @@
-package org.eclipse.viatra.solver.data.model;
+package tools.refinery.data.model;
 
-import org.eclipse.viatra.solver.data.map.ContinousHashProvider;
+import tools.refinery.data.map.ContinousHashProvider;
 
 public class TupleHashProvider implements ContinousHashProvider<Tuple> {
         protected static TupleHashProvider instance;
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/model/TupleHashProviderBitMagic.java b/store/src/main/java/tools/refinery/data/model/TupleHashProviderBitMagic.java
index 2a514d66..b13b6eca 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/model/TupleHashProviderBitMagic.java
+++ b/store/src/main/java/tools/refinery/data/model/TupleHashProviderBitMagic.java
@@ -1,6 +1,6 @@
-package org.eclipse.viatra.solver.data.model;
+package tools.refinery.data.model;
 
-import org.eclipse.viatra.solver.data.map.ContinousHashProvider;
+import tools.refinery.data.map.ContinousHashProvider;
 
 public class TupleHashProviderBitMagic implements ContinousHashProvider<Tuple> {
 
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/model/internal/ModelImpl.java b/store/src/main/java/tools/refinery/data/model/internal/ModelImpl.java
index 6d7f4e97..dbf2a000 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/model/internal/ModelImpl.java
+++ b/store/src/main/java/tools/refinery/data/model/internal/ModelImpl.java
@@ -1,18 +1,18 @@
-package org.eclipse.viatra.solver.data.model.internal;
+package tools.refinery.data.model.internal;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
-import org.eclipse.viatra.solver.data.map.ContinousHashProvider;
-import org.eclipse.viatra.solver.data.map.Cursor;
-import org.eclipse.viatra.solver.data.map.DiffCursor;
-import org.eclipse.viatra.solver.data.map.VersionedMap;
-import org.eclipse.viatra.solver.data.map.internal.MapDiffCursor;
-import org.eclipse.viatra.solver.data.model.Model;
-import org.eclipse.viatra.solver.data.model.ModelDiffCursor;
-import org.eclipse.viatra.solver.data.model.ModelStore;
-import org.eclipse.viatra.solver.data.model.representation.DataRepresentation;
+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;
 
 public class ModelImpl implements Model {
         private final ModelStore store;
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/model/internal/SimilarRelationEquivalenceClass.java b/store/src/main/java/tools/refinery/data/model/internal/SimilarRelationEquivalenceClass.java
index 7054e4db..7f073c0c 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/model/internal/SimilarRelationEquivalenceClass.java
+++ b/store/src/main/java/tools/refinery/data/model/internal/SimilarRelationEquivalenceClass.java
@@ -1,10 +1,10 @@
-package org.eclipse.viatra.solver.data.model.internal;
+package tools.refinery.data.model.internal;
 
 import java.util.Objects;
 
-import org.eclipse.viatra.solver.data.map.ContinousHashProvider;
-import org.eclipse.viatra.solver.data.model.Tuple;
-import org.eclipse.viatra.solver.data.model.representation.Relation;
+import tools.refinery.data.map.ContinousHashProvider;
+import tools.refinery.data.model.Tuple;
+import tools.refinery.data.model.representation.Relation;
 
 public class SimilarRelationEquivalenceClass {
         final ContinousHashProvider<Tuple> hashProvider;
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/model/representation/AuxilaryData.java b/store/src/main/java/tools/refinery/data/model/representation/AuxilaryData.java
index 7fc79348..9a68506f 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/model/representation/AuxilaryData.java
+++ b/store/src/main/java/tools/refinery/data/model/representation/AuxilaryData.java
@@ -1,6 +1,6 @@
-package org.eclipse.viatra.solver.data.model.representation;
+package tools.refinery.data.model.representation;
 
-import org.eclipse.viatra.solver.data.map.ContinousHashProvider;
+import tools.refinery.data.map.ContinousHashProvider;
 
 public class AuxilaryData<K,V> extends DataRepresentation<K, V> {
         private final String name;
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/model/representation/DataRepresentation.java b/store/src/main/java/tools/refinery/data/model/representation/DataRepresentation.java
index fd48eb94..c22abdab 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/model/representation/DataRepresentation.java
+++ b/store/src/main/java/tools/refinery/data/model/representation/DataRepresentation.java
@@ -1,6 +1,6 @@
-package org.eclipse.viatra.solver.data.model.representation;
+package tools.refinery.data.model.representation;
 
-import org.eclipse.viatra.solver.data.map.ContinousHashProvider;
+import tools.refinery.data.map.ContinousHashProvider;
 
 public abstract class DataRepresentation<K, V> {
         protected final ContinousHashProvider<K> hashProvider;
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/model/representation/Relation.java b/store/src/main/java/tools/refinery/data/model/representation/Relation.java
index eafb5c56..3ae07249 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/model/representation/Relation.java
+++ b/store/src/main/java/tools/refinery/data/model/representation/Relation.java
@@ -1,7 +1,7 @@
-package org.eclipse.viatra.solver.data.model.representation;
+package tools.refinery.data.model.representation;
 
-import org.eclipse.viatra.solver.data.model.Tuple;
-import org.eclipse.viatra.solver.data.model.TupleHashProvider;
+import tools.refinery.data.model.Tuple;
+import tools.refinery.data.model.TupleHashProvider;
 
 public class Relation<D> extends DataRepresentation<Tuple, D> {
         private final String name;
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/model/representation/TruthValue.java b/store/src/main/java/tools/refinery/data/model/representation/TruthValue.java
index 049c7eac..795285a6 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/model/representation/TruthValue.java
+++ b/store/src/main/java/tools/refinery/data/model/representation/TruthValue.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.data.model.representation;
+package tools.refinery.data.model.representation;
 
 public enum TruthValue {
         TRUE("true"),
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/query/RelationalScope.java b/store/src/main/java/tools/refinery/data/query/RelationalScope.java
index 97b33935..d6d6133b 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/query/RelationalScope.java
+++ b/store/src/main/java/tools/refinery/data/query/RelationalScope.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.data.query;
+package tools.refinery.data.query;
 
 import java.util.Set;
 
@@ -7,11 +7,12 @@ import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
 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 org.eclipse.viatra.solver.data.model.Model;
-import org.eclipse.viatra.solver.data.model.Tuple;
-import org.eclipse.viatra.solver.data.query.internal.RelationUpdateListener;
-import org.eclipse.viatra.solver.data.query.internal.RelationalEngineContext;
-import org.eclipse.viatra.solver.data.query.view.RelationView;
+
+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;
 
 public class RelationalScope extends QueryScope{
         private final Model model;
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/query/building/DNFAnd.java b/store/src/main/java/tools/refinery/data/query/building/DNFAnd.java
index ff5a7848..2de68d38 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/query/building/DNFAnd.java
+++ b/store/src/main/java/tools/refinery/data/query/building/DNFAnd.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.data.query.building;
+package tools.refinery.data.query.building;
 
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/query/building/DNFAtom.java b/store/src/main/java/tools/refinery/data/query/building/DNFAtom.java
index 05a3e3f8..a91f27b6 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/query/building/DNFAtom.java
+++ b/store/src/main/java/tools/refinery/data/query/building/DNFAtom.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.data.query.building;
+package tools.refinery.data.query.building;
 
 import java.util.Collection;
 import java.util.Iterator;
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/query/building/DNFPredicate.java b/store/src/main/java/tools/refinery/data/query/building/DNFPredicate.java
index 8ee540ae..b25e5a7d 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/query/building/DNFPredicate.java
+++ b/store/src/main/java/tools/refinery/data/query/building/DNFPredicate.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.data.query.building;
+package tools.refinery.data.query.building;
 
 import java.util.HashMap;
 import java.util.HashSet;
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/query/building/EquivalenceAtom.java b/store/src/main/java/tools/refinery/data/query/building/EquivalenceAtom.java
index b47fe2a8..b1934391 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/query/building/EquivalenceAtom.java
+++ b/store/src/main/java/tools/refinery/data/query/building/EquivalenceAtom.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.data.query.building;
+package tools.refinery.data.query.building;
 
 import java.util.Map;
 import java.util.Set;
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/query/building/PredicateAtom.java b/store/src/main/java/tools/refinery/data/query/building/PredicateAtom.java
index 439298d0..e15448dd 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/query/building/PredicateAtom.java
+++ b/store/src/main/java/tools/refinery/data/query/building/PredicateAtom.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.data.query.building;
+package tools.refinery.data.query.building;
 
 import java.util.List;
 import java.util.Map;
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/query/building/PredicateBuilder_string.java b/store/src/main/java/tools/refinery/data/query/building/PredicateBuilder_string.java
index 41f85d39..8e852900 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/query/building/PredicateBuilder_string.java
+++ b/store/src/main/java/tools/refinery/data/query/building/PredicateBuilder_string.java
@@ -1,11 +1,11 @@
-package org.eclipse.viatra.solver.data.query.building;
+package tools.refinery.data.query.building;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 
-import org.eclipse.viatra.solver.data.query.view.RelationView;
+import tools.refinery.data.query.view.RelationView;
 
 public class PredicateBuilder_string {
         private PredicateBuilder_string() {}
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/query/building/RelationAtom.java b/store/src/main/java/tools/refinery/data/query/building/RelationAtom.java
index adf2f8c7..315122fe 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/query/building/RelationAtom.java
+++ b/store/src/main/java/tools/refinery/data/query/building/RelationAtom.java
@@ -1,11 +1,11 @@
-package org.eclipse.viatra.solver.data.query.building;
+package tools.refinery.data.query.building;
 
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.eclipse.viatra.solver.data.query.view.FilteredRelationView;
-import org.eclipse.viatra.solver.data.query.view.RelationView;
+import tools.refinery.data.query.view.FilteredRelationView;
+import tools.refinery.data.query.view.RelationView;
 
 public class RelationAtom implements DNFAtom {
         RelationView<?> view;
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/query/building/Variable.java b/store/src/main/java/tools/refinery/data/query/building/Variable.java
index 29f9fc8b..5c2a2f1e 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/query/building/Variable.java
+++ b/store/src/main/java/tools/refinery/data/query/building/Variable.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.data.query.building;
+package tools.refinery.data.query.building;
 
 public class Variable {
         private final String name;
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/query/internal/DummyBaseIndexer.java b/store/src/main/java/tools/refinery/data/query/internal/DummyBaseIndexer.java
index 042ec3dc..f0fb7c95 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/query/internal/DummyBaseIndexer.java
+++ b/store/src/main/java/tools/refinery/data/query/internal/DummyBaseIndexer.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.data.query.internal;
+package tools.refinery.data.query.internal;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.concurrent.Callable;
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/query/internal/PredicateTranslator.java b/store/src/main/java/tools/refinery/data/query/internal/PredicateTranslator.java
index 54cb4bab..f9b6c17f 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/query/internal/PredicateTranslator.java
+++ b/store/src/main/java/tools/refinery/data/query/internal/PredicateTranslator.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.data.query.internal;
+package tools.refinery.data.query.internal;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -28,8 +28,9 @@ import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;
 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 org.eclipse.viatra.solver.data.query.RelationalScope;
-import org.eclipse.viatra.solver.data.query.view.RelationView;
+
+import tools.refinery.data.query.RelationalScope;
+import tools.refinery.data.query.view.RelationView;
 
 public class PredicateTranslator extends BasePQuery {
 
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/query/internal/RelationUpdateListener.java b/store/src/main/java/tools/refinery/data/query/internal/RelationUpdateListener.java
index c6d12614..a3b319c8 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/query/internal/RelationUpdateListener.java
+++ b/store/src/main/java/tools/refinery/data/query/internal/RelationUpdateListener.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.data.query.internal;
+package tools.refinery.data.query.internal;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -7,8 +7,9 @@ import java.util.Set;
 
 import org.eclipse.viatra.query.runtime.matchers.context.IQueryRuntimeContextListener;
 import org.eclipse.viatra.query.runtime.matchers.tuple.ITuple;
-import org.eclipse.viatra.solver.data.model.Tuple;
-import org.eclipse.viatra.solver.data.query.view.RelationView;
+
+import tools.refinery.data.model.Tuple;
+import tools.refinery.data.query.view.RelationView;
 
 public class RelationUpdateListener {
         private final Map<RelationView<?>,Set<RelationUpdateListenerEntry<?>>> view2Listeners;
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/query/internal/RelationUpdateListenerEntry.java b/store/src/main/java/tools/refinery/data/query/internal/RelationUpdateListenerEntry.java
index 55aed7c8..45be26b1 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/query/internal/RelationUpdateListenerEntry.java
+++ b/store/src/main/java/tools/refinery/data/query/internal/RelationUpdateListenerEntry.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.data.query.internal;
+package tools.refinery.data.query.internal;
 
 import java.util.Arrays;
 import java.util.Objects;
@@ -6,8 +6,9 @@ import java.util.Objects;
 import org.eclipse.viatra.query.runtime.matchers.context.IQueryRuntimeContextListener;
 import org.eclipse.viatra.query.runtime.matchers.tuple.ITuple;
 import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;
-import org.eclipse.viatra.solver.data.model.Tuple;
-import org.eclipse.viatra.solver.data.query.view.RelationView;
+
+import tools.refinery.data.model.Tuple;
+import tools.refinery.data.query.view.RelationView;
 
 public class RelationUpdateListenerEntry<D> {
         final RelationView<D> key;
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/query/internal/RelationalEngineContext.java b/store/src/main/java/tools/refinery/data/query/internal/RelationalEngineContext.java
index 01948828..08ab8927 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/query/internal/RelationalEngineContext.java
+++ b/store/src/main/java/tools/refinery/data/query/internal/RelationalEngineContext.java
@@ -1,9 +1,10 @@
-package org.eclipse.viatra.solver.data.query.internal;
+package tools.refinery.data.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 org.eclipse.viatra.solver.data.model.Model;
+
+import tools.refinery.data.model.Model;
 
 public class RelationalEngineContext implements IEngineContext{
         private final IBaseIndex baseIndex = new DummyBaseIndexer();
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/query/internal/RelationalQueryMetaContext.java b/store/src/main/java/tools/refinery/data/query/internal/RelationalQueryMetaContext.java
index de500fc9..6226b483 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/query/internal/RelationalQueryMetaContext.java
+++ b/store/src/main/java/tools/refinery/data/query/internal/RelationalQueryMetaContext.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.data.query.internal;
+package tools.refinery.data.query.internal;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -10,7 +10,8 @@ import java.util.Set;
 import org.eclipse.viatra.query.runtime.matchers.context.AbstractQueryMetaContext;
 import org.eclipse.viatra.query.runtime.matchers.context.IInputKey;
 import org.eclipse.viatra.query.runtime.matchers.context.InputKeyImplication;
-import org.eclipse.viatra.solver.data.query.view.RelationView;
+
+import tools.refinery.data.query.view.RelationView;
 
 /**
  * The meta context information for String scopes.
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/query/internal/RelationalRuntimeContext.java b/store/src/main/java/tools/refinery/data/query/internal/RelationalRuntimeContext.java
index fa6a59ab..8ee185af 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/query/internal/RelationalRuntimeContext.java
+++ b/store/src/main/java/tools/refinery/data/query/internal/RelationalRuntimeContext.java
@@ -1,7 +1,7 @@
-package org.eclipse.viatra.solver.data.query.internal;
+package tools.refinery.data.query.internal;
 
-import static org.eclipse.viatra.solver.data.util.CollectionsUtil.filter;
-import static org.eclipse.viatra.solver.data.util.CollectionsUtil.map;
+import static tools.refinery.data.util.CollectionsUtil.filter;
+import static tools.refinery.data.util.CollectionsUtil.map;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.Iterator;
@@ -19,8 +19,9 @@ import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;
 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 org.eclipse.viatra.solver.data.model.Model;
-import org.eclipse.viatra.solver.data.query.view.RelationView;
+
+import tools.refinery.data.model.Model;
+import tools.refinery.data.query.view.RelationView;
 
 public class RelationalRuntimeContext implements IQueryRuntimeContext {
         private final RelationalQueryMetaContext metaContext = new RelationalQueryMetaContext();
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/query/view/FilteredRelationView.java b/store/src/main/java/tools/refinery/data/query/view/FilteredRelationView.java
index edc534b7..b33a47af 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/query/view/FilteredRelationView.java
+++ b/store/src/main/java/tools/refinery/data/query/view/FilteredRelationView.java
@@ -1,11 +1,11 @@
-package org.eclipse.viatra.solver.data.query.view;
+package tools.refinery.data.query.view;
 
 import java.util.function.BiPredicate;
 
-import org.eclipse.viatra.solver.data.model.Model;
-import org.eclipse.viatra.solver.data.model.Tuple;
-import org.eclipse.viatra.solver.data.model.Tuple.Tuple1;
-import org.eclipse.viatra.solver.data.model.representation.Relation;
+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;
 
 public class FilteredRelationView<D> extends RelationView<D>{
         private final BiPredicate<Tuple,D> predicate;
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/query/view/FunctionalRelationView.java b/store/src/main/java/tools/refinery/data/query/view/FunctionalRelationView.java
index 4aa7cfd0..eaffb389 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/query/view/FunctionalRelationView.java
+++ b/store/src/main/java/tools/refinery/data/query/view/FunctionalRelationView.java
@@ -1,9 +1,9 @@
-package org.eclipse.viatra.solver.data.query.view;
+package tools.refinery.data.query.view;
 
-import org.eclipse.viatra.solver.data.model.Model;
-import org.eclipse.viatra.solver.data.model.Tuple;
-import org.eclipse.viatra.solver.data.model.Tuple.Tuple1;
-import org.eclipse.viatra.solver.data.model.representation.Relation;
+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;
 
 public class FunctionalRelationView<D> extends RelationView<D> {
 
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/query/view/KeyOnlyRelationView.java b/store/src/main/java/tools/refinery/data/query/view/KeyOnlyRelationView.java
index 11a24fc8..2cc10752 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/query/view/KeyOnlyRelationView.java
+++ b/store/src/main/java/tools/refinery/data/query/view/KeyOnlyRelationView.java
@@ -1,7 +1,7 @@
-package org.eclipse.viatra.solver.data.query.view;
+package tools.refinery.data.query.view;
 
-import org.eclipse.viatra.solver.data.model.Tuple;
-import org.eclipse.viatra.solver.data.model.representation.Relation;
+import tools.refinery.data.model.Tuple;
+import tools.refinery.data.model.representation.Relation;
 
 public class KeyOnlyRelationView extends FilteredRelationView<Boolean>{
 
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/query/view/RelationView.java b/store/src/main/java/tools/refinery/data/query/view/RelationView.java
index c5bc5228..10b67221 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/query/view/RelationView.java
+++ b/store/src/main/java/tools/refinery/data/query/view/RelationView.java
@@ -1,12 +1,13 @@
-package org.eclipse.viatra.solver.data.query.view;
+package tools.refinery.data.query.view;
 
 import java.util.Objects;
 
 import org.eclipse.viatra.query.runtime.matchers.context.common.BaseInputKeyWrapper;
-import org.eclipse.viatra.solver.data.map.CursorAsIterator;
-import org.eclipse.viatra.solver.data.model.Model;
-import org.eclipse.viatra.solver.data.model.Tuple;
-import org.eclipse.viatra.solver.data.model.representation.Relation;
+
+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;
 
 /**
  * Represents a view of a {@link Relation} that can be queried.
diff --git a/store/src/main/java/org/eclipse/viatra/solver/data/util/CollectionsUtil.java b/store/src/main/java/tools/refinery/data/util/CollectionsUtil.java
index 21b0a9df..bd813b20 100644
--- a/store/src/main/java/org/eclipse/viatra/solver/data/util/CollectionsUtil.java
+++ b/store/src/main/java/tools/refinery/data/util/CollectionsUtil.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.data.util;
+package tools.refinery.data.util;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
diff --git a/store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/CommitFuzzTest.java b/store/src/test/java/tools/refinery/data/map/tests/fuzz/CommitFuzzTest.java
index e160df2b..d744a79d 100644
--- a/store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/CommitFuzzTest.java
+++ b/store/src/test/java/tools/refinery/data/map/tests/fuzz/CommitFuzzTest.java
@@ -1,22 +1,23 @@
-package org.eclipse.viatra.solver.data.map.tests.fuzz;
+package tools.refinery.data.map.tests.fuzz;
 
 import static org.junit.jupiter.api.Assertions.fail;
 
 import java.util.Random;
 import java.util.stream.Stream;
 
-import org.eclipse.viatra.solver.data.map.ContinousHashProvider;
-import org.eclipse.viatra.solver.data.map.VersionedMapStore;
-import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl;
-import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl;
-import org.eclipse.viatra.solver.data.map.tests.fuzz.utils.FuzzTestUtils;
-import org.eclipse.viatra.solver.data.map.tests.utils.MapTestEnvironment;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Timeout;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
+import tools.refinery.data.map.ContinousHashProvider;
+import tools.refinery.data.map.VersionedMapStore;
+import tools.refinery.data.map.VersionedMapStoreImpl;
+import tools.refinery.data.map.internal.VersionedMapImpl;
+import tools.refinery.data.map.tests.fuzz.utils.FuzzTestUtils;
+import tools.refinery.data.map.tests.utils.MapTestEnvironment;
+
 class CommitFuzzTest {
         private void runFuzzTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency,
                         boolean evilHash) {
diff --git a/store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/ContentEqualsFuzzTest.java b/store/src/test/java/tools/refinery/data/map/tests/fuzz/ContentEqualsFuzzTest.java
index 5004c152..1f6f9609 100644
--- a/store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/ContentEqualsFuzzTest.java
+++ b/store/src/test/java/tools/refinery/data/map/tests/fuzz/ContentEqualsFuzzTest.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.data.map.tests.fuzz;
+package tools.refinery.data.map.tests.fuzz;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
@@ -10,20 +10,21 @@ import java.util.List;
 import java.util.Random;
 import java.util.stream.Stream;
 
-import org.eclipse.viatra.solver.data.map.ContinousHashProvider;
-import org.eclipse.viatra.solver.data.map.Cursor;
-import org.eclipse.viatra.solver.data.map.VersionedMap;
-import org.eclipse.viatra.solver.data.map.VersionedMapStore;
-import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl;
-import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl;
-import org.eclipse.viatra.solver.data.map.tests.fuzz.utils.FuzzTestUtils;
-import org.eclipse.viatra.solver.data.map.tests.utils.MapTestEnvironment;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Timeout;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
+import tools.refinery.data.map.ContinousHashProvider;
+import tools.refinery.data.map.Cursor;
+import tools.refinery.data.map.VersionedMap;
+import tools.refinery.data.map.VersionedMapStore;
+import tools.refinery.data.map.VersionedMapStoreImpl;
+import tools.refinery.data.map.internal.VersionedMapImpl;
+import tools.refinery.data.map.tests.fuzz.utils.FuzzTestUtils;
+import tools.refinery.data.map.tests.utils.MapTestEnvironment;
+
 class ContentEqualsFuzzTest {
         private void runFuzzTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency,
                         boolean evilHash) {
diff --git a/store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/DiffCursorFuzzTest.java b/store/src/test/java/tools/refinery/data/map/tests/fuzz/DiffCursorFuzzTest.java
index 4b79a98a..fd663a7c 100644
--- a/store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/DiffCursorFuzzTest.java
+++ b/store/src/test/java/tools/refinery/data/map/tests/fuzz/DiffCursorFuzzTest.java
@@ -1,23 +1,24 @@
-package org.eclipse.viatra.solver.data.map.tests.fuzz;
+package tools.refinery.data.map.tests.fuzz;
 
 import static org.junit.jupiter.api.Assertions.fail;
 
 import java.util.Random;
 import java.util.stream.Stream;
 
-import org.eclipse.viatra.solver.data.map.ContinousHashProvider;
-import org.eclipse.viatra.solver.data.map.DiffCursor;
-import org.eclipse.viatra.solver.data.map.VersionedMapStore;
-import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl;
-import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl;
-import org.eclipse.viatra.solver.data.map.tests.fuzz.utils.FuzzTestUtils;
-import org.eclipse.viatra.solver.data.map.tests.utils.MapTestEnvironment;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Timeout;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
+import tools.refinery.data.map.ContinousHashProvider;
+import tools.refinery.data.map.DiffCursor;
+import tools.refinery.data.map.VersionedMapStore;
+import tools.refinery.data.map.VersionedMapStoreImpl;
+import tools.refinery.data.map.internal.VersionedMapImpl;
+import tools.refinery.data.map.tests.fuzz.utils.FuzzTestUtils;
+import tools.refinery.data.map.tests.utils.MapTestEnvironment;
+
 class DiffCursorFuzzTest {
         private void runFuzzTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency,
                         boolean evilHash) {
diff --git a/store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/MultiThreadFuzzTest.java b/store/src/test/java/tools/refinery/data/map/tests/fuzz/MultiThreadFuzzTest.java
index c3a3e8ea..e6af13bf 100644
--- a/store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/MultiThreadFuzzTest.java
+++ b/store/src/test/java/tools/refinery/data/map/tests/fuzz/MultiThreadFuzzTest.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.data.map.tests.fuzz;
+package tools.refinery.data.map.tests.fuzz;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
@@ -8,17 +8,18 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.stream.Stream;
 
-import org.eclipse.viatra.solver.data.map.ContinousHashProvider;
-import org.eclipse.viatra.solver.data.map.VersionedMapStore;
-import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl;
-import org.eclipse.viatra.solver.data.map.tests.fuzz.utils.FuzzTestUtils;
-import org.eclipse.viatra.solver.data.map.tests.utils.MapTestEnvironment;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Timeout;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
+import tools.refinery.data.map.ContinousHashProvider;
+import tools.refinery.data.map.VersionedMapStore;
+import tools.refinery.data.map.VersionedMapStoreImpl;
+import tools.refinery.data.map.tests.fuzz.utils.FuzzTestUtils;
+import tools.refinery.data.map.tests.utils.MapTestEnvironment;
+
 class MultiThreadFuzzTest {
         public static final int noThreads = 32;
         
diff --git a/store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/MultiThreadTestRunnable.java b/store/src/test/java/tools/refinery/data/map/tests/fuzz/MultiThreadTestRunnable.java
index a18298a2..922178c6 100644
--- a/store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/MultiThreadTestRunnable.java
+++ b/store/src/test/java/tools/refinery/data/map/tests/fuzz/MultiThreadTestRunnable.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.data.map.tests.fuzz;
+package tools.refinery.data.map.tests.fuzz;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -8,9 +8,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Random;
 
-import org.eclipse.viatra.solver.data.map.VersionedMapStore;
-import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl;
-import org.eclipse.viatra.solver.data.map.tests.utils.MapTestEnvironment;
+import tools.refinery.data.map.VersionedMapStore;
+import tools.refinery.data.map.internal.VersionedMapImpl;
+import tools.refinery.data.map.tests.utils.MapTestEnvironment;
 
 public class MultiThreadTestRunnable implements Runnable {
         String scenario;
diff --git a/store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/MutableFuzzTest.java b/store/src/test/java/tools/refinery/data/map/tests/fuzz/MutableFuzzTest.java
index 2d589dc9..a16cb8f5 100644
--- a/store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/MutableFuzzTest.java
+++ b/store/src/test/java/tools/refinery/data/map/tests/fuzz/MutableFuzzTest.java
@@ -1,22 +1,23 @@
-package org.eclipse.viatra.solver.data.map.tests.fuzz;
+package tools.refinery.data.map.tests.fuzz;
 
 import static org.junit.jupiter.api.Assertions.fail;
 
 import java.util.Random;
 import java.util.stream.Stream;
 
-import org.eclipse.viatra.solver.data.map.ContinousHashProvider;
-import org.eclipse.viatra.solver.data.map.VersionedMapStore;
-import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl;
-import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl;
-import org.eclipse.viatra.solver.data.map.tests.fuzz.utils.FuzzTestUtils;
-import org.eclipse.viatra.solver.data.map.tests.utils.MapTestEnvironment;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Timeout;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
+import tools.refinery.data.map.ContinousHashProvider;
+import tools.refinery.data.map.VersionedMapStore;
+import tools.refinery.data.map.VersionedMapStoreImpl;
+import tools.refinery.data.map.internal.VersionedMapImpl;
+import tools.refinery.data.map.tests.fuzz.utils.FuzzTestUtils;
+import tools.refinery.data.map.tests.utils.MapTestEnvironment;
+
 class MutableFuzzTest {
         private void runFuzzTest(String scenario, int seed, int steps, int maxKey, int maxValue, boolean evilHash) {
                 String[] values = MapTestEnvironment.prepareValues(maxValue);
diff --git a/store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/MutableImmutableCompareFuzzTest.java b/store/src/test/java/tools/refinery/data/map/tests/fuzz/MutableImmutableCompareFuzzTest.java
index cc2abfe4..45308892 100644
--- a/store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/MutableImmutableCompareFuzzTest.java
+++ b/store/src/test/java/tools/refinery/data/map/tests/fuzz/MutableImmutableCompareFuzzTest.java
@@ -1,22 +1,23 @@
-package org.eclipse.viatra.solver.data.map.tests.fuzz;
+package tools.refinery.data.map.tests.fuzz;
 
 import static org.junit.jupiter.api.Assertions.fail;
 
 import java.util.Random;
 import java.util.stream.Stream;
 
-import org.eclipse.viatra.solver.data.map.ContinousHashProvider;
-import org.eclipse.viatra.solver.data.map.VersionedMapStore;
-import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl;
-import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl;
-import org.eclipse.viatra.solver.data.map.tests.fuzz.utils.FuzzTestUtils;
-import org.eclipse.viatra.solver.data.map.tests.utils.MapTestEnvironment;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Timeout;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
+import tools.refinery.data.map.ContinousHashProvider;
+import tools.refinery.data.map.VersionedMapStore;
+import tools.refinery.data.map.VersionedMapStoreImpl;
+import tools.refinery.data.map.internal.VersionedMapImpl;
+import tools.refinery.data.map.tests.fuzz.utils.FuzzTestUtils;
+import tools.refinery.data.map.tests.utils.MapTestEnvironment;
+
 class MutableImmutableCompareFuzzTest {
         private void runFuzzTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency,
                         boolean evilHash) {
diff --git a/store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/RestoreFuzzTest.java b/store/src/test/java/tools/refinery/data/map/tests/fuzz/RestoreFuzzTest.java
index 7d9f5372..1b8b38c4 100644
--- a/store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/RestoreFuzzTest.java
+++ b/store/src/test/java/tools/refinery/data/map/tests/fuzz/RestoreFuzzTest.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.data.map.tests.fuzz;
+package tools.refinery.data.map.tests.fuzz;
 
 import static org.junit.jupiter.api.Assertions.fail;
 
@@ -7,18 +7,19 @@ import java.util.Map;
 import java.util.Random;
 import java.util.stream.Stream;
 
-import org.eclipse.viatra.solver.data.map.ContinousHashProvider;
-import org.eclipse.viatra.solver.data.map.VersionedMapStore;
-import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl;
-import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl;
-import org.eclipse.viatra.solver.data.map.tests.fuzz.utils.FuzzTestUtils;
-import org.eclipse.viatra.solver.data.map.tests.utils.MapTestEnvironment;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Timeout;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
+import tools.refinery.data.map.ContinousHashProvider;
+import tools.refinery.data.map.VersionedMapStore;
+import tools.refinery.data.map.VersionedMapStoreImpl;
+import tools.refinery.data.map.internal.VersionedMapImpl;
+import tools.refinery.data.map.tests.fuzz.utils.FuzzTestUtils;
+import tools.refinery.data.map.tests.utils.MapTestEnvironment;
+
 class RestoreFuzzTest {
         private void runFuzzTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency,
                         boolean evilHash) {
diff --git a/store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/SharedStoreFuzzTest.java b/store/src/test/java/tools/refinery/data/map/tests/fuzz/SharedStoreFuzzTest.java
index 800308b4..1703a732 100644
--- a/store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/SharedStoreFuzzTest.java
+++ b/store/src/test/java/tools/refinery/data/map/tests/fuzz/SharedStoreFuzzTest.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.data.map.tests.fuzz;
+package tools.refinery.data.map.tests.fuzz;
 
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -7,18 +7,19 @@ import java.util.Map;
 import java.util.Random;
 import java.util.stream.Stream;
 
-import org.eclipse.viatra.solver.data.map.ContinousHashProvider;
-import org.eclipse.viatra.solver.data.map.VersionedMapStore;
-import org.eclipse.viatra.solver.data.map.VersionedMapStoreImpl;
-import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl;
-import org.eclipse.viatra.solver.data.map.tests.fuzz.utils.FuzzTestUtils;
-import org.eclipse.viatra.solver.data.map.tests.utils.MapTestEnvironment;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Timeout;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
+import tools.refinery.data.map.ContinousHashProvider;
+import tools.refinery.data.map.VersionedMapStore;
+import tools.refinery.data.map.VersionedMapStoreImpl;
+import tools.refinery.data.map.internal.VersionedMapImpl;
+import tools.refinery.data.map.tests.fuzz.utils.FuzzTestUtils;
+import tools.refinery.data.map.tests.utils.MapTestEnvironment;
+
 class SharedStoreFuzzTest {
         private void runFuzzTest(String scenario, int seed, int steps, int maxKey, int maxValue, int commitFrequency,
                         boolean evilHash) {
diff --git a/store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/utils/FuzzTestUtils.java b/store/src/test/java/tools/refinery/data/map/tests/fuzz/utils/FuzzTestUtils.java
index ec21bb7b..23df4aef 100644
--- a/store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/utils/FuzzTestUtils.java
+++ b/store/src/test/java/tools/refinery/data/map/tests/fuzz/utils/FuzzTestUtils.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.data.map.tests.fuzz.utils;
+package tools.refinery.data.map.tests.fuzz.utils;
 
 import java.util.Arrays;
 import java.util.LinkedList;
diff --git a/store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/utils/FuzzTestUtilsTest.java b/store/src/test/java/tools/refinery/data/map/tests/fuzz/utils/FuzzTestUtilsTest.java
index 3f4214bc..abf8be3c 100644
--- a/store/src/test/java/org/eclipse/viatra/solver/data/map/tests/fuzz/utils/FuzzTestUtilsTest.java
+++ b/store/src/test/java/tools/refinery/data/map/tests/fuzz/utils/FuzzTestUtilsTest.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.data.map.tests.fuzz.utils;
+package tools.refinery.data.map.tests.fuzz.utils;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/store/src/test/java/org/eclipse/viatra/solver/data/map/tests/utils/MapTestEnvironment.java b/store/src/test/java/tools/refinery/data/map/tests/utils/MapTestEnvironment.java
index 4c043350..e1cfc2e2 100644
--- a/store/src/test/java/org/eclipse/viatra/solver/data/map/tests/utils/MapTestEnvironment.java
+++ b/store/src/test/java/tools/refinery/data/map/tests/utils/MapTestEnvironment.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.data.map.tests.utils;
+package tools.refinery.data.map.tests.utils;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -11,10 +11,10 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.TreeMap;
 
-import org.eclipse.viatra.solver.data.map.ContinousHashProvider;
-import org.eclipse.viatra.solver.data.map.Cursor;
-import org.eclipse.viatra.solver.data.map.VersionedMap;
-import org.eclipse.viatra.solver.data.map.internal.VersionedMapImpl;
+import tools.refinery.data.map.ContinousHashProvider;
+import tools.refinery.data.map.Cursor;
+import tools.refinery.data.map.VersionedMap;
+import tools.refinery.data.map.internal.VersionedMapImpl;
 
 public class MapTestEnvironment<K, V> {
         public static String[] prepareValues(int maxValue) {
diff --git a/store/src/test/java/org/eclipse/viatra/solver/data/model/hashTests/HashEfficiencyTest.java b/store/src/test/java/tools/refinery/data/model/hashTests/HashEfficiencyTest.java
index c4d98a43..f3479846 100644
--- a/store/src/test/java/org/eclipse/viatra/solver/data/model/hashTests/HashEfficiencyTest.java
+++ b/store/src/test/java/tools/refinery/data/model/hashTests/HashEfficiencyTest.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.data.model.hashTests;
+package tools.refinery.data.model.hashTests;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -7,12 +7,13 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Random;
 
-import org.eclipse.viatra.solver.data.map.ContinousHashProvider;
-import org.eclipse.viatra.solver.data.model.Tuple;
-import org.eclipse.viatra.solver.data.model.TupleHashProvider;
-import org.eclipse.viatra.solver.data.model.TupleHashProviderBitMagic;
 import org.junit.jupiter.api.Test;
 
+import tools.refinery.data.map.ContinousHashProvider;
+import tools.refinery.data.model.Tuple;
+import tools.refinery.data.model.TupleHashProvider;
+import tools.refinery.data.model.TupleHashProviderBitMagic;
+
 class HashEfficiencyTest {
 
         private static List<Tuple> permutations(int range, int arity) {
diff --git a/store/src/test/java/org/eclipse/viatra/solver/data/model/tests/ModelTest.java b/store/src/test/java/tools/refinery/data/model/tests/ModelTest.java
index c9bf3da9..2b7589bc 100644
--- a/store/src/test/java/org/eclipse/viatra/solver/data/model/tests/ModelTest.java
+++ b/store/src/test/java/tools/refinery/data/model/tests/ModelTest.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.data.model.tests;
+package tools.refinery.data.model.tests;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -6,14 +6,15 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Set;
 
-import org.eclipse.viatra.solver.data.model.Model;
-import org.eclipse.viatra.solver.data.model.ModelStore;
-import org.eclipse.viatra.solver.data.model.ModelStoreImpl;
-import org.eclipse.viatra.solver.data.model.Tuple;
-import org.eclipse.viatra.solver.data.model.representation.Relation;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
+import tools.refinery.data.model.Model;
+import tools.refinery.data.model.ModelStore;
+import tools.refinery.data.model.ModelStoreImpl;
+import tools.refinery.data.model.Tuple;
+import tools.refinery.data.model.representation.Relation;
+
 class ModelTest {
 
         @Test
diff --git a/store/src/test/java/org/eclipse/viatra/solver/data/query/test/QueryTest.java b/store/src/test/java/tools/refinery/data/query/test/QueryTest.java
index 1500f77c..faf3f111 100644
--- a/store/src/test/java/org/eclipse/viatra/solver/data/query/test/QueryTest.java
+++ b/store/src/test/java/tools/refinery/data/query/test/QueryTest.java
@@ -1,4 +1,4 @@
-package org.eclipse.viatra.solver.data.query.test;
+package tools.refinery.data.query.test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -12,20 +12,21 @@ import org.eclipse.viatra.query.runtime.api.GenericPatternMatch;
 import org.eclipse.viatra.query.runtime.api.GenericPatternMatcher;
 import org.eclipse.viatra.query.runtime.api.GenericQuerySpecification;
 import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;
-import org.eclipse.viatra.solver.data.model.Model;
-import org.eclipse.viatra.solver.data.model.ModelStore;
-import org.eclipse.viatra.solver.data.model.ModelStoreImpl;
-import org.eclipse.viatra.solver.data.model.Tuple;
-import org.eclipse.viatra.solver.data.model.representation.Relation;
-import org.eclipse.viatra.solver.data.model.representation.TruthValue;
-import org.eclipse.viatra.solver.data.query.RelationalScope;
-import org.eclipse.viatra.solver.data.query.internal.PredicateTranslator;
-import org.eclipse.viatra.solver.data.query.view.FilteredRelationView;
-import org.eclipse.viatra.solver.data.query.view.FunctionalRelationView;
-import org.eclipse.viatra.solver.data.query.view.RelationView;
-import org.eclipse.viatra.solver.data.query.view.KeyOnlyRelationView;
 import org.junit.jupiter.api.Test;
 
+import tools.refinery.data.model.Model;
+import tools.refinery.data.model.ModelStore;
+import tools.refinery.data.model.ModelStoreImpl;
+import tools.refinery.data.model.Tuple;
+import tools.refinery.data.model.representation.Relation;
+import tools.refinery.data.model.representation.TruthValue;
+import tools.refinery.data.query.RelationalScope;
+import tools.refinery.data.query.internal.PredicateTranslator;
+import tools.refinery.data.query.view.FilteredRelationView;
+import tools.refinery.data.query.view.FunctionalRelationView;
+import tools.refinery.data.query.view.KeyOnlyRelationView;
+import tools.refinery.data.query.view.RelationView;
+
 class QueryTest {
         @Test
         void minimalTest() {
diff --git a/store/src/test/java/org/eclipse/viatra/solver/data/util/CollectionsUtilTests.java b/store/src/test/java/tools/refinery/data/util/CollectionsUtilTests.java
index 16368912..39ff4aca 100644
--- a/store/src/test/java/org/eclipse/viatra/solver/data/util/CollectionsUtilTests.java
+++ b/store/src/test/java/tools/refinery/data/util/CollectionsUtilTests.java
@@ -1,4 +1,8 @@
-package org.eclipse.viatra.solver.data.util;
+package tools.refinery.data.util;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static tools.refinery.data.util.CollectionsUtil.filter;
+import static tools.refinery.data.util.CollectionsUtil.map;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -8,9 +12,6 @@ import java.util.NoSuchElementException;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import static org.eclipse.viatra.solver.data.util.CollectionsUtil.*;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 class CollectionsUtilTests {
         List<Integer> list10 = List.of(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
         List<String> listTen = List.of("1", "2", "3", "4", "5", "6", "7", "8", "9", "10");