refactor: move terms and DNF into logic subproject

author: Kristóf Marussy <kristof@marussy.com> 2024-03-07 22:10:42 +0100
committer: Kristóf Marussy <kristof@marussy.com> 2024-04-07 14:55:46 +0200
commit: 16a9b534adec2c53b50f92a43c1623918b1c59c0 (patch)
tree: 690b299a2ca31e302ddad219a7aa94bcf86d5d0b
parent: fix(frontend): * operator highlighting (diff)
download: refinery-16a9b534adec2c53b50f92a43c1623918b1c59c0.tar.gz
refinery-16a9b534adec2c53b50f92a43c1623918b1c59c0.tar.zst
refinery-16a9b534adec2c53b50f92a43c1623918b1c59c0.zip
361 files changed, 1406 insertions, 1336 deletions
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 6872b3b9..50ca1f24 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -19,6 +19,7 @@ include(
                "language-model",
                "language-semantics",
                "language-web",
+                "logic",
                "store",
                "store-dse",
                "store-dse-visualization",
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/ModelInitializer.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/ModelInitializer.java
index 2a623cf1..ccfb630f 100644
--- a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/ModelInitializer.java
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/ModelInitializer.java
@@ -13,15 +13,19 @@ import tools.refinery.language.scoping.imports.ImportCollector;
 import tools.refinery.language.semantics.internal.MutableSeed;
 import tools.refinery.language.utils.BuiltinSymbols;
 import tools.refinery.language.utils.ProblemUtil;
+import tools.refinery.logic.Constraint;
+import tools.refinery.logic.dnf.InvalidClauseException;
+import tools.refinery.logic.dnf.Query;
+import tools.refinery.logic.dnf.RelationalQuery;
+import tools.refinery.logic.literal.*;
+import tools.refinery.logic.term.NodeVariable;
+import tools.refinery.logic.term.Variable;
+import tools.refinery.logic.term.cardinalityinterval.CardinalityInterval;
+import tools.refinery.logic.term.cardinalityinterval.CardinalityIntervals;
+import tools.refinery.logic.term.truthvalue.TruthValue;
+import tools.refinery.logic.term.uppercardinality.UpperCardinalities;
 import tools.refinery.store.dse.propagation.PropagationBuilder;
 import tools.refinery.store.model.ModelStoreBuilder;
-import tools.refinery.store.query.Constraint;
-import tools.refinery.store.query.dnf.InvalidClauseException;
-import tools.refinery.store.query.dnf.Query;
-import tools.refinery.store.query.dnf.RelationalQuery;
-import tools.refinery.store.query.literal.*;
-import tools.refinery.store.query.term.NodeVariable;
-import tools.refinery.store.query.term.Variable;
 import tools.refinery.store.reasoning.ReasoningAdapter;
 import tools.refinery.store.reasoning.representation.PartialRelation;
 import tools.refinery.store.reasoning.scope.ScopePropagator;
@@ -38,10 +42,6 @@ import tools.refinery.store.reasoning.translator.multiplicity.ConstrainedMultipl
 import tools.refinery.store.reasoning.translator.multiplicity.Multiplicity;
 import tools.refinery.store.reasoning.translator.multiplicity.UnconstrainedMultiplicity;
 import tools.refinery.store.reasoning.translator.predicate.PredicateTranslator;
-import tools.refinery.store.representation.TruthValue;
-import tools.refinery.store.representation.cardinality.CardinalityInterval;
-import tools.refinery.store.representation.cardinality.CardinalityIntervals;
-import tools.refinery.store.representation.cardinality.UpperCardinalities;
 import tools.refinery.store.tuple.Tuple;
 import java.util.*;
@@ -204,20 +204,7 @@ public class ModelInitializer {
        private void collectNodes() {
                for (var importedProblem : importedProblems) {
                        for (var statement : importedProblem.getStatements()) {
-                                if (statement instanceof NodeDeclaration nodeDeclaration) {
+                                collectNodes(statement);
-                                        for (var node : nodeDeclaration.getNodes()) {
-                                                collectNode(node);
-                                        }
-                                } else if (statement instanceof ClassDeclaration classDeclaration) {
-                                        var newNode = classDeclaration.getNewNode();
-                                        if (newNode != null) {
-                                                collectNode(newNode);
-                                        }
-                                } else if (statement instanceof EnumDeclaration enumDeclaration) {
-                                        for (var literal : enumDeclaration.getLiterals()) {
-                                                collectNode(literal);
-                                        }
-                                }
                        }
                }
                for (var node : problem.getNodes()) {
@@ -225,6 +212,23 @@ public class ModelInitializer {
                }
        }
+        private void collectNodes(Statement statement) {
+                if (statement instanceof NodeDeclaration nodeDeclaration) {
+                        for (var node : nodeDeclaration.getNodes()) {
+                                collectNode(node);
+                        }
+                } else if (statement instanceof ClassDeclaration classDeclaration) {
+                        var newNode = classDeclaration.getNewNode();
+                        if (newNode != null) {
+                                collectNode(newNode);
+                        }
+                } else if (statement instanceof EnumDeclaration enumDeclaration) {
+                        for (var literal : enumDeclaration.getLiterals()) {
+                                collectNode(literal);
+                        }
+                }
+        }
        private void collectNode(Node node) {
                problemTrace.collectNode(node);
        }
@@ -725,14 +729,18 @@ public class ModelInitializer {
        private void collectScopes() {
                for (var importedProblem : importedProblems) {
                        for (var statement : importedProblem.getStatements()) {
-                                if (statement instanceof ScopeDeclaration scopeDeclaration) {
+                                collectScopes(statement);
-                                        for (var typeScope : scopeDeclaration.getTypeScopes()) {
+                        }
-                                                if (typeScope.isIncrement()) {
+                }
-                                                        collectTypeScopeIncrement(typeScope);
+        }
-                                                } else {
-                                                        collectTypeScope(typeScope);
+        private void collectScopes(Statement statement) {
-                                                }
+                if (statement instanceof ScopeDeclaration scopeDeclaration) {
-                                        }
+                        for (var typeScope : scopeDeclaration.getTypeScopes()) {
+                                if (typeScope.isIncrement()) {
+                                        collectTypeScopeIncrement(typeScope);
+                                } else {
+                                        collectTypeScope(typeScope);
                                }
                        }
                }
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/SolutionSerializer.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/SolutionSerializer.java
index 61e70bcd..f097143f 100644
--- a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/SolutionSerializer.java
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/SolutionSerializer.java
@@ -31,7 +31,7 @@ import tools.refinery.store.reasoning.literal.Concreteness;
 import tools.refinery.store.reasoning.representation.PartialRelation;
 import tools.refinery.store.reasoning.translator.typehierarchy.InferredType;
 import tools.refinery.store.reasoning.translator.typehierarchy.TypeHierarchyTranslator;
-import tools.refinery.store.representation.TruthValue;
+import tools.refinery.logic.term.truthvalue.TruthValue;
 import tools.refinery.store.tuple.Tuple;
 import java.io.ByteArrayInputStream;
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/DecisionTree.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/DecisionTree.java
index 5d25f148..8aa1af28 100644
--- a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/DecisionTree.java
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/DecisionTree.java
@@ -7,7 +7,7 @@ package tools.refinery.language.semantics.internal;
 import org.eclipse.collections.api.factory.primitive.IntObjectMaps;
 import tools.refinery.store.map.Cursor;
-import tools.refinery.store.representation.TruthValue;
+import tools.refinery.logic.term.truthvalue.TruthValue;
 import tools.refinery.store.tuple.Tuple;
 class DecisionTree implements MutableSeed<TruthValue> {
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/DecisionTreeCursor.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/DecisionTreeCursor.java
index 71b54cbd..8b8fed36 100644
--- a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/DecisionTreeCursor.java
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/DecisionTreeCursor.java
@@ -6,7 +6,7 @@
 package tools.refinery.language.semantics.internal;
 import tools.refinery.store.map.Cursor;
-import tools.refinery.store.representation.TruthValue;
+import tools.refinery.logic.term.truthvalue.TruthValue;
 import tools.refinery.store.tuple.Tuple;
 import java.util.ArrayDeque;
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/DecisionTreeNode.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/DecisionTreeNode.java
index 31d6fc78..eb79e0c8 100644
--- a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/DecisionTreeNode.java
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/DecisionTreeNode.java
@@ -7,7 +7,7 @@ package tools.refinery.language.semantics.internal;
 import org.eclipse.collections.api.LazyIntIterable;
 import tools.refinery.store.tuple.Tuple;
-import tools.refinery.store.representation.TruthValue;
+import tools.refinery.logic.term.truthvalue.TruthValue;
 abstract class DecisionTreeNode {
        public DecisionTreeValue getReducedValue() {
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/DecisionTreeValue.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/DecisionTreeValue.java
index 5053e7ac..3260ef3d 100644
--- a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/DecisionTreeValue.java
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/DecisionTreeValue.java
@@ -5,7 +5,7 @@
 */
 package tools.refinery.language.semantics.internal;
-import tools.refinery.store.representation.TruthValue;
+import tools.refinery.logic.term.truthvalue.TruthValue;
 public enum DecisionTreeValue {
        UNSET(null),
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/IntermediateNode.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/IntermediateNode.java
index 2ad216ce..8942068c 100644
--- a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/IntermediateNode.java
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/IntermediateNode.java
@@ -10,7 +10,7 @@ import org.eclipse.collections.api.factory.primitive.IntObjectMaps;
 import org.eclipse.collections.api.map.primitive.MutableIntObjectMap;
 import org.eclipse.collections.api.tuple.primitive.IntObjectPair;
 import tools.refinery.store.tuple.Tuple;
-import tools.refinery.store.representation.TruthValue;
+import tools.refinery.logic.term.truthvalue.TruthValue;
 final class IntermediateNode extends DecisionTreeNode {
        private final MutableIntObjectMap<DecisionTreeNode> children;
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/MutableSeed.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/MutableSeed.java
index 693b9e1f..85611059 100644
--- a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/MutableSeed.java
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/MutableSeed.java
@@ -6,7 +6,7 @@
 package tools.refinery.language.semantics.internal;
 import tools.refinery.store.reasoning.seed.Seed;
-import tools.refinery.store.representation.TruthValue;
+import tools.refinery.logic.term.truthvalue.TruthValue;
 import tools.refinery.store.tuple.Tuple;
 public interface MutableSeed<T> extends Seed<T> {
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/NullaryMutableSeed.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/NullaryMutableSeed.java
index f100c5a6..09107a37 100644
--- a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/NullaryMutableSeed.java
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/NullaryMutableSeed.java
@@ -7,7 +7,7 @@ package tools.refinery.language.semantics.internal;
 import tools.refinery.store.map.Cursor;
 import tools.refinery.store.map.Cursors;
-import tools.refinery.store.representation.TruthValue;
+import tools.refinery.logic.term.truthvalue.TruthValue;
 import tools.refinery.store.tuple.Tuple;
 class NullaryMutableSeed implements MutableSeed<TruthValue> {
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/TerminalNode.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/TerminalNode.java
index dc501479..2ebaecef 100644
--- a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/TerminalNode.java
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/TerminalNode.java
@@ -10,7 +10,7 @@ import org.eclipse.collections.api.factory.primitive.IntObjectMaps;
 import org.eclipse.collections.api.map.primitive.MutableIntObjectMap;
 import org.eclipse.collections.api.tuple.primitive.IntObjectPair;
 import tools.refinery.store.tuple.Tuple;
-import tools.refinery.store.representation.TruthValue;
+import tools.refinery.logic.term.truthvalue.TruthValue;
 class TerminalNode extends DecisionTreeNode {
        private MutableIntObjectMap<TruthValue> children;
diff --git a/subprojects/language-semantics/src/test/java/tools/refinery/language/semantics/CountPropagationTest.java b/subprojects/language-semantics/src/test/java/tools/refinery/language/semantics/CountPropagationTest.java
index b679c1ef..207bc7ff 100644
--- a/subprojects/language-semantics/src/test/java/tools/refinery/language/semantics/CountPropagationTest.java
+++ b/subprojects/language-semantics/src/test/java/tools/refinery/language/semantics/CountPropagationTest.java
@@ -19,8 +19,8 @@ import tools.refinery.store.reasoning.seed.ModelSeed;
 import tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslator;
 import tools.refinery.store.reasoning.translator.typehierarchy.TypeHierarchy;
 import tools.refinery.store.reasoning.translator.typehierarchy.TypeHierarchyTranslator;
-import tools.refinery.store.representation.TruthValue;
+import tools.refinery.logic.term.truthvalue.TruthValue;
-import tools.refinery.store.representation.cardinality.CardinalityIntervals;
+import tools.refinery.logic.term.cardinalityinterval.CardinalityIntervals;
 import tools.refinery.store.tuple.Tuple;
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/subprojects/language-semantics/src/test/java/tools/refinery/language/semantics/internal/DecisionTreeTests.java b/subprojects/language-semantics/src/test/java/tools/refinery/language/semantics/internal/DecisionTreeTests.java
index 61ce850f..cb0885c1 100644
--- a/subprojects/language-semantics/src/test/java/tools/refinery/language/semantics/internal/DecisionTreeTests.java
+++ b/subprojects/language-semantics/src/test/java/tools/refinery/language/semantics/internal/DecisionTreeTests.java
@@ -6,7 +6,7 @@
 package tools.refinery.language.semantics.internal;
 import org.junit.jupiter.api.Test;
-import tools.refinery.store.representation.TruthValue;
+import tools.refinery.logic.term.truthvalue.TruthValue;
 import tools.refinery.store.tuple.Tuple;
 import java.util.LinkedHashMap;
diff --git a/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/metadata/NodeMetadataFactory.java b/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/metadata/NodeMetadataFactory.java
index ce0e50c1..f469d2dd 100644
--- a/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/metadata/NodeMetadataFactory.java
+++ b/subprojects/language-web/src/main/java/tools/refinery/language/web/semantics/metadata/NodeMetadataFactory.java
@@ -17,7 +17,7 @@ import tools.refinery.store.reasoning.literal.Concreteness;
 import tools.refinery.store.reasoning.representation.PartialRelation;
 import tools.refinery.store.reasoning.translator.typehierarchy.InferredType;
 import tools.refinery.store.reasoning.translator.typehierarchy.TypeHierarchyTranslator;
-import tools.refinery.store.representation.TruthValue;
+import tools.refinery.logic.term.truthvalue.TruthValue;
 import tools.refinery.store.tuple.Tuple;
 public class NodeMetadataFactory {
diff --git a/subprojects/logic/build.gradle.kts b/subprojects/logic/build.gradle.kts
new file mode 100644
index 00000000..57de8e5d
--- /dev/null
+++ b/subprojects/logic/build.gradle.kts
@@ -0,0 +1,14 @@
+/*
+ * SPDX-FileCopyrightText: 2024 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+plugins {
+        id("tools.refinery.gradle.java-library")
+        id("tools.refinery.gradle.java-test-fixtures")
+}
+dependencies {
+        testFixturesApi(libs.hamcrest)
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/representation/AbstractDomain.java b/subprojects/logic/src/main/java/tools/refinery/logic/AbstractDomain.java
index dfdb43bd..607caa48 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/representation/AbstractDomain.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/AbstractDomain.java
@@ -3,7 +3,7 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.representation;
+package tools.refinery.logic;
 import java.util.Objects;
 import java.util.Optional;
diff --git a/subprojects/store/src/main/java/tools/refinery/store/representation/AnyAbstractDomain.java b/subprojects/logic/src/main/java/tools/refinery/logic/AnyAbstractDomain.java
index c354fab7..a296f4b2 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/representation/AnyAbstractDomain.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/AnyAbstractDomain.java
@@ -3,7 +3,7 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.representation;
+package tools.refinery.logic;
 public sealed interface AnyAbstractDomain permits AbstractDomain {
        Class<?> abstractType();
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/Constraint.java b/subprojects/logic/src/main/java/tools/refinery/logic/Constraint.java
index 375c582a..89c8760b 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/Constraint.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/Constraint.java
@@ -3,11 +3,11 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query;
+package tools.refinery.logic;
-import tools.refinery.store.query.equality.LiteralEqualityHelper;
+import tools.refinery.logic.equality.LiteralEqualityHelper;
-import tools.refinery.store.query.literal.*;
+import tools.refinery.logic.literal.*;
-import tools.refinery.store.query.term.*;
+import tools.refinery.logic.term.*;
 import java.util.List;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/InvalidQueryException.java b/subprojects/logic/src/main/java/tools/refinery/logic/InvalidQueryException.java
index c39277a0..b5460e0d 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/InvalidQueryException.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/InvalidQueryException.java
@@ -3,7 +3,7 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query;
+package tools.refinery.logic;
 public class InvalidQueryException extends RuntimeException {
        public InvalidQueryException() {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/AbstractQueryBuilder.java b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/AbstractQueryBuilder.java
index 2a3e3ce0..68712b98 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/AbstractQueryBuilder.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/AbstractQueryBuilder.java
@@ -3,13 +3,13 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.dnf;
+package tools.refinery.logic.dnf;
-import tools.refinery.store.query.dnf.callback.*;
+import tools.refinery.logic.dnf.callback.*;
-import tools.refinery.store.query.literal.Literal;
+import tools.refinery.logic.literal.Literal;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.NodeVariable;
-import tools.refinery.store.query.term.ParameterDirection;
+import tools.refinery.logic.term.ParameterDirection;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
 import java.util.Collection;
 import java.util.List;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/AnyQuery.java b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/AnyQuery.java
index 5e28af68..aebfd73f 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/AnyQuery.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/AnyQuery.java
@@ -3,7 +3,7 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.dnf;
+package tools.refinery.logic.dnf;
 public sealed interface AnyQuery permits Query {
        String name();
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/ClausePostProcessor.java b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/ClausePostProcessor.java
index 7cd05364..00d15a0c 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/ClausePostProcessor.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/ClausePostProcessor.java
@@ -3,17 +3,17 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.dnf;
+package tools.refinery.logic.dnf;
 import org.jetbrains.annotations.NotNull;
-import tools.refinery.store.query.Constraint;
+import tools.refinery.logic.Constraint;
-import tools.refinery.store.query.InvalidQueryException;
+import tools.refinery.logic.InvalidQueryException;
-import tools.refinery.store.query.literal.*;
+import tools.refinery.logic.literal.*;
-import tools.refinery.store.query.substitution.MapBasedSubstitution;
+import tools.refinery.logic.substitution.MapBasedSubstitution;
-import tools.refinery.store.query.substitution.StatelessSubstitution;
+import tools.refinery.logic.substitution.StatelessSubstitution;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.ParameterDirection;
+import tools.refinery.logic.term.ParameterDirection;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
 import java.util.*;
 import java.util.function.Function;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/Dnf.java b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/Dnf.java
index 86a1b6b2..0fc2a1cc 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/Dnf.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/Dnf.java
@@ -3,17 +3,17 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.dnf;
+package tools.refinery.logic.dnf;
-import tools.refinery.store.query.Constraint;
+import tools.refinery.logic.Constraint;
-import tools.refinery.store.query.InvalidQueryException;
+import tools.refinery.logic.InvalidQueryException;
-import tools.refinery.store.query.equality.DnfEqualityChecker;
+import tools.refinery.logic.equality.DnfEqualityChecker;
-import tools.refinery.store.query.equality.LiteralEqualityHelper;
+import tools.refinery.logic.equality.LiteralEqualityHelper;
-import tools.refinery.store.query.equality.SubstitutingLiteralEqualityHelper;
+import tools.refinery.logic.equality.SubstitutingLiteralEqualityHelper;
-import tools.refinery.store.query.equality.SubstitutingLiteralHashCodeHelper;
+import tools.refinery.logic.equality.SubstitutingLiteralHashCodeHelper;
-import tools.refinery.store.query.literal.Reduction;
+import tools.refinery.logic.literal.Reduction;
-import tools.refinery.store.query.term.Parameter;
+import tools.refinery.logic.term.Parameter;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
 import java.util.Collection;
 import java.util.Collections;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/DnfBuilder.java b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/DnfBuilder.java
index 0f9fd366..b58c5c45 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/DnfBuilder.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/DnfBuilder.java
@@ -3,12 +3,12 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.dnf;
+package tools.refinery.logic.dnf;
-import tools.refinery.store.query.InvalidQueryException;
+import tools.refinery.logic.InvalidQueryException;
-import tools.refinery.store.query.dnf.callback.*;
+import tools.refinery.logic.dnf.callback.*;
-import tools.refinery.store.query.literal.Literal;
+import tools.refinery.logic.literal.Literal;
-import tools.refinery.store.query.term.*;
+import tools.refinery.logic.term.*;
 import java.util.*;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/DnfClause.java b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/DnfClause.java
index 94327bad..92755d4d 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/DnfClause.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/DnfClause.java
@@ -3,12 +3,12 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.dnf;
+package tools.refinery.logic.dnf;
-import tools.refinery.store.query.equality.LiteralEqualityHelper;
+import tools.refinery.logic.equality.LiteralEqualityHelper;
-import tools.refinery.store.query.equality.LiteralHashCodeHelper;
+import tools.refinery.logic.equality.LiteralHashCodeHelper;
-import tools.refinery.store.query.literal.Literal;
+import tools.refinery.logic.literal.Literal;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
 import java.util.List;
 import java.util.Set;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/DnfPostProcessor.java b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/DnfPostProcessor.java
index 01344b59..87d07187 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/DnfPostProcessor.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/DnfPostProcessor.java
@@ -3,15 +3,15 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.dnf;
+package tools.refinery.logic.dnf;
-import tools.refinery.store.query.InvalidQueryException;
+import tools.refinery.logic.InvalidQueryException;
-import tools.refinery.store.query.equality.DnfEqualityChecker;
+import tools.refinery.logic.equality.DnfEqualityChecker;
-import tools.refinery.store.query.equality.SubstitutingLiteralEqualityHelper;
+import tools.refinery.logic.equality.SubstitutingLiteralEqualityHelper;
-import tools.refinery.store.query.equality.SubstitutingLiteralHashCodeHelper;
+import tools.refinery.logic.equality.SubstitutingLiteralHashCodeHelper;
-import tools.refinery.store.query.literal.Literal;
+import tools.refinery.logic.literal.Literal;
-import tools.refinery.store.query.term.ParameterDirection;
+import tools.refinery.logic.term.ParameterDirection;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
 import java.util.*;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/DnfUtils.java b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/DnfUtils.java
index 65ab3634..02a619a6 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/DnfUtils.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/DnfUtils.java
@@ -3,7 +3,7 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.dnf;
+package tools.refinery.logic.dnf;
 import java.util.UUID;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/FunctionalDependency.java b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/FunctionalDependency.java
index aef07ee3..c3fc87ab 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/FunctionalDependency.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/FunctionalDependency.java
@@ -3,9 +3,9 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.dnf;
+package tools.refinery.logic.dnf;
-import tools.refinery.store.query.InvalidQueryException;
+import tools.refinery.logic.InvalidQueryException;
 import java.util.HashSet;
 import java.util.Set;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/FunctionalQuery.java b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/FunctionalQuery.java
index b0a03c7d..1df63fbd 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/FunctionalQuery.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/FunctionalQuery.java
@@ -3,14 +3,14 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.dnf;
+package tools.refinery.logic.dnf;
-import tools.refinery.store.query.InvalidQueryException;
+import tools.refinery.logic.InvalidQueryException;
-import tools.refinery.store.query.literal.CallPolarity;
+import tools.refinery.logic.literal.CallPolarity;
-import tools.refinery.store.query.term.Aggregator;
+import tools.refinery.logic.term.Aggregator;
-import tools.refinery.store.query.term.AssignedValue;
+import tools.refinery.logic.term.AssignedValue;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.NodeVariable;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/FunctionalQueryBuilder.java b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/FunctionalQueryBuilder.java
index d1cd7ba8..476f3c83 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/FunctionalQueryBuilder.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/FunctionalQueryBuilder.java
@@ -3,9 +3,9 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.dnf;
+package tools.refinery.logic.dnf;
-import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.logic.term.DataVariable;
 public final class FunctionalQueryBuilder<T> extends AbstractQueryBuilder<FunctionalQueryBuilder<T>> {
        private final DataVariable<T> outputVariable;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/InvalidClauseException.java b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/InvalidClauseException.java
index 747574b9..51a42d02 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/InvalidClauseException.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/InvalidClauseException.java
@@ -3,9 +3,9 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.dnf;
+package tools.refinery.logic.dnf;
-import tools.refinery.store.query.InvalidQueryException;
+import tools.refinery.logic.InvalidQueryException;
 public class InvalidClauseException extends InvalidQueryException {
        private final int clauseIndex;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/Query.java b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/Query.java
index 83fe6ccd..1f913ea0 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/Query.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/Query.java
@@ -3,11 +3,11 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.dnf;
+package tools.refinery.logic.dnf;
-import tools.refinery.store.query.dnf.callback.*;
+import tools.refinery.logic.dnf.callback.*;
-import tools.refinery.store.query.term.ParameterDirection;
+import tools.refinery.logic.term.ParameterDirection;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
 import java.util.Objects;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/QueryBuilder.java b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/QueryBuilder.java
index 138911bc..a74295ba 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/QueryBuilder.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/QueryBuilder.java
@@ -3,9 +3,9 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.dnf;
+package tools.refinery.logic.dnf;
-import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.logic.term.DataVariable;
 public final class QueryBuilder extends AbstractQueryBuilder<QueryBuilder> {
        QueryBuilder(String name) {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/RelationalQuery.java b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/RelationalQuery.java
index 98f71e11..dc2b8eb6 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/RelationalQuery.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/RelationalQuery.java
@@ -3,13 +3,13 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.dnf;
+package tools.refinery.logic.dnf;
-import tools.refinery.store.query.InvalidQueryException;
+import tools.refinery.logic.InvalidQueryException;
-import tools.refinery.store.query.literal.CallLiteral;
+import tools.refinery.logic.literal.CallLiteral;
-import tools.refinery.store.query.literal.CallPolarity;
+import tools.refinery.logic.literal.CallPolarity;
-import tools.refinery.store.query.term.AssignedValue;
+import tools.refinery.logic.term.AssignedValue;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.NodeVariable;
 import java.util.Collections;
 import java.util.List;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/SymbolicParameter.java b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/SymbolicParameter.java
index fe9cefcc..acc775a7 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/SymbolicParameter.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/SymbolicParameter.java
@@ -3,12 +3,12 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.dnf;
+package tools.refinery.logic.dnf;
-import tools.refinery.store.query.equality.LiteralHashCodeHelper;
+import tools.refinery.logic.equality.LiteralHashCodeHelper;
-import tools.refinery.store.query.term.Parameter;
+import tools.refinery.logic.term.Parameter;
-import tools.refinery.store.query.term.ParameterDirection;
+import tools.refinery.logic.term.ParameterDirection;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
 import java.util.Objects;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback0.java b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/ClauseCallback0.java
index d98dda2e..2e276030 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback0.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/ClauseCallback0.java
@@ -3,9 +3,9 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.dnf.callback;
+package tools.refinery.logic.dnf.callback;
-import tools.refinery.store.query.literal.Literal;
+import tools.refinery.logic.literal.Literal;
 import java.util.Collection;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback1Data0.java b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/ClauseCallback1Data0.java
index 4c01a527..f2e174b0 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback1Data0.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/ClauseCallback1Data0.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.dnf.callback;
+package tools.refinery.logic.dnf.callback;
-import tools.refinery.store.query.literal.Literal;
+import tools.refinery.logic.literal.Literal;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.NodeVariable;
 import java.util.Collection;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback1Data1.java b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/ClauseCallback1Data1.java
index 2c0cb6eb..4e6b5a06 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback1Data1.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/ClauseCallback1Data1.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.dnf.callback;
+package tools.refinery.logic.dnf.callback;
-import tools.refinery.store.query.literal.Literal;
+import tools.refinery.logic.literal.Literal;
-import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.logic.term.DataVariable;
 import java.util.Collection;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback2Data0.java b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/ClauseCallback2Data0.java
index d764bdba..42b7cb08 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback2Data0.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/ClauseCallback2Data0.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.dnf.callback;
+package tools.refinery.logic.dnf.callback;
-import tools.refinery.store.query.literal.Literal;
+import tools.refinery.logic.literal.Literal;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.NodeVariable;
 import java.util.Collection;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback2Data1.java b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/ClauseCallback2Data1.java
index 140af03a..59e53744 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback2Data1.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/ClauseCallback2Data1.java
@@ -3,11 +3,11 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.dnf.callback;
+package tools.refinery.logic.dnf.callback;
-import tools.refinery.store.query.literal.Literal;
+import tools.refinery.logic.literal.Literal;
-import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.logic.term.DataVariable;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.NodeVariable;
 import java.util.Collection;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback2Data2.java b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/ClauseCallback2Data2.java
index bfc8637c..d9550d49 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback2Data2.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/ClauseCallback2Data2.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.dnf.callback;
+package tools.refinery.logic.dnf.callback;
-import tools.refinery.store.query.literal.Literal;
+import tools.refinery.logic.literal.Literal;
-import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.logic.term.DataVariable;
 import java.util.Collection;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback3Data0.java b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/ClauseCallback3Data0.java
index 074df65b..e36f05db 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback3Data0.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/ClauseCallback3Data0.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.dnf.callback;
+package tools.refinery.logic.dnf.callback;
-import tools.refinery.store.query.literal.Literal;
+import tools.refinery.logic.literal.Literal;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.NodeVariable;
 import java.util.Collection;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback3Data1.java b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/ClauseCallback3Data1.java
index 24ba5187..7227bada 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback3Data1.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/ClauseCallback3Data1.java
@@ -3,11 +3,11 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.dnf.callback;
+package tools.refinery.logic.dnf.callback;
-import tools.refinery.store.query.literal.Literal;
+import tools.refinery.logic.literal.Literal;
-import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.logic.term.DataVariable;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.NodeVariable;
 import java.util.Collection;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback3Data2.java b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/ClauseCallback3Data2.java
index 2a2e837a..7d842655 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback3Data2.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/ClauseCallback3Data2.java
@@ -3,11 +3,11 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.dnf.callback;
+package tools.refinery.logic.dnf.callback;
-import tools.refinery.store.query.literal.Literal;
+import tools.refinery.logic.literal.Literal;
-import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.logic.term.DataVariable;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.NodeVariable;
 import java.util.Collection;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback3Data3.java b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/ClauseCallback3Data3.java
index 8f4bdd01..3bc895d5 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback3Data3.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/ClauseCallback3Data3.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.dnf.callback;
+package tools.refinery.logic.dnf.callback;
-import tools.refinery.store.query.literal.Literal;
+import tools.refinery.logic.literal.Literal;
-import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.logic.term.DataVariable;
 import java.util.Collection;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback4Data0.java b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/ClauseCallback4Data0.java
index ed0f87b2..164c3208 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback4Data0.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/ClauseCallback4Data0.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.dnf.callback;
+package tools.refinery.logic.dnf.callback;
-import tools.refinery.store.query.literal.Literal;
+import tools.refinery.logic.literal.Literal;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.NodeVariable;
 import java.util.Collection;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback4Data1.java b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/ClauseCallback4Data1.java
index 9b27e2e1..d7454135 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback4Data1.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/ClauseCallback4Data1.java
@@ -3,11 +3,11 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.dnf.callback;
+package tools.refinery.logic.dnf.callback;
-import tools.refinery.store.query.literal.Literal;
+import tools.refinery.logic.literal.Literal;
-import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.logic.term.DataVariable;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.NodeVariable;
 import java.util.Collection;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback4Data2.java b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/ClauseCallback4Data2.java
index cbc4808e..829dbcf8 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback4Data2.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/ClauseCallback4Data2.java
@@ -3,11 +3,11 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.dnf.callback;
+package tools.refinery.logic.dnf.callback;
-import tools.refinery.store.query.literal.Literal;
+import tools.refinery.logic.literal.Literal;
-import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.logic.term.DataVariable;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.NodeVariable;
 import java.util.Collection;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback4Data3.java b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/ClauseCallback4Data3.java
index a6258f36..50da829b 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback4Data3.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/ClauseCallback4Data3.java
@@ -3,11 +3,11 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.dnf.callback;
+package tools.refinery.logic.dnf.callback;
-import tools.refinery.store.query.literal.Literal;
+import tools.refinery.logic.literal.Literal;
-import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.logic.term.DataVariable;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.NodeVariable;
 import java.util.Collection;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback4Data4.java b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/ClauseCallback4Data4.java
index b52a911a..46f8fbe9 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/ClauseCallback4Data4.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/ClauseCallback4Data4.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.dnf.callback;
+package tools.refinery.logic.dnf.callback;
-import tools.refinery.store.query.literal.Literal;
+import tools.refinery.logic.literal.Literal;
-import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.logic.term.DataVariable;
 import java.util.Collection;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/FunctionalQueryCallback0.java b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/FunctionalQueryCallback0.java
index 63b3eee6..689a5b53 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/FunctionalQueryCallback0.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/FunctionalQueryCallback0.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.dnf.callback;
+package tools.refinery.logic.dnf.callback;
-import tools.refinery.store.query.dnf.FunctionalQueryBuilder;
+import tools.refinery.logic.dnf.FunctionalQueryBuilder;
-import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.logic.term.DataVariable;
 @FunctionalInterface
 public interface FunctionalQueryCallback0<T> {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/FunctionalQueryCallback1.java b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/FunctionalQueryCallback1.java
index 1295a118..b7d69a50 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/FunctionalQueryCallback1.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/FunctionalQueryCallback1.java
@@ -3,11 +3,11 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.dnf.callback;
+package tools.refinery.logic.dnf.callback;
-import tools.refinery.store.query.dnf.FunctionalQueryBuilder;
+import tools.refinery.logic.dnf.FunctionalQueryBuilder;
-import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.logic.term.DataVariable;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.NodeVariable;
 @FunctionalInterface
 public interface FunctionalQueryCallback1<T> {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/FunctionalQueryCallback2.java b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/FunctionalQueryCallback2.java
index d5b7f9ff..38fb265b 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/FunctionalQueryCallback2.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/FunctionalQueryCallback2.java
@@ -3,11 +3,11 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.dnf.callback;
+package tools.refinery.logic.dnf.callback;
-import tools.refinery.store.query.dnf.FunctionalQueryBuilder;
+import tools.refinery.logic.dnf.FunctionalQueryBuilder;
-import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.logic.term.DataVariable;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.NodeVariable;
 @FunctionalInterface
 public interface FunctionalQueryCallback2<T> {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/FunctionalQueryCallback3.java b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/FunctionalQueryCallback3.java
index dc8404a0..04451657 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/FunctionalQueryCallback3.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/FunctionalQueryCallback3.java
@@ -3,11 +3,11 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.dnf.callback;
+package tools.refinery.logic.dnf.callback;
-import tools.refinery.store.query.dnf.FunctionalQueryBuilder;
+import tools.refinery.logic.dnf.FunctionalQueryBuilder;
-import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.logic.term.DataVariable;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.NodeVariable;
 @FunctionalInterface
 public interface FunctionalQueryCallback3<T> {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/FunctionalQueryCallback4.java b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/FunctionalQueryCallback4.java
index b6d3ddb0..a39c389d 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/FunctionalQueryCallback4.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/FunctionalQueryCallback4.java
@@ -3,11 +3,11 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.dnf.callback;
+package tools.refinery.logic.dnf.callback;
-import tools.refinery.store.query.dnf.FunctionalQueryBuilder;
+import tools.refinery.logic.dnf.FunctionalQueryBuilder;
-import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.logic.term.DataVariable;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.NodeVariable;
 @FunctionalInterface
 public interface FunctionalQueryCallback4<T> {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/QueryCallback0.java b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/QueryCallback0.java
index 3cf1de48..bc9a6ee4 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/QueryCallback0.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/QueryCallback0.java
@@ -3,9 +3,9 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.dnf.callback;
+package tools.refinery.logic.dnf.callback;
-import tools.refinery.store.query.dnf.QueryBuilder;
+import tools.refinery.logic.dnf.QueryBuilder;
 @FunctionalInterface
 public interface QueryCallback0 {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/QueryCallback1.java b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/QueryCallback1.java
index 0a150955..80763171 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/QueryCallback1.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/QueryCallback1.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.dnf.callback;
+package tools.refinery.logic.dnf.callback;
-import tools.refinery.store.query.dnf.QueryBuilder;
+import tools.refinery.logic.dnf.QueryBuilder;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.NodeVariable;
 @FunctionalInterface
 public interface QueryCallback1 {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/QueryCallback2.java b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/QueryCallback2.java
index 9493a7b4..54423104 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/QueryCallback2.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/QueryCallback2.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.dnf.callback;
+package tools.refinery.logic.dnf.callback;
-import tools.refinery.store.query.dnf.QueryBuilder;
+import tools.refinery.logic.dnf.QueryBuilder;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.NodeVariable;
 @FunctionalInterface
 public interface QueryCallback2 {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/QueryCallback3.java b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/QueryCallback3.java
index 358c7da7..eb68d493 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/QueryCallback3.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/QueryCallback3.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.dnf.callback;
+package tools.refinery.logic.dnf.callback;
-import tools.refinery.store.query.dnf.QueryBuilder;
+import tools.refinery.logic.dnf.QueryBuilder;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.NodeVariable;
 @FunctionalInterface
 public interface QueryCallback3 {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/QueryCallback4.java b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/QueryCallback4.java
index 890dda16..59690af9 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/dnf/callback/QueryCallback4.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/dnf/callback/QueryCallback4.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.dnf.callback;
+package tools.refinery.logic.dnf.callback;
-import tools.refinery.store.query.dnf.QueryBuilder;
+import tools.refinery.logic.dnf.QueryBuilder;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.NodeVariable;
 @FunctionalInterface
 public interface QueryCallback4 {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/equality/DeepDnfEqualityChecker.java b/subprojects/logic/src/main/java/tools/refinery/logic/equality/DeepDnfEqualityChecker.java
index d6171314..a49ef080 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/equality/DeepDnfEqualityChecker.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/equality/DeepDnfEqualityChecker.java
@@ -3,13 +3,13 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.equality;
+package tools.refinery.logic.equality;
-import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.logic.dnf.Dnf;
-import tools.refinery.store.query.dnf.DnfClause;
+import tools.refinery.logic.dnf.DnfClause;
-import tools.refinery.store.query.dnf.SymbolicParameter;
+import tools.refinery.logic.dnf.SymbolicParameter;
-import tools.refinery.store.query.literal.Literal;
+import tools.refinery.logic.literal.Literal;
-import tools.refinery.store.util.CycleDetectingMapper;
+import tools.refinery.logic.util.CycleDetectingMapper;
 import java.util.List;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/equality/DnfEqualityChecker.java b/subprojects/logic/src/main/java/tools/refinery/logic/equality/DnfEqualityChecker.java
index e2cfd79b..3162b019 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/equality/DnfEqualityChecker.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/equality/DnfEqualityChecker.java
@@ -3,9 +3,9 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.equality;
+package tools.refinery.logic.equality;
-import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.logic.dnf.Dnf;
 import java.util.Objects;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/equality/LiteralEqualityHelper.java b/subprojects/logic/src/main/java/tools/refinery/logic/equality/LiteralEqualityHelper.java
index 5abc76ce..ea62061e 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/equality/LiteralEqualityHelper.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/equality/LiteralEqualityHelper.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.equality;
+package tools.refinery.logic.equality;
-import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.logic.dnf.Dnf;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
 import java.util.Objects;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/equality/LiteralHashCodeHelper.java b/subprojects/logic/src/main/java/tools/refinery/logic/equality/LiteralHashCodeHelper.java
index 5495160a..fccadd08 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/equality/LiteralHashCodeHelper.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/equality/LiteralHashCodeHelper.java
@@ -3,9 +3,9 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.equality;
+package tools.refinery.logic.equality;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
 import java.util.Objects;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/equality/SubstitutingLiteralEqualityHelper.java b/subprojects/logic/src/main/java/tools/refinery/logic/equality/SubstitutingLiteralEqualityHelper.java
index 50a79e07..7a16b5c9 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/equality/SubstitutingLiteralEqualityHelper.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/equality/SubstitutingLiteralEqualityHelper.java
@@ -3,11 +3,11 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.equality;
+package tools.refinery.logic.equality;
-import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.logic.dnf.Dnf;
-import tools.refinery.store.query.dnf.SymbolicParameter;
+import tools.refinery.logic.dnf.SymbolicParameter;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
 import java.util.HashMap;
 import java.util.List;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/equality/SubstitutingLiteralHashCodeHelper.java b/subprojects/logic/src/main/java/tools/refinery/logic/equality/SubstitutingLiteralHashCodeHelper.java
index 754f6976..64bd9784 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/equality/SubstitutingLiteralHashCodeHelper.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/equality/SubstitutingLiteralHashCodeHelper.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.equality;
+package tools.refinery.logic.equality;
-import tools.refinery.store.query.dnf.SymbolicParameter;
+import tools.refinery.logic.dnf.SymbolicParameter;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
 import java.util.LinkedHashMap;
 import java.util.List;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/AbstractCallLiteral.java b/subprojects/logic/src/main/java/tools/refinery/logic/literal/AbstractCallLiteral.java
index 0e99d441..9ae84547 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/AbstractCallLiteral.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/literal/AbstractCallLiteral.java
@@ -3,21 +3,21 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.literal;
+package tools.refinery.logic.literal;
-import tools.refinery.store.query.Constraint;
+import tools.refinery.logic.Constraint;
-import tools.refinery.store.query.InvalidQueryException;
+import tools.refinery.logic.InvalidQueryException;
-import tools.refinery.store.query.equality.LiteralEqualityHelper;
+import tools.refinery.logic.equality.LiteralEqualityHelper;
-import tools.refinery.store.query.equality.LiteralHashCodeHelper;
+import tools.refinery.logic.equality.LiteralHashCodeHelper;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.ParameterDirection;
+import tools.refinery.logic.term.ParameterDirection;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
 import java.util.*;
 // {@link Object#equals(Object)} is implemented by {@link AbstractLiteral}.
 @SuppressWarnings("squid:S2160")
-public abstract class AbstractCallLiteral extends AbstractLiteral {
+public abstract class AbstractCallLiteral extends tools.refinery.logic.literal.AbstractLiteral {
        private final Constraint target;
        private final List<Variable> arguments;
        private final Set<Variable> inArguments;
@@ -90,12 +90,12 @@ public abstract class AbstractCallLiteral extends AbstractLiteral {
        }
        @Override
-        public Literal substitute(Substitution substitution) {
+        public tools.refinery.logic.literal.Literal substitute(Substitution substitution) {
                var substitutedArguments = arguments.stream().map(substitution::getSubstitute).toList();
                return doSubstitute(substitution, substitutedArguments);
        }
-        protected abstract Literal doSubstitute(Substitution substitution, List<Variable> substitutedArguments);
+        protected abstract tools.refinery.logic.literal.Literal doSubstitute(Substitution substitution, List<Variable> substitutedArguments);
        public AbstractCallLiteral withTarget(Constraint newTarget) {
                if (Objects.equals(target, newTarget)) {
@@ -107,7 +107,7 @@ public abstract class AbstractCallLiteral extends AbstractLiteral {
        public abstract AbstractCallLiteral withArguments(Constraint newTarget, List<Variable> newArguments);
        @Override
-        public boolean equalsWithSubstitution(LiteralEqualityHelper helper, Literal other) {
+        public boolean equalsWithSubstitution(LiteralEqualityHelper helper, tools.refinery.logic.literal.Literal other) {
                if (!super.equalsWithSubstitution(helper, other)) {
                        return false;
                }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/AbstractCountLiteral.java b/subprojects/logic/src/main/java/tools/refinery/logic/literal/AbstractCountLiteral.java
index 9bb572c0..ee932598 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/AbstractCountLiteral.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/literal/AbstractCountLiteral.java
@@ -3,15 +3,15 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.literal;
+package tools.refinery.logic.literal;
-import tools.refinery.store.query.Constraint;
+import tools.refinery.logic.Constraint;
-import tools.refinery.store.query.InvalidQueryException;
+import tools.refinery.logic.InvalidQueryException;
-import tools.refinery.store.query.equality.LiteralEqualityHelper;
+import tools.refinery.logic.equality.LiteralEqualityHelper;
-import tools.refinery.store.query.equality.LiteralHashCodeHelper;
+import tools.refinery.logic.equality.LiteralHashCodeHelper;
-import tools.refinery.store.query.term.ConstantTerm;
+import tools.refinery.logic.term.ConstantTerm;
-import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.logic.term.DataVariable;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
 import java.util.List;
 import java.util.Objects;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/AbstractLiteral.java b/subprojects/logic/src/main/java/tools/refinery/logic/literal/AbstractLiteral.java
index 7d3cabd7..79100e40 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/AbstractLiteral.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/literal/AbstractLiteral.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.literal;
+package tools.refinery.logic.literal;
-import tools.refinery.store.query.equality.LiteralEqualityHelper;
+import tools.refinery.logic.equality.LiteralEqualityHelper;
-import tools.refinery.store.query.equality.LiteralHashCodeHelper;
+import tools.refinery.logic.equality.LiteralHashCodeHelper;
 public abstract class AbstractLiteral implements Literal {
        @Override
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/AggregationLiteral.java b/subprojects/logic/src/main/java/tools/refinery/logic/literal/AggregationLiteral.java
index b6861de0..d2cc23f9 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/AggregationLiteral.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/literal/AggregationLiteral.java
@@ -3,14 +3,14 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.literal;
+package tools.refinery.logic.literal;
-import tools.refinery.store.query.Constraint;
+import tools.refinery.logic.Constraint;
-import tools.refinery.store.query.InvalidQueryException;
+import tools.refinery.logic.InvalidQueryException;
-import tools.refinery.store.query.equality.LiteralEqualityHelper;
+import tools.refinery.logic.equality.LiteralEqualityHelper;
-import tools.refinery.store.query.equality.LiteralHashCodeHelper;
+import tools.refinery.logic.equality.LiteralHashCodeHelper;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.*;
+import tools.refinery.logic.term.*;
 import java.util.List;
 import java.util.Objects;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/AssignLiteral.java b/subprojects/logic/src/main/java/tools/refinery/logic/literal/AssignLiteral.java
index dadf487f..4929e74c 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/AssignLiteral.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/literal/AssignLiteral.java
@@ -3,15 +3,15 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.literal;
+package tools.refinery.logic.literal;
-import tools.refinery.store.query.InvalidQueryException;
+import tools.refinery.logic.InvalidQueryException;
-import tools.refinery.store.query.equality.LiteralEqualityHelper;
+import tools.refinery.logic.equality.LiteralEqualityHelper;
-import tools.refinery.store.query.equality.LiteralHashCodeHelper;
+import tools.refinery.logic.equality.LiteralHashCodeHelper;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.logic.term.DataVariable;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.Term;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
 import java.util.Collections;
 import java.util.Objects;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/BooleanLiteral.java b/subprojects/logic/src/main/java/tools/refinery/logic/literal/BooleanLiteral.java
index 6cd320da..fd1dbf91 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/BooleanLiteral.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/literal/BooleanLiteral.java
@@ -3,12 +3,12 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.literal;
+package tools.refinery.logic.literal;
-import tools.refinery.store.query.equality.LiteralEqualityHelper;
+import tools.refinery.logic.equality.LiteralEqualityHelper;
-import tools.refinery.store.query.equality.LiteralHashCodeHelper;
+import tools.refinery.logic.equality.LiteralHashCodeHelper;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
 import java.util.Set;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/CallLiteral.java b/subprojects/logic/src/main/java/tools/refinery/logic/literal/CallLiteral.java
index 2d0e4e97..d93afdc7 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/CallLiteral.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/literal/CallLiteral.java
@@ -3,15 +3,15 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.literal;
+package tools.refinery.logic.literal;
-import tools.refinery.store.query.Constraint;
+import tools.refinery.logic.Constraint;
-import tools.refinery.store.query.InvalidQueryException;
+import tools.refinery.logic.InvalidQueryException;
-import tools.refinery.store.query.equality.LiteralEqualityHelper;
+import tools.refinery.logic.equality.LiteralEqualityHelper;
-import tools.refinery.store.query.equality.LiteralHashCodeHelper;
+import tools.refinery.logic.equality.LiteralHashCodeHelper;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.ParameterDirection;
+import tools.refinery.logic.term.ParameterDirection;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
 import java.util.*;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/CallPolarity.java b/subprojects/logic/src/main/java/tools/refinery/logic/literal/CallPolarity.java
index 716c7109..4f3bca15 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/CallPolarity.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/literal/CallPolarity.java
@@ -3,9 +3,9 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.literal;
+package tools.refinery.logic.literal;
-import tools.refinery.store.query.InvalidQueryException;
+import tools.refinery.logic.InvalidQueryException;
 public enum CallPolarity {
        POSITIVE(true, false),
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/CanNegate.java b/subprojects/logic/src/main/java/tools/refinery/logic/literal/CanNegate.java
index 35dcb3fb..649f0505 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/CanNegate.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/literal/CanNegate.java
@@ -3,7 +3,7 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.literal;
+package tools.refinery.logic.literal;
 public interface CanNegate<T extends CanNegate<T>> extends Literal {
        T negate();
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/CheckLiteral.java b/subprojects/logic/src/main/java/tools/refinery/logic/literal/CheckLiteral.java
index dfedd2cb..86bf7eba 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/CheckLiteral.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/literal/CheckLiteral.java
@@ -3,17 +3,17 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.literal;
+package tools.refinery.logic.literal;
-import tools.refinery.store.query.InvalidQueryException;
+import tools.refinery.logic.InvalidQueryException;
-import tools.refinery.store.query.equality.LiteralEqualityHelper;
+import tools.refinery.logic.equality.LiteralEqualityHelper;
-import tools.refinery.store.query.equality.LiteralHashCodeHelper;
+import tools.refinery.logic.equality.LiteralHashCodeHelper;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.ConstantTerm;
+import tools.refinery.logic.term.ConstantTerm;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.Term;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
-import tools.refinery.store.query.term.bool.BoolNotTerm;
+import tools.refinery.logic.term.bool.BoolNotTerm;
-import tools.refinery.store.query.term.bool.BoolTerms;
+import tools.refinery.logic.term.bool.BoolTerms;
 import java.util.Collections;
 import java.util.Objects;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/Connectivity.java b/subprojects/logic/src/main/java/tools/refinery/logic/literal/Connectivity.java
index a058094d..c0465716 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/Connectivity.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/literal/Connectivity.java
@@ -3,7 +3,7 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.literal;
+package tools.refinery.logic.literal;
 import java.util.Locale;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/ConstantLiteral.java b/subprojects/logic/src/main/java/tools/refinery/logic/literal/ConstantLiteral.java
index d83bd584..688ddfa0 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/ConstantLiteral.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/literal/ConstantLiteral.java
@@ -3,13 +3,13 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.literal;
+package tools.refinery.logic.literal;
-import tools.refinery.store.query.equality.LiteralEqualityHelper;
+import tools.refinery.logic.equality.LiteralEqualityHelper;
-import tools.refinery.store.query.equality.LiteralHashCodeHelper;
+import tools.refinery.logic.equality.LiteralHashCodeHelper;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.NodeVariable;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
 import java.util.Objects;
 import java.util.Set;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/CountLiteral.java b/subprojects/logic/src/main/java/tools/refinery/logic/literal/CountLiteral.java
index 3d078d89..19879692 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/CountLiteral.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/literal/CountLiteral.java
@@ -3,12 +3,12 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.literal;
+package tools.refinery.logic.literal;
-import tools.refinery.store.query.Constraint;
+import tools.refinery.logic.Constraint;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.logic.term.DataVariable;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
 import java.util.List;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/EquivalenceLiteral.java b/subprojects/logic/src/main/java/tools/refinery/logic/literal/EquivalenceLiteral.java
index 7343f709..48e85b38 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/EquivalenceLiteral.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/literal/EquivalenceLiteral.java
@@ -3,13 +3,13 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.literal;
+package tools.refinery.logic.literal;
-import tools.refinery.store.query.InvalidQueryException;
+import tools.refinery.logic.InvalidQueryException;
-import tools.refinery.store.query.equality.LiteralEqualityHelper;
+import tools.refinery.logic.equality.LiteralEqualityHelper;
-import tools.refinery.store.query.equality.LiteralHashCodeHelper;
+import tools.refinery.logic.equality.LiteralHashCodeHelper;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
 import java.util.Objects;
 import java.util.Set;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/LeftJoinLiteral.java b/subprojects/logic/src/main/java/tools/refinery/logic/literal/LeftJoinLiteral.java
index bdddf120..593904c5 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/LeftJoinLiteral.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/literal/LeftJoinLiteral.java
@@ -3,17 +3,17 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.literal;
+package tools.refinery.logic.literal;
-import tools.refinery.store.query.Constraint;
+import tools.refinery.logic.Constraint;
-import tools.refinery.store.query.InvalidQueryException;
+import tools.refinery.logic.InvalidQueryException;
-import tools.refinery.store.query.equality.LiteralEqualityHelper;
+import tools.refinery.logic.equality.LiteralEqualityHelper;
-import tools.refinery.store.query.equality.LiteralHashCodeHelper;
+import tools.refinery.logic.equality.LiteralHashCodeHelper;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.ConstantTerm;
+import tools.refinery.logic.term.ConstantTerm;
-import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.logic.term.DataVariable;
-import tools.refinery.store.query.term.ParameterDirection;
+import tools.refinery.logic.term.ParameterDirection;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
 import java.util.*;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/Literal.java b/subprojects/logic/src/main/java/tools/refinery/logic/literal/Literal.java
index cb16ab00..08a0241c 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/Literal.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/literal/Literal.java
@@ -3,12 +3,12 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.literal;
+package tools.refinery.logic.literal;
-import tools.refinery.store.query.equality.LiteralEqualityHelper;
+import tools.refinery.logic.equality.LiteralEqualityHelper;
-import tools.refinery.store.query.equality.LiteralHashCodeHelper;
+import tools.refinery.logic.equality.LiteralHashCodeHelper;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
 import java.util.Set;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/Literals.java b/subprojects/logic/src/main/java/tools/refinery/logic/literal/Literals.java
index 6056da45..2f7ddb5d 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/Literals.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/literal/Literals.java
@@ -3,9 +3,9 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.literal;
+package tools.refinery.logic.literal;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.Term;
 public final class Literals {
        private Literals() {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/Reduction.java b/subprojects/logic/src/main/java/tools/refinery/logic/literal/Reduction.java
index ee155a9a..1f7d9a2f 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/Reduction.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/literal/Reduction.java
@@ -3,7 +3,7 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.literal;
+package tools.refinery.logic.literal;
 public enum Reduction {
        /**
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/RepresentativeElectionLiteral.java b/subprojects/logic/src/main/java/tools/refinery/logic/literal/RepresentativeElectionLiteral.java
index f7323947..ff9a6bed 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/literal/RepresentativeElectionLiteral.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/literal/RepresentativeElectionLiteral.java
@@ -3,16 +3,16 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.literal;
+package tools.refinery.logic.literal;
-import tools.refinery.store.query.Constraint;
+import tools.refinery.logic.Constraint;
-import tools.refinery.store.query.InvalidQueryException;
+import tools.refinery.logic.InvalidQueryException;
-import tools.refinery.store.query.equality.LiteralEqualityHelper;
+import tools.refinery.logic.equality.LiteralEqualityHelper;
-import tools.refinery.store.query.equality.LiteralHashCodeHelper;
+import tools.refinery.logic.equality.LiteralHashCodeHelper;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.NodeVariable;
-import tools.refinery.store.query.term.ParameterDirection;
+import tools.refinery.logic.term.ParameterDirection;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
 import java.util.List;
 import java.util.Set;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/rewriter/AbstractRecursiveRewriter.java b/subprojects/logic/src/main/java/tools/refinery/logic/rewriter/AbstractRecursiveRewriter.java
index fb4c14a7..073705f8 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/rewriter/AbstractRecursiveRewriter.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/rewriter/AbstractRecursiveRewriter.java
@@ -3,11 +3,11 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.rewriter;
+package tools.refinery.logic.rewriter;
-import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.logic.dnf.Dnf;
-import tools.refinery.store.query.equality.DnfEqualityChecker;
+import tools.refinery.logic.equality.DnfEqualityChecker;
-import tools.refinery.store.util.CycleDetectingMapper;
+import tools.refinery.logic.util.CycleDetectingMapper;
 public abstract class AbstractRecursiveRewriter implements DnfRewriter {
        private final CycleDetectingMapper<Dnf, Dnf> mapper = new CycleDetectingMapper<>(Dnf::name, this::map);
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/rewriter/ClauseInputParameterResolver.java b/subprojects/logic/src/main/java/tools/refinery/logic/rewriter/ClauseInputParameterResolver.java
index aa06a05a..83fd44c5 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/rewriter/ClauseInputParameterResolver.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/rewriter/ClauseInputParameterResolver.java
@@ -3,14 +3,14 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.rewriter;
+package tools.refinery.logic.rewriter;
-import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.logic.dnf.Dnf;
-import tools.refinery.store.query.dnf.DnfClause;
+import tools.refinery.logic.dnf.DnfClause;
-import tools.refinery.store.query.literal.*;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.term.Variable;
-import tools.refinery.store.query.term.ParameterDirection;
+import tools.refinery.logic.literal.*;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.ParameterDirection;
 import java.util.*;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/rewriter/CompositeRewriter.java b/subprojects/logic/src/main/java/tools/refinery/logic/rewriter/CompositeRewriter.java
index 5b4f65e5..2e681093 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/rewriter/CompositeRewriter.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/rewriter/CompositeRewriter.java
@@ -3,9 +3,9 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.rewriter;
+package tools.refinery.logic.rewriter;
-import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.logic.dnf.Dnf;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/rewriter/DnfRewriter.java b/subprojects/logic/src/main/java/tools/refinery/logic/rewriter/DnfRewriter.java
index 5d8359d1..f4605895 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/rewriter/DnfRewriter.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/rewriter/DnfRewriter.java
@@ -3,11 +3,11 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.rewriter;
+package tools.refinery.logic.rewriter;
-import tools.refinery.store.query.dnf.AnyQuery;
+import tools.refinery.logic.dnf.AnyQuery;
-import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.logic.dnf.Dnf;
-import tools.refinery.store.query.dnf.Query;
+import tools.refinery.logic.dnf.Query;
 @FunctionalInterface
 public interface DnfRewriter {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/rewriter/DuplicateDnfRemover.java b/subprojects/logic/src/main/java/tools/refinery/logic/rewriter/DuplicateDnfRemover.java
index 0c786470..43317338 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/rewriter/DuplicateDnfRemover.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/rewriter/DuplicateDnfRemover.java
@@ -3,14 +3,14 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.rewriter;
+package tools.refinery.logic.rewriter;
-import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.logic.dnf.Dnf;
-import tools.refinery.store.query.dnf.DnfClause;
+import tools.refinery.logic.dnf.DnfClause;
-import tools.refinery.store.query.dnf.Query;
+import tools.refinery.logic.dnf.Query;
-import tools.refinery.store.query.equality.DnfEqualityChecker;
+import tools.refinery.logic.equality.DnfEqualityChecker;
-import tools.refinery.store.query.literal.AbstractCallLiteral;
+import tools.refinery.logic.literal.AbstractCallLiteral;
-import tools.refinery.store.query.literal.Literal;
+import tools.refinery.logic.literal.Literal;
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/rewriter/InputParameterResolver.java b/subprojects/logic/src/main/java/tools/refinery/logic/rewriter/InputParameterResolver.java
index cd8a2e7d..89aa43c7 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/rewriter/InputParameterResolver.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/rewriter/InputParameterResolver.java
@@ -3,13 +3,13 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.rewriter;
+package tools.refinery.logic.rewriter;
-import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.logic.dnf.Dnf;
-import tools.refinery.store.query.dnf.DnfBuilder;
+import tools.refinery.logic.dnf.DnfBuilder;
-import tools.refinery.store.query.literal.Literal;
+import tools.refinery.logic.term.Variable;
-import tools.refinery.store.query.term.ParameterDirection;
+import tools.refinery.logic.literal.Literal;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.ParameterDirection;
 import java.util.HashSet;
 import java.util.List;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/substitution/MapBasedSubstitution.java b/subprojects/logic/src/main/java/tools/refinery/logic/substitution/MapBasedSubstitution.java
index a8201eef..2977bd57 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/substitution/MapBasedSubstitution.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/substitution/MapBasedSubstitution.java
@@ -3,9 +3,9 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.substitution;
+package tools.refinery.logic.substitution;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
 import java.util.Map;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/substitution/RenewingSubstitution.java b/subprojects/logic/src/main/java/tools/refinery/logic/substitution/RenewingSubstitution.java
index 9b737ceb..ca40ee50 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/substitution/RenewingSubstitution.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/substitution/RenewingSubstitution.java
@@ -3,9 +3,9 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.substitution;
+package tools.refinery.logic.substitution;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/substitution/StatelessSubstitution.java b/subprojects/logic/src/main/java/tools/refinery/logic/substitution/StatelessSubstitution.java
index bb3803d3..ab36d3db 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/substitution/StatelessSubstitution.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/substitution/StatelessSubstitution.java
@@ -3,9 +3,9 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.substitution;
+package tools.refinery.logic.substitution;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
 public enum StatelessSubstitution implements Substitution {
        FAILING {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/substitution/Substitution.java b/subprojects/logic/src/main/java/tools/refinery/logic/substitution/Substitution.java
index 834fce12..8fc700bc 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/substitution/Substitution.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/substitution/Substitution.java
@@ -3,11 +3,11 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.substitution;
+package tools.refinery.logic.substitution;
-import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.logic.term.DataVariable;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.NodeVariable;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
 @FunctionalInterface
 public interface Substitution {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/substitution/SubstitutionBuilder.java b/subprojects/logic/src/main/java/tools/refinery/logic/substitution/SubstitutionBuilder.java
index 37fb6908..f30b1a5d 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/substitution/SubstitutionBuilder.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/substitution/SubstitutionBuilder.java
@@ -3,11 +3,11 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.substitution;
+package tools.refinery.logic.substitution;
-import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.logic.term.DataVariable;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.NodeVariable;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/AbstractTerm.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/AbstractTerm.java
index 5cecc35b..293f7e9e 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/AbstractTerm.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/AbstractTerm.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term;
+package tools.refinery.logic.term;
-import tools.refinery.store.query.equality.LiteralEqualityHelper;
+import tools.refinery.logic.equality.LiteralEqualityHelper;
-import tools.refinery.store.query.equality.LiteralHashCodeHelper;
+import tools.refinery.logic.equality.LiteralHashCodeHelper;
 import java.util.Objects;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/Aggregator.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/Aggregator.java
index 0684a9d9..40189ebc 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/Aggregator.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/Aggregator.java
@@ -3,7 +3,7 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term;
+package tools.refinery.logic.term;
 import java.util.stream.Stream;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/AnyDataVariable.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/AnyDataVariable.java
index 3801bc11..3376bdc9 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/AnyDataVariable.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/AnyDataVariable.java
@@ -3,11 +3,11 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term;
+package tools.refinery.logic.term;
 import org.jetbrains.annotations.Nullable;
-import tools.refinery.store.query.InvalidQueryException;
+import tools.refinery.logic.InvalidQueryException;
-import tools.refinery.store.query.equality.LiteralEqualityHelper;
+import tools.refinery.logic.equality.LiteralEqualityHelper;
 import java.util.Optional;
 import java.util.Set;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/AnyTerm.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/AnyTerm.java
index f136b68d..58b4cb1d 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/AnyTerm.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/AnyTerm.java
@@ -3,11 +3,11 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term;
+package tools.refinery.logic.term;
-import tools.refinery.store.query.equality.LiteralEqualityHelper;
+import tools.refinery.logic.equality.LiteralEqualityHelper;
-import tools.refinery.store.query.equality.LiteralHashCodeHelper;
+import tools.refinery.logic.equality.LiteralHashCodeHelper;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
 import java.util.Set;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/AssignedValue.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/AssignedValue.java
index 0cf30aa6..78900cd6 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/AssignedValue.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/AssignedValue.java
@@ -3,9 +3,9 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term;
+package tools.refinery.logic.term;
-import tools.refinery.store.query.literal.Literal;
+import tools.refinery.logic.literal.Literal;
 @FunctionalInterface
 public interface AssignedValue<T> {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/BinaryTerm.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/BinaryTerm.java
index cdbf592a..356fd807 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/BinaryTerm.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/BinaryTerm.java
@@ -3,13 +3,13 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term;
+package tools.refinery.logic.term;
-import tools.refinery.store.query.InvalidQueryException;
+import tools.refinery.logic.equality.LiteralHashCodeHelper;
-import tools.refinery.store.query.equality.LiteralEqualityHelper;
+import tools.refinery.logic.InvalidQueryException;
-import tools.refinery.store.query.equality.LiteralHashCodeHelper;
+import tools.refinery.logic.equality.LiteralEqualityHelper;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.valuation.Valuation;
+import tools.refinery.logic.valuation.Valuation;
 import java.util.Collections;
 import java.util.HashSet;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/ConstantTerm.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/ConstantTerm.java
index 415ae286..69c7e5f6 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/ConstantTerm.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/ConstantTerm.java
@@ -3,13 +3,13 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term;
+package tools.refinery.logic.term;
-import tools.refinery.store.query.InvalidQueryException;
+import tools.refinery.logic.equality.LiteralHashCodeHelper;
-import tools.refinery.store.query.equality.LiteralEqualityHelper;
+import tools.refinery.logic.InvalidQueryException;
-import tools.refinery.store.query.equality.LiteralHashCodeHelper;
+import tools.refinery.logic.equality.LiteralEqualityHelper;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.valuation.Valuation;
+import tools.refinery.logic.valuation.Valuation;
 import java.util.Objects;
 import java.util.Set;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/DataVariable.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/DataVariable.java
index 2206b522..7ef69d05 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/DataVariable.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/DataVariable.java
@@ -3,16 +3,16 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term;
+package tools.refinery.logic.term;
 import org.jetbrains.annotations.Nullable;
-import tools.refinery.store.query.InvalidQueryException;
+import tools.refinery.logic.InvalidQueryException;
-import tools.refinery.store.query.equality.LiteralEqualityHelper;
+import tools.refinery.logic.equality.LiteralEqualityHelper;
-import tools.refinery.store.query.equality.LiteralHashCodeHelper;
+import tools.refinery.logic.equality.LiteralHashCodeHelper;
-import tools.refinery.store.query.literal.EquivalenceLiteral;
+import tools.refinery.logic.literal.EquivalenceLiteral;
-import tools.refinery.store.query.literal.Literal;
+import tools.refinery.logic.literal.Literal;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.valuation.Valuation;
+import tools.refinery.logic.valuation.Valuation;
 import java.util.Objects;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/ExtremeValueAggregator.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/ExtremeValueAggregator.java
index 657cb631..31c61b6a 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/ExtremeValueAggregator.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/ExtremeValueAggregator.java
@@ -3,7 +3,7 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term;
+package tools.refinery.logic.term;
 import java.util.Comparator;
 import java.util.Objects;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/NodeVariable.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/NodeVariable.java
index 53c32e20..1a5f2657 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/NodeVariable.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/NodeVariable.java
@@ -3,12 +3,12 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term;
+package tools.refinery.logic.term;
 import org.jetbrains.annotations.Nullable;
-import tools.refinery.store.query.InvalidQueryException;
+import tools.refinery.logic.InvalidQueryException;
-import tools.refinery.store.query.literal.ConstantLiteral;
+import tools.refinery.logic.literal.ConstantLiteral;
-import tools.refinery.store.query.literal.EquivalenceLiteral;
+import tools.refinery.logic.literal.EquivalenceLiteral;
 import java.util.Optional;
@@ -24,7 +24,7 @@ public final class NodeVariable extends Variable {
        @Override
        public NodeVariable renew(@Nullable String name) {
-                return Variable.of(name);
+                return of(name);
        }
        @Override
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/Parameter.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/Parameter.java
index 577ac6e0..d4a651e1 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/Parameter.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/Parameter.java
@@ -3,7 +3,7 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term;
+package tools.refinery.logic.term;
 import java.util.Objects;
 import java.util.Optional;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/ParameterDirection.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/ParameterDirection.java
index da83f3c3..75ee06e6 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/ParameterDirection.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/ParameterDirection.java
@@ -3,7 +3,7 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term;
+package tools.refinery.logic.term;
 public enum ParameterDirection {
        OUT("out"),
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/StatefulAggregate.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/StatefulAggregate.java
index ab310556..75e7ecff 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/StatefulAggregate.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/StatefulAggregate.java
@@ -3,7 +3,7 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term;
+package tools.refinery.logic.term;
 public interface StatefulAggregate<R, T> {
        void add(T value);
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/StatefulAggregator.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/StatefulAggregator.java
index df746a90..79d32535 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/StatefulAggregator.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/StatefulAggregator.java
@@ -3,7 +3,7 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term;
+package tools.refinery.logic.term;
 import java.util.stream.Stream;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/StatelessAggregator.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/StatelessAggregator.java
index a094919e..37db262e 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/StatelessAggregator.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/StatelessAggregator.java
@@ -3,7 +3,7 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term;
+package tools.refinery.logic.term;
 import java.util.stream.Stream;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/Term.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/Term.java
index e6818b88..0eaa36d8 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/Term.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/Term.java
@@ -3,12 +3,12 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term;
+package tools.refinery.logic.term;
-import tools.refinery.store.query.literal.AssignLiteral;
+import tools.refinery.logic.literal.AssignLiteral;
-import tools.refinery.store.query.literal.Literal;
+import tools.refinery.logic.literal.Literal;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.valuation.Valuation;
+import tools.refinery.logic.valuation.Valuation;
 public non-sealed interface Term<T> extends AnyTerm, AssignedValue<T> {
        @Override
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/UnaryTerm.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/UnaryTerm.java
index a464ece5..e173de3e 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/UnaryTerm.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/UnaryTerm.java
@@ -3,13 +3,13 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term;
+package tools.refinery.logic.term;
-import tools.refinery.store.query.InvalidQueryException;
+import tools.refinery.logic.InvalidQueryException;
-import tools.refinery.store.query.equality.LiteralEqualityHelper;
+import tools.refinery.logic.equality.LiteralEqualityHelper;
-import tools.refinery.store.query.equality.LiteralHashCodeHelper;
+import tools.refinery.logic.equality.LiteralHashCodeHelper;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.valuation.Valuation;
+import tools.refinery.logic.valuation.Valuation;
 import java.util.Objects;
 import java.util.Set;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/Variable.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/Variable.java
index 1b553704..28aad21b 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/Variable.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/Variable.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term;
+package tools.refinery.logic.term;
 import org.jetbrains.annotations.Nullable;
-import tools.refinery.store.query.dnf.DnfUtils;
+import tools.refinery.logic.dnf.DnfUtils;
 import java.util.Objects;
 import java.util.Optional;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/bool/BoolAndTerm.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/bool/BoolAndTerm.java
index f9e1c06f..88c2081b 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/bool/BoolAndTerm.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/bool/BoolAndTerm.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.bool;
+package tools.refinery.logic.term.bool;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.Term;
 public class BoolAndTerm extends BoolBinaryTerm {
        public BoolAndTerm(Term<Boolean> left, Term<Boolean> right) {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/bool/BoolBinaryTerm.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/bool/BoolBinaryTerm.java
index a85aa63a..6d53fb43 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/bool/BoolBinaryTerm.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/bool/BoolBinaryTerm.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.bool;
+package tools.refinery.logic.term.bool;
-import tools.refinery.store.query.term.BinaryTerm;
+import tools.refinery.logic.term.BinaryTerm;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.Term;
 public abstract class BoolBinaryTerm extends BinaryTerm<Boolean, Boolean, Boolean> {
        protected BoolBinaryTerm(Term<Boolean> left, Term<Boolean> right) {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/bool/BoolNotTerm.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/bool/BoolNotTerm.java
index 8d3382b3..ec80484f 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/bool/BoolNotTerm.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/bool/BoolNotTerm.java
@@ -3,11 +3,11 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.bool;
+package tools.refinery.logic.term.bool;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.Term;
-import tools.refinery.store.query.term.UnaryTerm;
+import tools.refinery.logic.term.UnaryTerm;
 public class BoolNotTerm extends UnaryTerm<Boolean, Boolean> {
        protected BoolNotTerm(Term<Boolean> body) {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/bool/BoolOrTerm.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/bool/BoolOrTerm.java
index b5195d52..10c61bf2 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/bool/BoolOrTerm.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/bool/BoolOrTerm.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.bool;
+package tools.refinery.logic.term.bool;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.Term;
 public class BoolOrTerm extends BoolBinaryTerm {
        public BoolOrTerm(Term<Boolean> left, Term<Boolean> right) {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/bool/BoolTerms.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/bool/BoolTerms.java
index fa54f686..5bdc3207 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/bool/BoolTerms.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/bool/BoolTerms.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.bool;
+package tools.refinery.logic.term.bool;
-import tools.refinery.store.query.term.ConstantTerm;
+import tools.refinery.logic.term.ConstantTerm;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.Term;
 public final class BoolTerms {
        private BoolTerms() {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/bool/BoolXorTerm.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/bool/BoolXorTerm.java
index 7478b8a5..3d5247a7 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/bool/BoolXorTerm.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/bool/BoolXorTerm.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.bool;
+package tools.refinery.logic.term.bool;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.Term;
 public class BoolXorTerm extends BoolBinaryTerm {
        public BoolXorTerm(Term<Boolean> left, Term<Boolean> right) {
diff --git a/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/CardinalityDomain.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/cardinalityinterval/CardinalityDomain.java
index 7ae2d935..508a454b 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/CardinalityDomain.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/cardinalityinterval/CardinalityDomain.java
@@ -3,9 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.representation.cardinality;
+package tools.refinery.logic.term.cardinalityinterval;
-import tools.refinery.store.representation.AbstractDomain;
+import tools.refinery.logic.term.uppercardinality.FiniteUpperCardinality;
+import tools.refinery.logic.AbstractDomain;
 import java.util.Optional;
diff --git a/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/CardinalityInterval.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/cardinalityinterval/CardinalityInterval.java
index b20c685a..dbf30def 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/CardinalityInterval.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/cardinalityinterval/CardinalityInterval.java
@@ -3,7 +3,9 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.representation.cardinality;
+package tools.refinery.logic.term.cardinalityinterval;
+import tools.refinery.logic.term.uppercardinality.UpperCardinality;
 public sealed interface CardinalityInterval permits NonEmptyCardinalityInterval, EmptyCardinalityInterval {
        int lowerBound();
diff --git a/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/CardinalityIntervals.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/cardinalityinterval/CardinalityIntervals.java
index 855fd248..cb64cc0d 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/CardinalityIntervals.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/cardinalityinterval/CardinalityIntervals.java
@@ -3,7 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.representation.cardinality;
+package tools.refinery.logic.term.cardinalityinterval;
+import tools.refinery.logic.term.uppercardinality.UpperCardinalities;
+import tools.refinery.logic.term.uppercardinality.UpperCardinality;
 public final class CardinalityIntervals {
        public static final CardinalityInterval NONE = exactly(0);
diff --git a/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/EmptyCardinalityInterval.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/cardinalityinterval/EmptyCardinalityInterval.java
index 9e371e21..29a7f69d 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/EmptyCardinalityInterval.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/cardinalityinterval/EmptyCardinalityInterval.java
@@ -3,7 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.representation.cardinality;
+package tools.refinery.logic.term.cardinalityinterval;
+import tools.refinery.logic.term.uppercardinality.UpperCardinalities;
+import tools.refinery.logic.term.uppercardinality.UpperCardinality;
 // Singleton implementation, because there is only a single empty interval.
 @SuppressWarnings("squid:S6548")
diff --git a/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/NonEmptyCardinalityInterval.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/cardinalityinterval/NonEmptyCardinalityInterval.java
index 6bd66df7..0919fc36 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/NonEmptyCardinalityInterval.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/cardinalityinterval/NonEmptyCardinalityInterval.java
@@ -3,7 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.representation.cardinality;
+package tools.refinery.logic.term.cardinalityinterval;
+import tools.refinery.logic.term.uppercardinality.FiniteUpperCardinality;
+import tools.refinery.logic.term.uppercardinality.UpperCardinality;
 import java.util.Objects;
 import java.util.function.BinaryOperator;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/comparable/ComparisonTerm.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/comparable/ComparisonTerm.java
index 5ca5a0a1..0401f984 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/comparable/ComparisonTerm.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/comparable/ComparisonTerm.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.comparable;
+package tools.refinery.logic.term.comparable;
-import tools.refinery.store.query.term.BinaryTerm;
+import tools.refinery.logic.term.BinaryTerm;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.Term;
 public abstract class ComparisonTerm<T> extends BinaryTerm<Boolean, T, T> {
        protected ComparisonTerm(Class<T> argumentType, Term<T> left, Term<T> right) {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/comparable/EqTerm.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/comparable/EqTerm.java
index b8cf36f8..7a1315e6 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/comparable/EqTerm.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/comparable/EqTerm.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.comparable;
+package tools.refinery.logic.term.comparable;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.Term;
 public class EqTerm<T> extends ComparisonTerm<T> {
        public EqTerm(Class<T> argumentType, Term<T> left, Term<T> right) {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/comparable/GreaterEqTerm.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/comparable/GreaterEqTerm.java
index b109eb1a..38323999 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/comparable/GreaterEqTerm.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/comparable/GreaterEqTerm.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.comparable;
+package tools.refinery.logic.term.comparable;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.Term;
 public class GreaterEqTerm<T extends Comparable<T>> extends ComparisonTerm<T> {
        public GreaterEqTerm(Class<T> argumentType, Term<T> left, Term<T> right) {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/comparable/GreaterTerm.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/comparable/GreaterTerm.java
index 1b67f8b5..7174372e 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/comparable/GreaterTerm.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/comparable/GreaterTerm.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.comparable;
+package tools.refinery.logic.term.comparable;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.Term;
 public class GreaterTerm<T extends Comparable<T>> extends ComparisonTerm<T> {
        public GreaterTerm(Class<T> argumentType, Term<T> left, Term<T> right) {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/comparable/LessEqTerm.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/comparable/LessEqTerm.java
index 1b34535f..7a07b7b2 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/comparable/LessEqTerm.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/comparable/LessEqTerm.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.comparable;
+package tools.refinery.logic.term.comparable;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.Term;
 public class LessEqTerm<T extends Comparable<T>> extends ComparisonTerm<T> {
        public LessEqTerm(Class<T> argumentType, Term<T> left, Term<T> right) {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/comparable/LessTerm.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/comparable/LessTerm.java
index 44e70902..b402f54d 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/comparable/LessTerm.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/comparable/LessTerm.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.comparable;
+package tools.refinery.logic.term.comparable;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.Term;
 public class LessTerm<T extends Comparable<T>> extends ComparisonTerm<T> {
        public LessTerm(Class<T> argumentType, Term<T> left, Term<T> right) {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/comparable/NotEqTerm.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/comparable/NotEqTerm.java
index 1f9734c4..d2c697f4 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/comparable/NotEqTerm.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/comparable/NotEqTerm.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.comparable;
+package tools.refinery.logic.term.comparable;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.Term;
 public class NotEqTerm<T> extends ComparisonTerm<T> {
        public NotEqTerm(Class<T> argumentType, Term<T> left, Term<T> right) {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/int_/IntAddTerm.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/int_/IntAddTerm.java
index dbea3efc..73533d9b 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/int_/IntAddTerm.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/int_/IntAddTerm.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.int_;
+package tools.refinery.logic.term.int_;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.Term;
 public class IntAddTerm extends IntBinaryTerm {
        public IntAddTerm(Term<Integer> left, Term<Integer> right) {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/int_/IntBinaryTerm.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/int_/IntBinaryTerm.java
index 27ced4e4..9543c21f 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/int_/IntBinaryTerm.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/int_/IntBinaryTerm.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.int_;
+package tools.refinery.logic.term.int_;
-import tools.refinery.store.query.term.BinaryTerm;
+import tools.refinery.logic.term.BinaryTerm;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.Term;
 public abstract class IntBinaryTerm extends BinaryTerm<Integer, Integer, Integer> {
        protected IntBinaryTerm(Term<Integer> left, Term<Integer> right) {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/int_/IntDivTerm.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/int_/IntDivTerm.java
index 2a35058c..f9fa70ef 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/int_/IntDivTerm.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/int_/IntDivTerm.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.int_;
+package tools.refinery.logic.term.int_;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.Term;
 public class IntDivTerm extends IntBinaryTerm {
        public IntDivTerm(Term<Integer> left, Term<Integer> right) {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/int_/IntMaxTerm.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/int_/IntMaxTerm.java
index f81fc509..f7b315df 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/int_/IntMaxTerm.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/int_/IntMaxTerm.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.int_;
+package tools.refinery.logic.term.int_;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.Term;
 public class IntMaxTerm extends IntBinaryTerm {
        public IntMaxTerm(Term<Integer> left, Term<Integer> right) {
@@ -15,7 +15,7 @@ public class IntMaxTerm extends IntBinaryTerm {
        @Override
        public Term<Integer> doSubstitute(Substitution substitution, Term<Integer> substitutedLeft,
-                                                                          Term<Integer> substitutedRight) {
+                                      Term<Integer> substitutedRight) {
                return new IntMaxTerm(substitutedLeft, substitutedRight);
        }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/int_/IntMinTerm.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/int_/IntMinTerm.java
index 89182e26..73247db1 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/int_/IntMinTerm.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/int_/IntMinTerm.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.int_;
+package tools.refinery.logic.term.int_;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.Term;
 public class IntMinTerm extends IntBinaryTerm {
        public IntMinTerm(Term<Integer> left, Term<Integer> right) {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/int_/IntMinusTerm.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/int_/IntMinusTerm.java
index 709aa5ba..006e1977 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/int_/IntMinusTerm.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/int_/IntMinusTerm.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.int_;
+package tools.refinery.logic.term.int_;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.Term;
 public class IntMinusTerm extends IntUnaryTerm {
        public IntMinusTerm(Term<Integer> body) {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/int_/IntMulTerm.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/int_/IntMulTerm.java
index 89d4c5f4..18fdcb45 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/int_/IntMulTerm.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/int_/IntMulTerm.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.int_;
+package tools.refinery.logic.term.int_;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.Term;
 public class IntMulTerm extends IntBinaryTerm {
        public IntMulTerm(Term<Integer> left, Term<Integer> right) {
@@ -15,7 +15,7 @@ public class IntMulTerm extends IntBinaryTerm {
        @Override
        public Term<Integer> doSubstitute(Substitution substitution, Term<Integer> substitutedLeft,
-                                                                          Term<Integer> substitutedRight) {
+                                      Term<Integer> substitutedRight) {
                return new IntMulTerm(substitutedLeft, substitutedRight);
        }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/int_/IntPlusTerm.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/int_/IntPlusTerm.java
index aef83bb4..1a905293 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/int_/IntPlusTerm.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/int_/IntPlusTerm.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.int_;
+package tools.refinery.logic.term.int_;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.Term;
 public class IntPlusTerm extends IntUnaryTerm {
        public IntPlusTerm(Term<Integer> body) {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/int_/IntPowTerm.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/int_/IntPowTerm.java
index d5af97a1..dac490b0 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/int_/IntPowTerm.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/int_/IntPowTerm.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.int_;
+package tools.refinery.logic.term.int_;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.Term;
 public class IntPowTerm extends IntBinaryTerm {
        public IntPowTerm(Term<Integer> left, Term<Integer> right) {
@@ -15,7 +15,7 @@ public class IntPowTerm extends IntBinaryTerm {
        @Override
        public Term<Integer> doSubstitute(Substitution substitution, Term<Integer> substitutedLeft,
-                                                                          Term<Integer> substitutedRight) {
+                                      Term<Integer> substitutedRight) {
                return new IntPowTerm(substitutedLeft, substitutedRight);
        }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/int_/IntSubTerm.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/int_/IntSubTerm.java
index 2c27afb1..94326677 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/int_/IntSubTerm.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/int_/IntSubTerm.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.int_;
+package tools.refinery.logic.term.int_;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.Term;
 public class IntSubTerm extends IntBinaryTerm {
        public IntSubTerm(Term<Integer> left, Term<Integer> right) {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/int_/IntSumAggregator.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/int_/IntSumAggregator.java
index cd718c53..b42038ab 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/int_/IntSumAggregator.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/int_/IntSumAggregator.java
@@ -3,9 +3,9 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.int_;
+package tools.refinery.logic.term.int_;
-import tools.refinery.store.query.term.StatelessAggregator;
+import tools.refinery.logic.term.StatelessAggregator;
 public final class IntSumAggregator implements StatelessAggregator<Integer, Integer> {
        public static final IntSumAggregator INSTANCE = new IntSumAggregator();
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/int_/IntTerms.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/int_/IntTerms.java
index acb98b94..b152a138 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/int_/IntTerms.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/int_/IntTerms.java
@@ -3,13 +3,14 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.int_;
+package tools.refinery.logic.term.int_;
-import tools.refinery.store.query.term.Aggregator;
+import tools.refinery.logic.term.Aggregator;
-import tools.refinery.store.query.term.ConstantTerm;
+import tools.refinery.logic.term.ConstantTerm;
-import tools.refinery.store.query.term.ExtremeValueAggregator;
+import tools.refinery.logic.term.ExtremeValueAggregator;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.Term;
-import tools.refinery.store.query.term.comparable.*;
+import tools.refinery.logic.term.comparable.*;
+import tools.refinery.logic.term.comparable.*;
 import java.util.Comparator;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/int_/IntUnaryTerm.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/int_/IntUnaryTerm.java
index 49b4c647..20449e67 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/int_/IntUnaryTerm.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/int_/IntUnaryTerm.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.int_;
+package tools.refinery.logic.term.int_;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.UnaryTerm;
-import tools.refinery.store.query.term.UnaryTerm;
+import tools.refinery.logic.term.Term;
 public abstract class IntUnaryTerm extends UnaryTerm<Integer, Integer> {
        protected IntUnaryTerm(Term<Integer> body) {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/int_/RealToIntTerm.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/int_/RealToIntTerm.java
index 7d383562..7611af90 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/int_/RealToIntTerm.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/int_/RealToIntTerm.java
@@ -3,11 +3,11 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.int_;
+package tools.refinery.logic.term.int_;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.term.Term;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.UnaryTerm;
-import tools.refinery.store.query.term.UnaryTerm;
+import tools.refinery.logic.substitution.Substitution;
 public class RealToIntTerm extends UnaryTerm<Integer, Double> {
        protected RealToIntTerm(Term<Double> body) {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/real/IntToRealTerm.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/real/IntToRealTerm.java
index 2f53117a..23c6893c 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/real/IntToRealTerm.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/real/IntToRealTerm.java
@@ -3,11 +3,11 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.real;
+package tools.refinery.logic.term.real;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.term.UnaryTerm;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.UnaryTerm;
+import tools.refinery.logic.term.Term;
 public class IntToRealTerm extends UnaryTerm<Double, Integer> {
        protected IntToRealTerm(Term<Integer> body) {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/real/RealAddTerm.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/real/RealAddTerm.java
index 33fc9e41..82b97228 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/real/RealAddTerm.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/real/RealAddTerm.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.real;
+package tools.refinery.logic.term.real;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.Term;
 public class RealAddTerm extends RealBinaryTerm {
        public RealAddTerm(Term<Double> left, Term<Double> right) {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/real/RealBinaryTerm.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/real/RealBinaryTerm.java
index 000f3623..3c23e767 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/real/RealBinaryTerm.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/real/RealBinaryTerm.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.real;
+package tools.refinery.logic.term.real;
-import tools.refinery.store.query.term.BinaryTerm;
+import tools.refinery.logic.term.BinaryTerm;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.Term;
 public abstract class RealBinaryTerm extends BinaryTerm<Double, Double, Double> {
        protected RealBinaryTerm(Term<Double> left, Term<Double> right) {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/real/RealDivTerm.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/real/RealDivTerm.java
index 1e55bf42..c22399e3 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/real/RealDivTerm.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/real/RealDivTerm.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.real;
+package tools.refinery.logic.term.real;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.Term;
 public class RealDivTerm extends RealBinaryTerm {
        public RealDivTerm(Term<Double> left, Term<Double> right) {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/real/RealMaxTerm.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/real/RealMaxTerm.java
index 2a249496..0c609c6d 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/real/RealMaxTerm.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/real/RealMaxTerm.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.real;
+package tools.refinery.logic.term.real;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.Term;
 public class RealMaxTerm extends RealBinaryTerm {
        public RealMaxTerm(Term<Double> left, Term<Double> right) {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/real/RealMinTerm.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/real/RealMinTerm.java
index 2eb4cc1e..af2c3a52 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/real/RealMinTerm.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/real/RealMinTerm.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.real;
+package tools.refinery.logic.term.real;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.Term;
 public class RealMinTerm extends RealBinaryTerm {
        public RealMinTerm(Term<Double> left, Term<Double> right) {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/real/RealMinusTerm.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/real/RealMinusTerm.java
index 4afec7a1..e3e371c2 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/real/RealMinusTerm.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/real/RealMinusTerm.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.real;
+package tools.refinery.logic.term.real;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.Term;
 public class RealMinusTerm extends RealUnaryTerm {
        public RealMinusTerm(Term<Double> body) {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/real/RealMulTerm.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/real/RealMulTerm.java
index ec95ac6f..ce8f2cd4 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/real/RealMulTerm.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/real/RealMulTerm.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.real;
+package tools.refinery.logic.term.real;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.Term;
 public class RealMulTerm extends RealBinaryTerm {
        public RealMulTerm(Term<Double> left, Term<Double> right) {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/real/RealPlusTerm.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/real/RealPlusTerm.java
index 64dd2e70..60efc5fd 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/real/RealPlusTerm.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/real/RealPlusTerm.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.real;
+package tools.refinery.logic.term.real;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.Term;
 public class RealPlusTerm extends RealUnaryTerm {
        public RealPlusTerm(Term<Double> body) {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/real/RealPowTerm.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/real/RealPowTerm.java
index 11c952ea..6cb50362 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/real/RealPowTerm.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/real/RealPowTerm.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.real;
+package tools.refinery.logic.term.real;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.Term;
 public class RealPowTerm extends RealBinaryTerm {
        public RealPowTerm(Term<Double> left, Term<Double> right) {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/real/RealSubTerm.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/real/RealSubTerm.java
index 8cc701ed..32315e8e 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/real/RealSubTerm.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/real/RealSubTerm.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.real;
+package tools.refinery.logic.term.real;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.Term;
 public class RealSubTerm extends RealBinaryTerm {
        public RealSubTerm(Term<Double> left, Term<Double> right) {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/real/RealSumAggregator.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/real/RealSumAggregator.java
index d21048e9..4b090188 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/real/RealSumAggregator.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/real/RealSumAggregator.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.real;
+package tools.refinery.logic.term.real;
-import tools.refinery.store.query.term.StatefulAggregate;
+import tools.refinery.logic.term.StatefulAggregate;
-import tools.refinery.store.query.term.StatefulAggregator;
+import tools.refinery.logic.term.StatefulAggregator;
 import java.util.Map;
 import java.util.TreeMap;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/real/RealTerms.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/real/RealTerms.java
index 79220358..07dfa96b 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/real/RealTerms.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/real/RealTerms.java
@@ -3,13 +3,14 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.real;
+package tools.refinery.logic.term.real;
-import tools.refinery.store.query.term.Aggregator;
+import tools.refinery.logic.term.Aggregator;
-import tools.refinery.store.query.term.ConstantTerm;
+import tools.refinery.logic.term.ConstantTerm;
-import tools.refinery.store.query.term.ExtremeValueAggregator;
+import tools.refinery.logic.term.ExtremeValueAggregator;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.Term;
-import tools.refinery.store.query.term.comparable.*;
+import tools.refinery.logic.term.comparable.*;
+import tools.refinery.logic.term.comparable.*;
 import java.util.Comparator;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/real/RealUnaryTerm.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/real/RealUnaryTerm.java
index d41c4ed9..14772411 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/real/RealUnaryTerm.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/real/RealUnaryTerm.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.real;
+package tools.refinery.logic.term.real;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.UnaryTerm;
-import tools.refinery.store.query.term.UnaryTerm;
+import tools.refinery.logic.term.Term;
 public abstract class RealUnaryTerm extends UnaryTerm<Double, Double> {
        protected RealUnaryTerm(Term<Double> body) {
diff --git a/subprojects/store/src/main/java/tools/refinery/store/representation/TruthValue.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/truthvalue/TruthValue.java
index f81ee9a4..bbdd3f97 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/representation/TruthValue.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/truthvalue/TruthValue.java
@@ -3,7 +3,7 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.representation;
+package tools.refinery.logic.term.truthvalue;
 public enum TruthValue {
        TRUE("true"),
diff --git a/subprojects/store/src/main/java/tools/refinery/store/representation/TruthValueDomain.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/truthvalue/TruthValueDomain.java
index 61696dca..443f744f 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/representation/TruthValueDomain.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/truthvalue/TruthValueDomain.java
@@ -3,7 +3,9 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.representation;
+package tools.refinery.logic.term.truthvalue;
+import tools.refinery.logic.AbstractDomain;
 import java.util.Optional;
@@ -64,3 +66,4 @@ public final class TruthValueDomain implements AbstractDomain<TruthValue, Boolea
                return !abstractValue.isConsistent();
        }
 }
diff --git a/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/FiniteUpperCardinality.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/uppercardinality/FiniteUpperCardinality.java
index b63a8637..478d456b 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/FiniteUpperCardinality.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/uppercardinality/FiniteUpperCardinality.java
@@ -3,7 +3,7 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.representation.cardinality;
+package tools.refinery.logic.term.uppercardinality;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/UnboundedUpperCardinality.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/uppercardinality/UnboundedUpperCardinality.java
index 03c701ae..b6ecc1bd 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/UnboundedUpperCardinality.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/uppercardinality/UnboundedUpperCardinality.java
@@ -3,7 +3,7 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.representation.cardinality;
+package tools.refinery.logic.term.uppercardinality;
 import org.jetbrains.annotations.NotNull;
diff --git a/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/UpperCardinalities.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/uppercardinality/UpperCardinalities.java
index 17d1b292..edf0afd2 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/UpperCardinalities.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/uppercardinality/UpperCardinalities.java
@@ -3,7 +3,7 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.representation.cardinality;
+package tools.refinery.logic.term.uppercardinality;
 public final class UpperCardinalities {
        public static final UpperCardinality UNBOUNDED = UnboundedUpperCardinality.INSTANCE;
diff --git a/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/UpperCardinality.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/uppercardinality/UpperCardinality.java
index 3f0db028..5a3dcfb9 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/representation/cardinality/UpperCardinality.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/uppercardinality/UpperCardinality.java
@@ -3,7 +3,7 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.representation.cardinality;
+package tools.refinery.logic.term.uppercardinality;
 import org.jetbrains.annotations.Nullable;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/uppercardinality/UpperCardinalityAddTerm.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/uppercardinality/UpperCardinalityAddTerm.java
index 68905f51..5c849b0a 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/uppercardinality/UpperCardinalityAddTerm.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/uppercardinality/UpperCardinalityAddTerm.java
@@ -3,11 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.uppercardinality;
+package tools.refinery.logic.term.uppercardinality;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.Term;
-import tools.refinery.store.representation.cardinality.UpperCardinality;
 public class UpperCardinalityAddTerm extends UpperCardinalityBinaryTerm {
        protected UpperCardinalityAddTerm(Term<UpperCardinality> left, Term<UpperCardinality> right) {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/uppercardinality/UpperCardinalityBinaryTerm.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/uppercardinality/UpperCardinalityBinaryTerm.java
index 0cf8fe44..976d6115 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/uppercardinality/UpperCardinalityBinaryTerm.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/uppercardinality/UpperCardinalityBinaryTerm.java
@@ -3,11 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.uppercardinality;
+package tools.refinery.logic.term.uppercardinality;
-import tools.refinery.store.query.term.BinaryTerm;
+import tools.refinery.logic.term.BinaryTerm;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.Term;
-import tools.refinery.store.representation.cardinality.UpperCardinality;
 public abstract class UpperCardinalityBinaryTerm extends BinaryTerm<UpperCardinality, UpperCardinality,
                UpperCardinality> {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/uppercardinality/UpperCardinalityMaxTerm.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/uppercardinality/UpperCardinalityMaxTerm.java
index ff75f64e..0a0c5ee4 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/uppercardinality/UpperCardinalityMaxTerm.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/uppercardinality/UpperCardinalityMaxTerm.java
@@ -3,11 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.uppercardinality;
+package tools.refinery.logic.term.uppercardinality;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.Term;
-import tools.refinery.store.representation.cardinality.UpperCardinality;
 public class UpperCardinalityMaxTerm extends UpperCardinalityBinaryTerm {
        protected UpperCardinalityMaxTerm(Term<UpperCardinality> left, Term<UpperCardinality> right) {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/uppercardinality/UpperCardinalityMinTerm.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/uppercardinality/UpperCardinalityMinTerm.java
index 1e89e9f4..d6879595 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/uppercardinality/UpperCardinalityMinTerm.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/uppercardinality/UpperCardinalityMinTerm.java
@@ -3,11 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.uppercardinality;
+package tools.refinery.logic.term.uppercardinality;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.Term;
-import tools.refinery.store.representation.cardinality.UpperCardinality;
 public class UpperCardinalityMinTerm extends UpperCardinalityBinaryTerm {
        protected UpperCardinalityMinTerm(Term<UpperCardinality> left, Term<UpperCardinality> right) {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/uppercardinality/UpperCardinalityMulTerm.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/uppercardinality/UpperCardinalityMulTerm.java
index 3b4970f4..cb0d685f 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/uppercardinality/UpperCardinalityMulTerm.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/uppercardinality/UpperCardinalityMulTerm.java
@@ -3,11 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.uppercardinality;
+package tools.refinery.logic.term.uppercardinality;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.Term;
-import tools.refinery.store.representation.cardinality.UpperCardinality;
 public class UpperCardinalityMulTerm extends UpperCardinalityBinaryTerm {
        protected UpperCardinalityMulTerm(Term<UpperCardinality> left, Term<UpperCardinality> right) {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/uppercardinality/UpperCardinalitySumAggregator.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/uppercardinality/UpperCardinalitySumAggregator.java
index d31f00a2..7c45e6ef 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/uppercardinality/UpperCardinalitySumAggregator.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/uppercardinality/UpperCardinalitySumAggregator.java
@@ -3,15 +3,13 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.uppercardinality;
+package tools.refinery.logic.term.uppercardinality;
-import tools.refinery.store.query.term.StatefulAggregate;
+import tools.refinery.logic.term.StatefulAggregate;
-import tools.refinery.store.query.term.StatefulAggregator;
+import tools.refinery.logic.term.StatefulAggregator;
-import tools.refinery.store.representation.cardinality.FiniteUpperCardinality;
-import tools.refinery.store.representation.cardinality.UnboundedUpperCardinality;
-import tools.refinery.store.representation.cardinality.UpperCardinalities;
-import tools.refinery.store.representation.cardinality.UpperCardinality;
+// Singleton implementation, since there is only one way to aggregate upper cardinalities.
+@SuppressWarnings("squid:S6548")
 public class UpperCardinalitySumAggregator implements StatefulAggregator<UpperCardinality, UpperCardinality> {
        public static final UpperCardinalitySumAggregator INSTANCE = new UpperCardinalitySumAggregator();
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/uppercardinality/UpperCardinalityTerms.java b/subprojects/logic/src/main/java/tools/refinery/logic/term/uppercardinality/UpperCardinalityTerms.java
index 13914f2d..7ec61cac 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/term/uppercardinality/UpperCardinalityTerms.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/term/uppercardinality/UpperCardinalityTerms.java
@@ -3,15 +3,13 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.uppercardinality;
+package tools.refinery.logic.term.uppercardinality;
-import tools.refinery.store.query.term.Aggregator;
+import tools.refinery.logic.term.Aggregator;
-import tools.refinery.store.query.term.ConstantTerm;
+import tools.refinery.logic.term.ConstantTerm;
-import tools.refinery.store.query.term.ExtremeValueAggregator;
+import tools.refinery.logic.term.ExtremeValueAggregator;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.Term;
-import tools.refinery.store.query.term.comparable.*;
+import tools.refinery.logic.term.comparable.*;
-import tools.refinery.store.representation.cardinality.UpperCardinalities;
-import tools.refinery.store.representation.cardinality.UpperCardinality;
 import java.util.Comparator;
diff --git a/subprojects/store/src/main/java/tools/refinery/store/util/CycleDetectingMapper.java b/subprojects/logic/src/main/java/tools/refinery/logic/util/CycleDetectingMapper.java
index 2e302663..8a9efdd6 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/util/CycleDetectingMapper.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/util/CycleDetectingMapper.java
@@ -3,7 +3,7 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.util;
+package tools.refinery.logic.util;
 import java.util.*;
 import java.util.function.Function;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/valuation/MapBasedValuation.java b/subprojects/logic/src/main/java/tools/refinery/logic/valuation/MapBasedValuation.java
index 261ceaa5..be1862d2 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/valuation/MapBasedValuation.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/valuation/MapBasedValuation.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.valuation;
+package tools.refinery.logic.valuation;
-import tools.refinery.store.query.term.AnyDataVariable;
+import tools.refinery.logic.term.AnyDataVariable;
-import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.logic.term.DataVariable;
 import java.util.Map;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/valuation/RestrictedValuation.java b/subprojects/logic/src/main/java/tools/refinery/logic/valuation/RestrictedValuation.java
index fc8406aa..b6ac7cc9 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/valuation/RestrictedValuation.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/valuation/RestrictedValuation.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.valuation;
+package tools.refinery.logic.valuation;
-import tools.refinery.store.query.term.AnyDataVariable;
+import tools.refinery.logic.term.AnyDataVariable;
-import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.logic.term.DataVariable;
 import java.util.Set;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/valuation/SubstitutedValuation.java b/subprojects/logic/src/main/java/tools/refinery/logic/valuation/SubstitutedValuation.java
index 1c14112c..38491481 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/valuation/SubstitutedValuation.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/valuation/SubstitutedValuation.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.valuation;
+package tools.refinery.logic.valuation;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.logic.term.DataVariable;
 public record SubstitutedValuation(Valuation originalValuation, Substitution substitution) implements Valuation {
        @Override
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/valuation/Valuation.java b/subprojects/logic/src/main/java/tools/refinery/logic/valuation/Valuation.java
index 1588e957..95ee887e 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/valuation/Valuation.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/valuation/Valuation.java
@@ -3,12 +3,12 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.valuation;
+package tools.refinery.logic.valuation;
 import org.jetbrains.annotations.Nullable;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.AnyDataVariable;
+import tools.refinery.logic.term.AnyDataVariable;
-import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.logic.term.DataVariable;
 import java.util.Map;
 import java.util.Set;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/valuation/ValuationBuilder.java b/subprojects/logic/src/main/java/tools/refinery/logic/valuation/ValuationBuilder.java
index 7337dbc3..46459ac7 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/valuation/ValuationBuilder.java
+++ b/subprojects/logic/src/main/java/tools/refinery/logic/valuation/ValuationBuilder.java
@@ -3,10 +3,10 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.valuation;
+package tools.refinery.logic.valuation;
-import tools.refinery.store.query.term.AnyDataVariable;
+import tools.refinery.logic.term.AnyDataVariable;
-import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.logic.term.DataVariable;
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/DnfBuilderLiteralEliminationTest.java b/subprojects/logic/src/test/java/tools/refinery/logic/dnf/DnfBuilderLiteralEliminationTest.java
index 6a2dc0c7..d5a9ccad 100644
--- a/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/DnfBuilderLiteralEliminationTest.java
+++ b/subprojects/logic/src/test/java/tools/refinery/logic/dnf/DnfBuilderLiteralEliminationTest.java
@@ -3,30 +3,28 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.dnf;
+package tools.refinery.logic.dnf;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
-import tools.refinery.store.query.literal.BooleanLiteral;
+import tools.refinery.logic.Constraint;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.literal.BooleanLiteral;
-import tools.refinery.store.query.term.ParameterDirection;
+import tools.refinery.logic.term.NodeVariable;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.ParameterDirection;
-import tools.refinery.store.query.term.bool.BoolTerms;
+import tools.refinery.logic.term.Variable;
-import tools.refinery.store.query.view.KeyOnlyView;
+import tools.refinery.logic.term.bool.BoolTerms;
-import tools.refinery.store.query.view.SymbolView;
+import tools.refinery.logic.tests.FakeKeyOnlyView;
-import tools.refinery.store.representation.Symbol;
 import java.util.List;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static tools.refinery.store.query.literal.Literals.check;
+import static tools.refinery.logic.literal.Literals.check;
-import static tools.refinery.store.query.literal.Literals.not;
+import static tools.refinery.logic.literal.Literals.not;
-import static tools.refinery.store.query.tests.QueryMatchers.structurallyEqualTo;
+import static tools.refinery.logic.tests.QueryMatchers.structurallyEqualTo;
 class DnfBuilderLiteralEliminationTest {
-        private final Symbol<Boolean> friend = Symbol.of("friend", 2);
+        private final Constraint friendView = new FakeKeyOnlyView("friend", 2);
-        private final SymbolView<Boolean> friendView = new KeyOnlyView<>(friend);
        private final NodeVariable p = Variable.of("p");
        private final NodeVariable q = Variable.of("q");
        private final Dnf trueDnf = Dnf.builder().parameter(p, ParameterDirection.IN).clause().build();
diff --git a/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/DnfBuilderVariableUnificationTest.java b/subprojects/logic/src/test/java/tools/refinery/logic/dnf/DnfBuilderVariableUnificationTest.java
index fc40c7b3..0e1f77e2 100644
--- a/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/DnfBuilderVariableUnificationTest.java
+++ b/subprojects/logic/src/test/java/tools/refinery/logic/dnf/DnfBuilderVariableUnificationTest.java
@@ -3,25 +3,22 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.dnf;
+package tools.refinery.logic.dnf;
 import org.junit.jupiter.api.Test;
-import tools.refinery.store.query.term.ParameterDirection;
+import tools.refinery.logic.Constraint;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.ParameterDirection;
-import tools.refinery.store.query.view.KeyOnlyView;
+import tools.refinery.logic.term.Variable;
-import tools.refinery.store.query.view.SymbolView;
+import tools.refinery.logic.tests.FakeKeyOnlyView;
-import tools.refinery.store.representation.Symbol;
 import java.util.List;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static tools.refinery.store.query.tests.QueryMatchers.structurallyEqualTo;
+import static tools.refinery.logic.tests.QueryMatchers.structurallyEqualTo;
 class DnfBuilderVariableUnificationTest {
-        private final Symbol<Boolean> friend = Symbol.of("friend", 2);
+        private final Constraint friendView = new FakeKeyOnlyView("friend", 2);
-        private final Symbol<Boolean> children = Symbol.of("children", 2);
+        private final Constraint childrenView = new FakeKeyOnlyView("children", 2);
-        private final SymbolView<Boolean> friendView = new KeyOnlyView<>(friend);
-        private final SymbolView<Boolean> childrenView = new KeyOnlyView<>(children);
        @Test
        void equalToParameterTest() {
diff --git a/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/DnfToDefinitionStringTest.java b/subprojects/logic/src/test/java/tools/refinery/logic/dnf/DnfToDefinitionStringTest.java
index 12cfaa4e..dd624548 100644
--- a/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/DnfToDefinitionStringTest.java
+++ b/subprojects/logic/src/test/java/tools/refinery/logic/dnf/DnfToDefinitionStringTest.java
@@ -1,27 +1,24 @@
 /*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ * SPDX-FileCopyrightText: 2021-2024 The Refinery Authors <https://refinery.tools/>
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.dnf;
+package tools.refinery.logic.dnf;
 import org.junit.jupiter.api.Test;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.Constraint;
-import tools.refinery.store.query.term.ParameterDirection;
+import tools.refinery.logic.term.NodeVariable;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.ParameterDirection;
-import tools.refinery.store.query.view.AnySymbolView;
+import tools.refinery.logic.term.Variable;
-import tools.refinery.store.query.view.KeyOnlyView;
+import tools.refinery.logic.tests.FakeKeyOnlyView;
-import tools.refinery.store.representation.Symbol;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
-import static tools.refinery.store.query.literal.Literals.not;
+import static tools.refinery.logic.literal.Literals.not;
 class DnfToDefinitionStringTest {
-        private static final Symbol<Boolean> person = Symbol.of("person", 1);
+        private static final Constraint personView = new FakeKeyOnlyView("person", 1);
-        private static final Symbol<Boolean> friend = Symbol.of("friend", 2);
+        private static final Constraint friendView = new FakeKeyOnlyView("friend", 2);
-        private static final AnySymbolView personView = new KeyOnlyView<>(person);
-        private static final AnySymbolView friendView = new KeyOnlyView<>(friend);
        private static final NodeVariable p = Variable.of("p");
        private static final NodeVariable q = Variable.of("q");
@@ -61,7 +58,7 @@ class DnfToDefinitionStringTest {
                assertThat(dnf.toDefinitionString(), is("""
                                pred Example(p) <->
-                                    @RelationView("key") friend(p, q).
+                                    friend(p, q).
                                """));
        }
@@ -74,7 +71,7 @@ class DnfToDefinitionStringTest {
                assertThat(dnf.toDefinitionString(), is("""
                                pred Example(in p) <->
-                                    !(@RelationView("key") friend(p, q)).
+                                    !(friend(p, q)).
                                """));
        }
@@ -84,7 +81,7 @@ class DnfToDefinitionStringTest {
                assertThat(dnf.toDefinitionString(), is("""
                                pred Example(p) <->
-                                    @RelationView("key") friend+(p, q).
+                                    friend+(p, q).
                                """));
        }
@@ -94,7 +91,7 @@ class DnfToDefinitionStringTest {
                assertThat(dnf.toDefinitionString(), is("""
                                pred Example(p, q) <->
-                                    @RelationView("key") friend(p, q).
+                                    friend(p, q).
                                """));
        }
@@ -111,9 +108,9 @@ class DnfToDefinitionStringTest {
                assertThat(dnf.toDefinitionString(), is("""
                                pred Example(p) <->
-                                    @RelationView("key") person(p),
+                                    person(p),
-                                    @RelationView("key") person(q),
+                                    person(q),
-                                    @RelationView("key") friend(p, q).
+                                    friend(p, q).
                                """));
        }
@@ -127,9 +124,9 @@ class DnfToDefinitionStringTest {
                assertThat(dnf.toDefinitionString(), is("""
                                pred Example(p) <->
-                                    @RelationView("key") friend(p, q)
+                                    friend(p, q)
                                ;
-                                    @RelationView("key") friend(q, p).
+                                    friend(q, p).
                                """));
        }
@@ -149,8 +146,8 @@ class DnfToDefinitionStringTest {
                assertThat(dnf.toDefinitionString(), is("""
                                pred Example(p) <->
-                                    @RelationView("key") person(p),
+                                    person(p),
-                                    @RelationView("key") person(q),
+                                    person(q),
                                    !(@Dnf Called(p, q)).
                                """));
        }
diff --git a/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/HashCodeTest.java b/subprojects/logic/src/test/java/tools/refinery/logic/dnf/HashCodeTest.java
index 0c8eaeed..e140be1e 100644
--- a/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/HashCodeTest.java
+++ b/subprojects/logic/src/test/java/tools/refinery/logic/dnf/HashCodeTest.java
@@ -3,24 +3,21 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.dnf;
+package tools.refinery.logic.dnf;
 import org.junit.jupiter.api.Test;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.Constraint;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.NodeVariable;
-import tools.refinery.store.query.view.AnySymbolView;
+import tools.refinery.logic.term.Variable;
-import tools.refinery.store.query.view.KeyOnlyView;
+import tools.refinery.logic.tests.FakeKeyOnlyView;
-import tools.refinery.store.representation.Symbol;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
 class HashCodeTest {
-        private static final Symbol<Boolean> person = Symbol.of("Person", 1);
+        private static final Constraint personView = new FakeKeyOnlyView("Person", 1);
-        private static final Symbol<Boolean> friend = Symbol.of("friend", 2);
+        private static final Constraint friendView = new FakeKeyOnlyView("friend", 2);
-        private static final AnySymbolView personView = new KeyOnlyView<>(person);
-        private static final AnySymbolView friendView = new KeyOnlyView<>(friend);
        private static final NodeVariable p = Variable.of("p");
        private static final NodeVariable q = Variable.of("q");
diff --git a/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/TopologicalSortTest.java b/subprojects/logic/src/test/java/tools/refinery/logic/dnf/TopologicalSortTest.java
index 854bd469..8ea27cc9 100644
--- a/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/TopologicalSortTest.java
+++ b/subprojects/logic/src/test/java/tools/refinery/logic/dnf/TopologicalSortTest.java
@@ -3,27 +3,25 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.dnf;
+package tools.refinery.logic.dnf;
 import org.junit.jupiter.api.Test;
-import tools.refinery.store.query.InvalidQueryException;
+import tools.refinery.logic.Constraint;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.InvalidQueryException;
-import tools.refinery.store.query.term.ParameterDirection;
+import tools.refinery.logic.term.NodeVariable;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.ParameterDirection;
-import tools.refinery.store.query.view.AnySymbolView;
+import tools.refinery.logic.term.Variable;
-import tools.refinery.store.query.view.KeyOnlyView;
+import tools.refinery.logic.tests.FakeKeyOnlyView;
-import tools.refinery.store.representation.Symbol;
 import java.util.List;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static tools.refinery.store.query.literal.Literals.not;
+import static tools.refinery.logic.literal.Literals.not;
-import static tools.refinery.store.query.tests.QueryMatchers.structurallyEqualTo;
+import static tools.refinery.logic.tests.QueryMatchers.structurallyEqualTo;
 class TopologicalSortTest {
-        private static final Symbol<Boolean> friend = Symbol.of("friend", 2);
+        private static final Constraint friendView = new FakeKeyOnlyView("friend", 2);
-        private static final AnySymbolView friendView = new KeyOnlyView<>(friend);
        private static final Dnf example = Dnf.of("example", builder -> {
                var a = builder.parameter("a", ParameterDirection.IN);
                var b = builder.parameter("b", ParameterDirection.IN);
diff --git a/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/VariableDirectionTest.java b/subprojects/logic/src/test/java/tools/refinery/logic/dnf/VariableDirectionTest.java
index fc3f5d48..f9f39b8a 100644
--- a/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/VariableDirectionTest.java
+++ b/subprojects/logic/src/test/java/tools/refinery/logic/dnf/VariableDirectionTest.java
@@ -1,23 +1,22 @@
 /*
- * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ * SPDX-FileCopyrightText: 2023-2024 The Refinery Authors <https://refinery.tools/>
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.dnf;
+package tools.refinery.logic.dnf;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
-import tools.refinery.store.query.literal.BooleanLiteral;
+import tools.refinery.logic.Constraint;
-import tools.refinery.store.query.literal.Literal;
+import tools.refinery.logic.literal.BooleanLiteral;
-import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.logic.literal.Literal;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.DataVariable;
-import tools.refinery.store.query.term.ParameterDirection;
+import tools.refinery.logic.term.NodeVariable;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.ParameterDirection;
-import tools.refinery.store.query.view.AnySymbolView;
+import tools.refinery.logic.term.Variable;
-import tools.refinery.store.query.view.FunctionView;
+import tools.refinery.logic.tests.FakeFunctionView;
-import tools.refinery.store.query.view.KeyOnlyView;
+import tools.refinery.logic.tests.FakeKeyOnlyView;
-import tools.refinery.store.representation.Symbol;
 import java.util.ArrayList;
 import java.util.List;
@@ -28,16 +27,13 @@ import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.not;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static tools.refinery.store.query.literal.Literals.not;
+import static tools.refinery.logic.literal.Literals.not;
-import static tools.refinery.store.query.term.int_.IntTerms.INT_SUM;
+import static tools.refinery.logic.term.int_.IntTerms.INT_SUM;
 class VariableDirectionTest {
-        private static final Symbol<Boolean> person = Symbol.of("Person", 1);
+        private static final Constraint personView = new FakeKeyOnlyView("Person", 1);
-        private static final Symbol<Boolean> friend = Symbol.of("friend", 2);
+        private static final Constraint friendView = new FakeKeyOnlyView("friend", 2);
-        private static final Symbol<Integer> age = Symbol.of("age", 1, Integer.class);
+        private static final FakeFunctionView<Integer> ageView = new FakeFunctionView<>("age", 1, Integer.class);
-        private static final AnySymbolView personView = new KeyOnlyView<>(person);
-        private static final AnySymbolView friendView = new KeyOnlyView<>(friend);
-        private static final FunctionView<Integer> ageView = new FunctionView<>(age);
        private static final NodeVariable p = Variable.of("p");
        private static final NodeVariable q = Variable.of("q");
        private static final DataVariable<Integer> x = Variable.of("x", Integer.class);
@@ -57,8 +53,8 @@ class VariableDirectionTest {
                var builder = Dnf.builder().parameter(p, ParameterDirection.IN).clause(clause);
                var dnf = assertDoesNotThrow(builder::build);
                var clauses = dnf.getClauses();
-                if (clauses.size() > 0) {
+                if (!clauses.isEmpty()) {
-                        assertThat(clauses.get(0).positiveVariables(), hasItem(p));
+                        assertThat(clauses.getFirst().positiveVariables(), hasItem(p));
                }
        }
@@ -70,8 +66,8 @@ class VariableDirectionTest {
                var builder = Dnf.builder().clause(clauseWithBinding);
                var dnf = assertDoesNotThrow(builder::build);
                var clauses = dnf.getClauses();
-                if (clauses.size() > 0) {
+                if (!clauses.isEmpty()) {
-                        assertThat(clauses.get(0).positiveVariables(), hasItem(p));
+                        assertThat(clauses.getFirst().positiveVariables(), hasItem(p));
                }
        }
@@ -88,8 +84,8 @@ class VariableDirectionTest {
                var builder = Dnf.builder().clause(clause);
                var dnf = assertDoesNotThrow(builder::build);
                var clauses = dnf.getClauses();
-                if (clauses.size() > 0) {
+                if (!clauses.isEmpty()) {
-                        assertThat(clauses.get(0).positiveVariables(), not(hasItem(p)));
+                        assertThat(clauses.getFirst().positiveVariables(), not(hasItem(p)));
                }
        }
@@ -167,7 +163,7 @@ class VariableDirectionTest {
        void boundPrivateVariableInputTest(Literal literal) {
                var builder = Dnf.builder().clause(personView.call(p), literal);
                var dnf = assertDoesNotThrow(builder::build);
-                assertThat(dnf.getClauses().get(0).positiveVariables(), hasItem(p));
+                assertThat(dnf.getClauses().getFirst().positiveVariables(), hasItem(p));
        }
        static Stream<Arguments> literalsWithRequiredVariableInput() {
@@ -201,7 +197,7 @@ class VariableDirectionTest {
        void boundParameterTest(Literal literal) {
                var builder = Dnf.builder().parameter(p, ParameterDirection.OUT).clause(literal);
                var dnf = assertDoesNotThrow(builder::build);
-                assertThat(dnf.getClauses().get(0).positiveVariables(), hasItem(p));
+                assertThat(dnf.getClauses().getFirst().positiveVariables(), hasItem(p));
        }
        @ParameterizedTest
@@ -209,7 +205,7 @@ class VariableDirectionTest {
        void boundTwiceParameterTest(Literal literal) {
                var builder = Dnf.builder().parameter(p, ParameterDirection.IN).clause(literal);
                var dnf = assertDoesNotThrow(builder::build);
-                assertThat(dnf.getClauses().get(0).positiveVariables(), hasItem(p));
+                assertThat(dnf.getClauses().getFirst().positiveVariables(), hasItem(p));
        }
        @ParameterizedTest
@@ -221,7 +217,7 @@ class VariableDirectionTest {
                                .build();
                var builder = Dnf.builder().clause(dnfWithInput.call(p), literal);
                var dnf = assertDoesNotThrow(builder::build);
-                assertThat(dnf.getClauses().get(0).positiveVariables(), hasItem(p));
+                assertThat(dnf.getClauses().getFirst().positiveVariables(), hasItem(p));
        }
        @ParameterizedTest
@@ -229,7 +225,7 @@ class VariableDirectionTest {
        void boundTwicePrivateVariableOutputTest(Literal literal) {
                var builder = Dnf.builder().clause(personView.call(p), literal);
                var dnf = assertDoesNotThrow(builder::build);
-                assertThat(dnf.getClauses().get(0).positiveVariables(), hasItem(p));
+                assertThat(dnf.getClauses().getFirst().positiveVariables(), hasItem(p));
        }
        static Stream<Arguments> literalsWithVariableOutput() {
diff --git a/subprojects/store-query/src/test/java/tools/refinery/store/query/literal/AggregationLiteralTest.java b/subprojects/logic/src/test/java/tools/refinery/logic/literal/AggregationLiteralTest.java
index ddd57e96..76639e18 100644
--- a/subprojects/store-query/src/test/java/tools/refinery/store/query/literal/AggregationLiteralTest.java
+++ b/subprojects/logic/src/test/java/tools/refinery/logic/literal/AggregationLiteralTest.java
@@ -3,14 +3,14 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.literal;
+package tools.refinery.logic.literal;
 import org.junit.jupiter.api.Test;
-import tools.refinery.store.query.Constraint;
+import tools.refinery.logic.Constraint;
-import tools.refinery.store.query.InvalidQueryException;
+import tools.refinery.logic.InvalidQueryException;
-import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.logic.dnf.Dnf;
-import tools.refinery.store.query.dnf.InvalidClauseException;
+import tools.refinery.logic.dnf.InvalidClauseException;
-import tools.refinery.store.query.term.*;
+import tools.refinery.logic.term.*;
 import java.util.List;
 import java.util.Set;
@@ -19,9 +19,9 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
 import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static tools.refinery.store.query.literal.Literals.not;
+import static tools.refinery.logic.literal.Literals.not;
-import static tools.refinery.store.query.term.int_.IntTerms.INT_SUM;
+import static tools.refinery.logic.term.int_.IntTerms.INT_SUM;
-import static tools.refinery.store.query.term.int_.IntTerms.constant;
+import static tools.refinery.logic.term.int_.IntTerms.constant;
 class AggregationLiteralTest {
        private static final NodeVariable p = Variable.of("p");
diff --git a/subprojects/store-query/src/test/java/tools/refinery/store/query/literal/CallLiteralTest.java b/subprojects/logic/src/test/java/tools/refinery/logic/literal/CallLiteralTest.java
index a01c6586..0fb2e7c9 100644
--- a/subprojects/store-query/src/test/java/tools/refinery/store/query/literal/CallLiteralTest.java
+++ b/subprojects/logic/src/test/java/tools/refinery/logic/literal/CallLiteralTest.java
@@ -3,14 +3,14 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.literal;
+package tools.refinery.logic.literal;
 import org.junit.jupiter.api.Test;
-import tools.refinery.store.query.Constraint;
+import tools.refinery.logic.Constraint;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.NodeVariable;
-import tools.refinery.store.query.term.Parameter;
+import tools.refinery.logic.term.Parameter;
-import tools.refinery.store.query.term.ParameterDirection;
+import tools.refinery.logic.term.ParameterDirection;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
 import java.util.List;
 import java.util.Set;
@@ -19,7 +19,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.empty;
 import static org.junit.jupiter.api.Assertions.assertAll;
-import static tools.refinery.store.query.literal.Literals.not;
+import static tools.refinery.logic.literal.Literals.not;
 class CallLiteralTest {
        private static final NodeVariable p = Variable.of("p");
diff --git a/subprojects/store-query/src/test/java/tools/refinery/store/query/rewriter/DuplicateDnfRemoverTest.java b/subprojects/logic/src/test/java/tools/refinery/logic/rewriter/DuplicateDnfRemoverTest.java
index ebb24ab5..7b2ce8b2 100644
--- a/subprojects/store-query/src/test/java/tools/refinery/store/query/rewriter/DuplicateDnfRemoverTest.java
+++ b/subprojects/logic/src/test/java/tools/refinery/logic/rewriter/DuplicateDnfRemoverTest.java
@@ -3,28 +3,26 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.rewriter;
+package tools.refinery.logic.rewriter;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import tools.refinery.store.query.dnf.Query;
+import tools.refinery.logic.Constraint;
-import tools.refinery.store.query.literal.AbstractCallLiteral;
+import tools.refinery.logic.dnf.Query;
-import tools.refinery.store.query.literal.Reduction;
+import tools.refinery.logic.literal.AbstractCallLiteral;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.literal.Reduction;
-import tools.refinery.store.query.view.AnySymbolView;
+import tools.refinery.logic.term.Variable;
-import tools.refinery.store.query.view.KeyOnlyView;
+import tools.refinery.logic.tests.FakeKeyOnlyView;
-import tools.refinery.store.representation.Symbol;
 import java.util.List;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
-import static tools.refinery.store.query.literal.Literals.not;
+import static tools.refinery.logic.literal.Literals.not;
 class DuplicateDnfRemoverTest {
-        private final static Symbol<Boolean> friend = Symbol.of("friend", 2);
+        private final static Constraint friendView = new FakeKeyOnlyView("friend", 2);
-        private final static AnySymbolView friendView = new KeyOnlyView<>(friend);
        private DuplicateDnfRemover sut;
@@ -116,8 +114,8 @@ class DuplicateDnfRemoverTest {
                assertThat(one, is(oneResult));
                assertThat(oneResult, is(not(twoResult)));
-                var oneCall = (AbstractCallLiteral) oneResult.getDnf().getClauses().get(0).literals().get(0);
+                var oneCall = (AbstractCallLiteral) oneResult.getDnf().getClauses().getFirst().literals().getFirst();
-                var twoCall = (AbstractCallLiteral) twoResult.getDnf().getClauses().get(0).literals().get(0);
+                var twoCall = (AbstractCallLiteral) twoResult.getDnf().getClauses().getFirst().literals().getFirst();
                assertThat(oneCall.getTarget(), is(twoCall.getTarget()));
        }
diff --git a/subprojects/store-query/src/test/java/tools/refinery/store/query/rewriter/InputParameterResolverTest.java b/subprojects/logic/src/test/java/tools/refinery/logic/rewriter/InputParameterResolverTest.java
index ef0077e4..5e5fdb64 100644
--- a/subprojects/store-query/src/test/java/tools/refinery/store/query/rewriter/InputParameterResolverTest.java
+++ b/subprojects/logic/src/test/java/tools/refinery/logic/rewriter/InputParameterResolverTest.java
@@ -3,30 +3,27 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.rewriter;
+package tools.refinery.logic.rewriter;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.logic.Constraint;
-import tools.refinery.store.query.dnf.Query;
+import tools.refinery.logic.dnf.Dnf;
-import tools.refinery.store.query.term.ParameterDirection;
+import tools.refinery.logic.dnf.Query;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.ParameterDirection;
-import tools.refinery.store.query.view.AnySymbolView;
+import tools.refinery.logic.term.Variable;
-import tools.refinery.store.query.view.KeyOnlyView;
+import tools.refinery.logic.tests.FakeKeyOnlyView;
-import tools.refinery.store.representation.Symbol;
 import java.util.List;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
-import static tools.refinery.store.query.literal.Literals.not;
+import static tools.refinery.logic.literal.Literals.not;
-import static tools.refinery.store.query.tests.QueryMatchers.structurallyEqualTo;
+import static tools.refinery.logic.tests.QueryMatchers.structurallyEqualTo;
 class InputParameterResolverTest {
-        private final static Symbol<Boolean> person = Symbol.of("Person", 1);
+        private final static Constraint personView = new FakeKeyOnlyView("Person", 1);
-        private final static Symbol<Boolean> friend = Symbol.of("friend", 2);
+        private final static Constraint friendView = new FakeKeyOnlyView("friend", 2);
-        private final static AnySymbolView personView = new KeyOnlyView<>(person);
-        private final static AnySymbolView friendView = new KeyOnlyView<>(friend);
        private InputParameterResolver sut;
diff --git a/subprojects/store-query/src/test/java/tools/refinery/store/query/term/TermSubstitutionTest.java b/subprojects/logic/src/test/java/tools/refinery/logic/term/TermSubstitutionTest.java
index 1fae2492..52b21692 100644
--- a/subprojects/store-query/src/test/java/tools/refinery/store/query/term/TermSubstitutionTest.java
+++ b/subprojects/logic/src/test/java/tools/refinery/logic/term/TermSubstitutionTest.java
@@ -3,20 +3,20 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term;
+package tools.refinery.logic.term;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
-import tools.refinery.store.query.equality.DnfEqualityChecker;
+import tools.refinery.logic.equality.DnfEqualityChecker;
-import tools.refinery.store.query.equality.SubstitutingLiteralEqualityHelper;
+import tools.refinery.logic.equality.SubstitutingLiteralEqualityHelper;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.bool.BoolTerms;
+import tools.refinery.logic.term.bool.BoolTerms;
-import tools.refinery.store.query.term.int_.IntTerms;
+import tools.refinery.logic.term.int_.IntTerms;
-import tools.refinery.store.query.term.real.RealTerms;
+import tools.refinery.logic.term.real.RealTerms;
-import tools.refinery.store.query.term.uppercardinality.UpperCardinalityTerms;
+import tools.refinery.logic.term.uppercardinality.UpperCardinality;
-import tools.refinery.store.representation.cardinality.UpperCardinality;
+import tools.refinery.logic.term.uppercardinality.UpperCardinalityTerms;
 import java.util.List;
 import java.util.stream.Stream;
diff --git a/subprojects/store-query/src/test/java/tools/refinery/store/query/term/bool/BoolTermsEvaluateTest.java b/subprojects/logic/src/test/java/tools/refinery/logic/term/bool/BoolTermsEvaluateTest.java
index beff705e..7f65591f 100644
--- a/subprojects/store-query/src/test/java/tools/refinery/store/query/term/bool/BoolTermsEvaluateTest.java
+++ b/subprojects/logic/src/test/java/tools/refinery/logic/term/bool/BoolTermsEvaluateTest.java
@@ -3,11 +3,12 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.bool;
+package tools.refinery.logic.term.bool;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
-import tools.refinery.store.query.valuation.Valuation;
+import tools.refinery.logic.term.bool.BoolTerms;
+import tools.refinery.logic.valuation.Valuation;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
diff --git a/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/CardinalityIntervalTest.java b/subprojects/logic/src/test/java/tools/refinery/logic/term/cardinalityinterval/CardinalityIntervalTest.java
index 6a66fa84..ee2dd61c 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/CardinalityIntervalTest.java
+++ b/subprojects/logic/src/test/java/tools/refinery/logic/term/cardinalityinterval/CardinalityIntervalTest.java
@@ -3,18 +3,17 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.representation.cardinality;
+package tools.refinery.logic.term.cardinalityinterval;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
-import tools.refinery.store.representation.cardinality.CardinalityInterval;
 import java.util.stream.Stream;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
-import static tools.refinery.store.representation.cardinality.CardinalityIntervals.*;
+import static tools.refinery.logic.term.cardinalityinterval.CardinalityIntervals.*;
 class CardinalityIntervalTest {
        @ParameterizedTest(name = "min({0}, {1}) == {2}")
diff --git a/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/CardinalityIntervalsTest.java b/subprojects/logic/src/test/java/tools/refinery/logic/term/cardinalityinterval/CardinalityIntervalsTest.java
index 9fe76159..5441c837 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/CardinalityIntervalsTest.java
+++ b/subprojects/logic/src/test/java/tools/refinery/logic/term/cardinalityinterval/CardinalityIntervalsTest.java
@@ -3,14 +3,13 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.representation.cardinality;
+package tools.refinery.logic.term.cardinalityinterval;
 import org.junit.jupiter.api.Test;
-import tools.refinery.store.representation.cardinality.CardinalityIntervals;
+import tools.refinery.logic.term.uppercardinality.UpperCardinalities;
-import tools.refinery.store.representation.cardinality.UpperCardinalities;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.*;
+import static org.hamcrest.Matchers.equalTo;
 class CardinalityIntervalsTest {
        @Test
diff --git a/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/EmptyCardinalityIntervalTest.java b/subprojects/logic/src/test/java/tools/refinery/logic/term/cardinalityinterval/EmptyCardinalityIntervalTest.java
index 24a788a8..0dbc7f61 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/EmptyCardinalityIntervalTest.java
+++ b/subprojects/logic/src/test/java/tools/refinery/logic/term/cardinalityinterval/EmptyCardinalityIntervalTest.java
@@ -3,10 +3,9 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.representation.cardinality;
+package tools.refinery.logic.term.cardinalityinterval;
 import org.junit.jupiter.api.Test;
-import tools.refinery.store.representation.cardinality.CardinalityIntervals;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.lessThan;
diff --git a/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/FiniteCardinalityIntervalTest.java b/subprojects/logic/src/test/java/tools/refinery/logic/term/cardinalityinterval/FiniteCardinalityIntervalTest.java
index 6cf56fae..588b25ab 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/FiniteCardinalityIntervalTest.java
+++ b/subprojects/logic/src/test/java/tools/refinery/logic/term/cardinalityinterval/FiniteCardinalityIntervalTest.java
@@ -3,12 +3,11 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.representation.cardinality;
+package tools.refinery.logic.term.cardinalityinterval;
 import org.junit.jupiter.api.Test;
-import tools.refinery.store.representation.cardinality.NonEmptyCardinalityInterval;
+import tools.refinery.logic.term.uppercardinality.UpperCardinality;
-import tools.refinery.store.representation.cardinality.UpperCardinalities;
+import tools.refinery.logic.term.uppercardinality.UpperCardinalities;
-import tools.refinery.store.representation.cardinality.UpperCardinality;
 import static org.junit.jupiter.api.Assertions.assertThrows;
diff --git a/subprojects/store-query/src/test/java/tools/refinery/store/query/term/int_/IntTermsEvaluateTest.java b/subprojects/logic/src/test/java/tools/refinery/logic/term/int_/IntTermsEvaluateTest.java
index abe50d75..55d9b740 100644
--- a/subprojects/store-query/src/test/java/tools/refinery/store/query/term/int_/IntTermsEvaluateTest.java
+++ b/subprojects/logic/src/test/java/tools/refinery/logic/term/int_/IntTermsEvaluateTest.java
@@ -3,14 +3,15 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.int_;
+package tools.refinery.logic.term.int_;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.CsvSource;
 import org.junit.jupiter.params.provider.MethodSource;
-import tools.refinery.store.query.term.real.RealTerms;
+import tools.refinery.logic.term.int_.IntTerms;
-import tools.refinery.store.query.valuation.Valuation;
+import tools.refinery.logic.term.real.RealTerms;
+import tools.refinery.logic.valuation.Valuation;
 import java.util.stream.Stream;
diff --git a/subprojects/store-query/src/test/java/tools/refinery/store/query/term/real/RealTermEvaluateTest.java b/subprojects/logic/src/test/java/tools/refinery/logic/term/real/RealTermEvaluateTest.java
index 6a8eebf1..042d1807 100644
--- a/subprojects/store-query/src/test/java/tools/refinery/store/query/term/real/RealTermEvaluateTest.java
+++ b/subprojects/logic/src/test/java/tools/refinery/logic/term/real/RealTermEvaluateTest.java
@@ -3,13 +3,14 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.real;
+package tools.refinery.logic.term.real;
 import org.hamcrest.Matcher;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
-import tools.refinery.store.query.term.int_.IntTerms;
+import tools.refinery.logic.term.int_.IntTerms;
-import tools.refinery.store.query.valuation.Valuation;
+import tools.refinery.logic.term.real.RealTerms;
+import tools.refinery.logic.valuation.Valuation;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
diff --git a/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/FiniteUpperCardinalityTest.java b/subprojects/logic/src/test/java/tools/refinery/logic/term/uppercardinality/FiniteUpperCardinalityTest.java
index 7c641c47..8a57f029 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/FiniteUpperCardinalityTest.java
+++ b/subprojects/logic/src/test/java/tools/refinery/logic/term/uppercardinality/FiniteUpperCardinalityTest.java
@@ -3,10 +3,9 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.representation.cardinality;
+package tools.refinery.logic.term.uppercardinality;
 import org.junit.jupiter.api.Test;
-import tools.refinery.store.representation.cardinality.FiniteUpperCardinality;
 import static org.junit.jupiter.api.Assertions.assertThrows;
diff --git a/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/UpperCardinalitiesTest.java b/subprojects/logic/src/test/java/tools/refinery/logic/term/uppercardinality/UpperCardinalitiesTest.java
index e403eec2..bdb6a833 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/UpperCardinalitiesTest.java
+++ b/subprojects/logic/src/test/java/tools/refinery/logic/term/uppercardinality/UpperCardinalitiesTest.java
@@ -3,7 +3,7 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.representation.cardinality;
+package tools.refinery.logic.term.uppercardinality;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
diff --git a/subprojects/store-query/src/test/java/tools/refinery/store/query/term/uppercardinality/UpperCardinalitySumAggregatorStreamTest.java b/subprojects/logic/src/test/java/tools/refinery/logic/term/uppercardinality/UpperCardinalitySumAggregatorStreamTest.java
index 31baf36e..fc8522d4 100644
--- a/subprojects/store-query/src/test/java/tools/refinery/store/query/term/uppercardinality/UpperCardinalitySumAggregatorStreamTest.java
+++ b/subprojects/logic/src/test/java/tools/refinery/logic/term/uppercardinality/UpperCardinalitySumAggregatorStreamTest.java
@@ -3,26 +3,24 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.uppercardinality;
+package tools.refinery.logic.term.uppercardinality;
+import org.hamcrest.Matchers;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
-import tools.refinery.store.representation.cardinality.UpperCardinalities;
-import tools.refinery.store.representation.cardinality.UpperCardinality;
 import java.util.List;
 import java.util.stream.Stream;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
 class UpperCardinalitySumAggregatorStreamTest {
        @ParameterizedTest
        @MethodSource
        void testStream(List<UpperCardinality> list, UpperCardinality expected) {
                var result = UpperCardinalitySumAggregator.INSTANCE.aggregateStream(list.stream());
-                assertThat(result, is(expected));
+                assertThat(result, Matchers.is(expected));
        }
        static Stream<Arguments> testStream() {
diff --git a/subprojects/store-query/src/test/java/tools/refinery/store/query/term/uppercardinality/UpperCardinalitySumAggregatorTest.java b/subprojects/logic/src/test/java/tools/refinery/logic/term/uppercardinality/UpperCardinalitySumAggregatorTest.java
index 780cd0ab..e252b097 100644
--- a/subprojects/store-query/src/test/java/tools/refinery/store/query/term/uppercardinality/UpperCardinalitySumAggregatorTest.java
+++ b/subprojects/logic/src/test/java/tools/refinery/logic/term/uppercardinality/UpperCardinalitySumAggregatorTest.java
@@ -3,16 +3,15 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.uppercardinality;
+package tools.refinery.logic.term.uppercardinality;
+import org.hamcrest.MatcherAssert;
+import org.hamcrest.Matchers;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import tools.refinery.store.query.term.StatefulAggregate;
+import tools.refinery.logic.term.StatefulAggregate;
-import tools.refinery.store.representation.cardinality.UpperCardinalities;
-import tools.refinery.store.representation.cardinality.UpperCardinality;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
 class UpperCardinalitySumAggregatorTest {
        private StatefulAggregate<UpperCardinality, UpperCardinality> accumulator;
@@ -24,33 +23,33 @@ class UpperCardinalitySumAggregatorTest {
        @Test
        void emptyAggregationTest() {
-                assertThat(accumulator.getResult(), is(UpperCardinality.of(0)));
+                MatcherAssert.assertThat(accumulator.getResult(), Matchers.is(UpperCardinality.of(0)));
        }
        @Test
        void singleBoundedTest() {
                accumulator.add(UpperCardinality.of(3));
-                assertThat(accumulator.getResult(), is(UpperCardinality.of(3)));
+                MatcherAssert.assertThat(accumulator.getResult(), Matchers.is(UpperCardinality.of(3)));
        }
        @Test
        void multipleBoundedTest() {
                accumulator.add(UpperCardinality.of(2));
                accumulator.add(UpperCardinality.of(3));
-                assertThat(accumulator.getResult(), is(UpperCardinality.of(5)));
+                MatcherAssert.assertThat(accumulator.getResult(), Matchers.is(UpperCardinality.of(5)));
        }
        @Test
        void singleUnboundedTest() {
                accumulator.add(UpperCardinalities.UNBOUNDED);
-                assertThat(accumulator.getResult(), is(UpperCardinalities.UNBOUNDED));
+                assertThat(accumulator.getResult(), Matchers.is(UpperCardinalities.UNBOUNDED));
        }
        @Test
        void multipleUnboundedTest() {
                accumulator.add(UpperCardinalities.UNBOUNDED);
                accumulator.add(UpperCardinalities.UNBOUNDED);
-                assertThat(accumulator.getResult(), is(UpperCardinalities.UNBOUNDED));
+                assertThat(accumulator.getResult(), Matchers.is(UpperCardinalities.UNBOUNDED));
        }
        @Test
@@ -58,7 +57,7 @@ class UpperCardinalitySumAggregatorTest {
                accumulator.add(UpperCardinality.of(2));
                accumulator.add(UpperCardinality.of(3));
                accumulator.remove(UpperCardinality.of(2));
-                assertThat(accumulator.getResult(), is(UpperCardinality.of(3)));
+                MatcherAssert.assertThat(accumulator.getResult(), Matchers.is(UpperCardinality.of(3)));
        }
        @Test
@@ -66,7 +65,7 @@ class UpperCardinalitySumAggregatorTest {
                accumulator.add(UpperCardinalities.UNBOUNDED);
                accumulator.add(UpperCardinality.of(3));
                accumulator.remove(UpperCardinalities.UNBOUNDED);
-                assertThat(accumulator.getResult(), is(UpperCardinality.of(3)));
+                MatcherAssert.assertThat(accumulator.getResult(), Matchers.is(UpperCardinality.of(3)));
        }
        @Test
@@ -75,6 +74,6 @@ class UpperCardinalitySumAggregatorTest {
                accumulator.add(UpperCardinalities.UNBOUNDED);
                accumulator.add(UpperCardinality.of(3));
                accumulator.remove(UpperCardinalities.UNBOUNDED);
-                assertThat(accumulator.getResult(), is(UpperCardinalities.UNBOUNDED));
+                assertThat(accumulator.getResult(), Matchers.is(UpperCardinalities.UNBOUNDED));
        }
 }
diff --git a/subprojects/store-query/src/test/java/tools/refinery/store/query/term/uppercardinality/UpperCardinalityTermsEvaluateTest.java b/subprojects/logic/src/test/java/tools/refinery/logic/term/uppercardinality/UpperCardinalityTermsEvaluateTest.java
index 9d0f3bde..ab71b716 100644
--- a/subprojects/store-query/src/test/java/tools/refinery/store/query/term/uppercardinality/UpperCardinalityTermsEvaluateTest.java
+++ b/subprojects/logic/src/test/java/tools/refinery/logic/term/uppercardinality/UpperCardinalityTermsEvaluateTest.java
@@ -3,14 +3,13 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.term.uppercardinality;
+package tools.refinery.logic.term.uppercardinality;
+import org.hamcrest.Matchers;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
-import tools.refinery.store.query.valuation.Valuation;
+import tools.refinery.logic.valuation.Valuation;
-import tools.refinery.store.representation.cardinality.UpperCardinalities;
-import tools.refinery.store.representation.cardinality.UpperCardinality;
 import java.util.stream.Stream;
@@ -23,7 +22,7 @@ class UpperCardinalityTermsEvaluateTest {
        void minTest(UpperCardinality a, UpperCardinality b, UpperCardinality expected) {
                var term = UpperCardinalityTerms.min(UpperCardinalityTerms.constant(a), UpperCardinalityTerms.constant(b));
                assertThat(term.getType(), is(UpperCardinality.class));
-                assertThat(term.evaluate(Valuation.empty()), is(expected));
+                assertThat(term.evaluate(Valuation.empty()), Matchers.is(expected));
        }
        static Stream<Arguments> minTest() {
@@ -45,7 +44,7 @@ class UpperCardinalityTermsEvaluateTest {
        void maxTest(UpperCardinality a, UpperCardinality b, UpperCardinality expected) {
                var term = UpperCardinalityTerms.max(UpperCardinalityTerms.constant(a), UpperCardinalityTerms.constant(b));
                assertThat(term.getType(), is(UpperCardinality.class));
-                assertThat(term.evaluate(Valuation.empty()), is(expected));
+                assertThat(term.evaluate(Valuation.empty()), Matchers.is(expected));
        }
        static Stream<Arguments> maxTest() {
@@ -67,7 +66,7 @@ class UpperCardinalityTermsEvaluateTest {
        void addTest(UpperCardinality a, UpperCardinality b, UpperCardinality expected) {
                var term = UpperCardinalityTerms.add(UpperCardinalityTerms.constant(a), UpperCardinalityTerms.constant(b));
                assertThat(term.getType(), is(UpperCardinality.class));
-                assertThat(term.evaluate(Valuation.empty()), is(expected));
+                assertThat(term.evaluate(Valuation.empty()), Matchers.is(expected));
        }
        static Stream<Arguments> addTest() {
@@ -87,7 +86,7 @@ class UpperCardinalityTermsEvaluateTest {
        void mulTest(UpperCardinality a, UpperCardinality b, UpperCardinality expected) {
                var term = UpperCardinalityTerms.mul(UpperCardinalityTerms.constant(a), UpperCardinalityTerms.constant(b));
                assertThat(term.getType(), is(UpperCardinality.class));
-                assertThat(term.evaluate(Valuation.empty()), is(expected));
+                assertThat(term.evaluate(Valuation.empty()), Matchers.is(expected));
        }
        static Stream<Arguments> mulTest() {
diff --git a/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/UpperCardinalityTest.java b/subprojects/logic/src/test/java/tools/refinery/logic/term/uppercardinality/UpperCardinalityTest.java
index 10b4dd20..70cb6695 100644
--- a/subprojects/store/src/test/java/tools/refinery/store/representation/cardinality/UpperCardinalityTest.java
+++ b/subprojects/logic/src/test/java/tools/refinery/logic/term/uppercardinality/UpperCardinalityTest.java
@@ -3,13 +3,11 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.representation.cardinality;
+package tools.refinery.logic.term.uppercardinality;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
-import tools.refinery.store.representation.cardinality.UpperCardinalities;
-import tools.refinery.store.representation.cardinality.UpperCardinality;
 import java.util.stream.Stream;
diff --git a/subprojects/logic/src/test/java/tools/refinery/logic/tests/FakeFunctionView.java b/subprojects/logic/src/test/java/tools/refinery/logic/tests/FakeFunctionView.java
new file mode 100644
index 00000000..4a55f561
--- /dev/null
+++ b/subprojects/logic/src/test/java/tools/refinery/logic/tests/FakeFunctionView.java
@@ -0,0 +1,57 @@
+/*
+ * SPDX-FileCopyrightText: 2024 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.logic.tests;
+import tools.refinery.logic.Constraint;
+import tools.refinery.logic.term.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+public record FakeFunctionView<T>(String name, int keyArity, Class<T> valueType) implements Constraint {
+        @Override
+        public int arity() {
+                return keyArity + 1;
+        }
+        @Override
+        public List<Parameter> getParameters() {
+                var parameters = new Parameter[keyArity + 1];
+                Arrays.fill(parameters, Parameter.NODE_OUT);
+                parameters[keyArity] = new Parameter(valueType, ParameterDirection.OUT);
+                return List.of(parameters);
+        }
+        public <R> AssignedValue<R> aggregate(Aggregator<R, T> aggregator, List<NodeVariable> arguments) {
+                return targetVariable -> {
+                        var placeholderVariable = Variable.of(valueType);
+                        var argumentsWithPlaceholder = new ArrayList<Variable>(arguments.size() + 1);
+                        argumentsWithPlaceholder.addAll(arguments);
+                        argumentsWithPlaceholder.add(placeholderVariable);
+                        return aggregateBy(placeholderVariable, aggregator, argumentsWithPlaceholder).toLiteral(targetVariable);
+                };
+        }
+        public <R> AssignedValue<R> aggregate(Aggregator<R, T> aggregator, NodeVariable... arguments) {
+                return aggregate(aggregator, List.of(arguments));
+        }
+        public AssignedValue<T> leftJoin(T defaultValue, List<NodeVariable> arguments) {
+                return targetVariable -> {
+                        var placeholderVariable = Variable.of(valueType);
+                        var argumentsWithPlaceholder = new ArrayList<Variable>(arguments.size() + 1);
+                        argumentsWithPlaceholder.addAll(arguments);
+                        argumentsWithPlaceholder.add(placeholderVariable);
+                        return leftJoinBy(placeholderVariable, defaultValue, argumentsWithPlaceholder).toLiteral(targetVariable);
+                };
+        }
+        public AssignedValue<T> leftJoin(T defaultValue, NodeVariable... arguments) {
+                return leftJoin(defaultValue, List.of(arguments));
+        }
+}
diff --git a/subprojects/logic/src/test/java/tools/refinery/logic/tests/FakeKeyOnlyView.java b/subprojects/logic/src/test/java/tools/refinery/logic/tests/FakeKeyOnlyView.java
new file mode 100644
index 00000000..7e09ddab
--- /dev/null
+++ b/subprojects/logic/src/test/java/tools/refinery/logic/tests/FakeKeyOnlyView.java
@@ -0,0 +1,21 @@
+/*
+ * SPDX-FileCopyrightText: 2024 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.logic.tests;
+import tools.refinery.logic.Constraint;
+import tools.refinery.logic.term.Parameter;
+import java.util.Arrays;
+import java.util.List;
+public record FakeKeyOnlyView(String name, int arity) implements Constraint {
+        @Override
+        public List<Parameter> getParameters() {
+                var parameters = new Parameter[arity];
+                Arrays.fill(parameters, Parameter.NODE_OUT);
+                return List.of(parameters);
+        }
+}
diff --git a/subprojects/store-query/src/test/java/tools/refinery/store/query/tests/StructurallyEqualToRawTest.java b/subprojects/logic/src/test/java/tools/refinery/logic/tests/StructurallyEqualToRawTest.java
index d447e99c..52a22ce1 100644
--- a/subprojects/store-query/src/test/java/tools/refinery/store/query/tests/StructurallyEqualToRawTest.java
+++ b/subprojects/logic/src/test/java/tools/refinery/logic/tests/StructurallyEqualToRawTest.java
@@ -3,17 +3,15 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.tests;
+package tools.refinery.logic.tests;
 import org.junit.jupiter.api.Test;
-import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.logic.Constraint;
-import tools.refinery.store.query.dnf.SymbolicParameter;
+import tools.refinery.logic.dnf.Dnf;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.dnf.SymbolicParameter;
-import tools.refinery.store.query.term.ParameterDirection;
+import tools.refinery.logic.term.NodeVariable;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.ParameterDirection;
-import tools.refinery.store.query.view.AnySymbolView;
+import tools.refinery.logic.term.Variable;
-import tools.refinery.store.query.view.KeyOnlyView;
-import tools.refinery.store.representation.Symbol;
 import java.util.List;
@@ -21,13 +19,11 @@ import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.allOf;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static tools.refinery.store.query.tests.QueryMatchers.structurallyEqualTo;
+import static tools.refinery.logic.tests.QueryMatchers.structurallyEqualTo;
 class StructurallyEqualToRawTest {
-        private static final Symbol<Boolean> person = Symbol.of("Person", 1);
+        private static final Constraint personView = new FakeKeyOnlyView("Person", 1);
-        private static final Symbol<Boolean> friend = Symbol.of("friend", 2);
+        private static final Constraint friendView = new FakeKeyOnlyView("friend", 2);
-        private static final AnySymbolView personView = new KeyOnlyView<>(person);
-        private static final AnySymbolView friendView = new KeyOnlyView<>(friend);
        private static final NodeVariable p = Variable.of("p");
        private static final NodeVariable q = Variable.of("q");
diff --git a/subprojects/store-query/src/test/java/tools/refinery/store/query/tests/StructurallyEqualToTest.java b/subprojects/logic/src/test/java/tools/refinery/logic/tests/StructurallyEqualToTest.java
index f716b805..663b115a 100644
--- a/subprojects/store-query/src/test/java/tools/refinery/store/query/tests/StructurallyEqualToTest.java
+++ b/subprojects/logic/src/test/java/tools/refinery/logic/tests/StructurallyEqualToTest.java
@@ -3,27 +3,23 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.tests;
+package tools.refinery.logic.tests;
 import org.junit.jupiter.api.Test;
-import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.logic.Constraint;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.dnf.Dnf;
-import tools.refinery.store.query.term.ParameterDirection;
+import tools.refinery.logic.term.NodeVariable;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.ParameterDirection;
-import tools.refinery.store.query.view.AnySymbolView;
+import tools.refinery.logic.term.Variable;
-import tools.refinery.store.query.view.KeyOnlyView;
-import tools.refinery.store.representation.Symbol;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static tools.refinery.store.query.tests.QueryMatchers.structurallyEqualTo;
+import static tools.refinery.logic.tests.QueryMatchers.structurallyEqualTo;
 class StructurallyEqualToTest {
-        private static final Symbol<Boolean> person = Symbol.of("Person", 1);
+        private static final Constraint personView = new FakeKeyOnlyView("Person", 1);
-        private static final Symbol<Boolean> friend = Symbol.of("friend", 2);
+        private static final Constraint friendView = new FakeKeyOnlyView("friend", 2);
-        private static final AnySymbolView personView = new KeyOnlyView<>(person);
-        private static final AnySymbolView friendView = new KeyOnlyView<>(friend);
        private static final NodeVariable p = Variable.of("p");
        private static final NodeVariable q = Variable.of("q");
diff --git a/subprojects/store-query/src/testFixtures/java/tools/refinery/store/query/tests/MismatchDescribingDnfEqualityChecker.java b/subprojects/logic/src/testFixtures/java/tools/refinery/logic/tests/MismatchDescribingDnfEqualityChecker.java
index 6a3301b3..aa73baec 100644
--- a/subprojects/store-query/src/testFixtures/java/tools/refinery/store/query/tests/MismatchDescribingDnfEqualityChecker.java
+++ b/subprojects/logic/src/testFixtures/java/tools/refinery/logic/tests/MismatchDescribingDnfEqualityChecker.java
@@ -3,13 +3,13 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.tests;
+package tools.refinery.logic.tests;
 import org.hamcrest.Description;
-import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.logic.dnf.Dnf;
-import tools.refinery.store.query.dnf.SymbolicParameter;
+import tools.refinery.logic.dnf.SymbolicParameter;
-import tools.refinery.store.query.equality.DeepDnfEqualityChecker;
+import tools.refinery.logic.equality.DeepDnfEqualityChecker;
-import tools.refinery.store.query.literal.Literal;
+import tools.refinery.logic.literal.Literal;
 import java.util.List;
diff --git a/subprojects/store-query/src/testFixtures/java/tools/refinery/store/query/tests/QueryMatchers.java b/subprojects/logic/src/testFixtures/java/tools/refinery/logic/tests/QueryMatchers.java
index cd449a6a..40332a8c 100644
--- a/subprojects/store-query/src/testFixtures/java/tools/refinery/store/query/tests/QueryMatchers.java
+++ b/subprojects/logic/src/testFixtures/java/tools/refinery/logic/tests/QueryMatchers.java
@@ -3,12 +3,12 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.tests;
+package tools.refinery.logic.tests;
 import org.hamcrest.Matcher;
-import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.logic.dnf.Dnf;
-import tools.refinery.store.query.dnf.SymbolicParameter;
+import tools.refinery.logic.dnf.SymbolicParameter;
-import tools.refinery.store.query.literal.Literal;
+import tools.refinery.logic.literal.Literal;
 import java.util.List;
diff --git a/subprojects/store-query/src/testFixtures/java/tools/refinery/store/query/tests/StructurallyEqualTo.java b/subprojects/logic/src/testFixtures/java/tools/refinery/logic/tests/StructurallyEqualTo.java
index 86149141..257e6850 100644
--- a/subprojects/store-query/src/testFixtures/java/tools/refinery/store/query/tests/StructurallyEqualTo.java
+++ b/subprojects/logic/src/testFixtures/java/tools/refinery/logic/tests/StructurallyEqualTo.java
@@ -3,12 +3,12 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.tests;
+package tools.refinery.logic.tests;
 import org.hamcrest.Description;
 import org.hamcrest.TypeSafeMatcher;
-import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.logic.dnf.Dnf;
-import tools.refinery.store.query.equality.DeepDnfEqualityChecker;
+import tools.refinery.logic.equality.DeepDnfEqualityChecker;
 public class StructurallyEqualTo extends TypeSafeMatcher<Dnf> {
        private final Dnf expected;
diff --git a/subprojects/store-query/src/testFixtures/java/tools/refinery/store/query/tests/StructurallyEqualToRaw.java b/subprojects/logic/src/testFixtures/java/tools/refinery/logic/tests/StructurallyEqualToRaw.java
index 2f8c2944..944ab1ac 100644
--- a/subprojects/store-query/src/testFixtures/java/tools/refinery/store/query/tests/StructurallyEqualToRaw.java
+++ b/subprojects/logic/src/testFixtures/java/tools/refinery/logic/tests/StructurallyEqualToRaw.java
@@ -3,14 +3,14 @@
 *
 * SPDX-License-Identifier: EPL-2.0
 */
-package tools.refinery.store.query.tests;
+package tools.refinery.logic.tests;
 import org.hamcrest.Description;
 import org.hamcrest.TypeSafeMatcher;
-import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.logic.dnf.Dnf;
-import tools.refinery.store.query.dnf.SymbolicParameter;
+import tools.refinery.logic.dnf.SymbolicParameter;
-import tools.refinery.store.query.equality.DeepDnfEqualityChecker;
+import tools.refinery.logic.equality.DeepDnfEqualityChecker;
-import tools.refinery.store.query.literal.Literal;
+import tools.refinery.logic.literal.Literal;
 import java.util.List;
diff --git a/subprojects/store-dse-visualization/src/main/java/tools/refinery/visualization/internal/ModelVisualizerAdapterImpl.java b/subprojects/store-dse-visualization/src/main/java/tools/refinery/visualization/internal/ModelVisualizerAdapterImpl.java
index ef10dd30..5d0a3292 100644
--- a/subprojects/store-dse-visualization/src/main/java/tools/refinery/visualization/internal/ModelVisualizerAdapterImpl.java
+++ b/subprojects/store-dse-visualization/src/main/java/tools/refinery/visualization/internal/ModelVisualizerAdapterImpl.java
@@ -11,7 +11,7 @@ import tools.refinery.store.map.Version;
 import tools.refinery.store.model.Interpretation;
 import tools.refinery.store.model.Model;
 import tools.refinery.store.representation.AnySymbol;
-import tools.refinery.store.representation.TruthValue;
+import tools.refinery.logic.term.truthvalue.TruthValue;
 import tools.refinery.store.tuple.Tuple;
 import tools.refinery.visualization.ModelVisualizerAdapter;
 import tools.refinery.visualization.ModelVisualizerStoreAdapter;
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/modification/actions/CreateActionLiteral.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/modification/actions/CreateActionLiteral.java
index 5b86a5e1..a6c58381 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/modification/actions/CreateActionLiteral.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/modification/actions/CreateActionLiteral.java
@@ -9,7 +9,7 @@ import tools.refinery.store.dse.modification.ModificationAdapter;
 import tools.refinery.store.dse.transition.actions.AbstractActionLiteral;
 import tools.refinery.store.dse.transition.actions.BoundActionLiteral;
 import tools.refinery.store.model.Model;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.NodeVariable;
 import java.util.List;
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/modification/actions/DeleteActionLiteral.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/modification/actions/DeleteActionLiteral.java
index 18ad2b9d..e13e9c11 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/modification/actions/DeleteActionLiteral.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/modification/actions/DeleteActionLiteral.java
@@ -10,7 +10,7 @@ import tools.refinery.store.dse.modification.ModificationAdapter;
 import tools.refinery.store.dse.transition.actions.AbstractActionLiteral;
 import tools.refinery.store.dse.transition.actions.BoundActionLiteral;
 import tools.refinery.store.model.Model;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.NodeVariable;
 import tools.refinery.store.tuple.Tuple;
 import java.util.List;
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/modification/actions/ModificationActionLiterals.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/modification/actions/ModificationActionLiterals.java
index 31f50ac7..4de482f0 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/modification/actions/ModificationActionLiterals.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/modification/actions/ModificationActionLiterals.java
@@ -6,7 +6,7 @@
 package tools.refinery.store.dse.modification.actions;
 import tools.refinery.store.dse.modification.DanglingEdges;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.NodeVariable;
 public class ModificationActionLiterals {
        private ModificationActionLiterals() {
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/Rule.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/Rule.java
index ff45ed3e..14a9c556 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/Rule.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/Rule.java
@@ -9,7 +9,7 @@ import tools.refinery.store.dse.transition.actions.Action;
 import tools.refinery.store.dse.transition.actions.BoundAction;
 import tools.refinery.store.dse.transition.callback.*;
 import tools.refinery.store.model.Model;
-import tools.refinery.store.query.dnf.RelationalQuery;
+import tools.refinery.logic.dnf.RelationalQuery;
 public class Rule {
        private final String name;
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/RuleBuilder.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/RuleBuilder.java
index 865ac369..c2e43e0d 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/RuleBuilder.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/RuleBuilder.java
@@ -8,9 +8,9 @@ package tools.refinery.store.dse.transition;
 import tools.refinery.store.dse.transition.actions.Action;
 import tools.refinery.store.dse.transition.actions.ActionLiteral;
 import tools.refinery.store.dse.transition.callback.*;
-import tools.refinery.store.query.dnf.AbstractQueryBuilder;
+import tools.refinery.logic.dnf.AbstractQueryBuilder;
-import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.logic.dnf.Dnf;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
 import java.util.List;
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/Action.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/Action.java
index d63ddfdd..0ce0c3a4 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/Action.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/Action.java
@@ -9,9 +9,9 @@ import org.eclipse.collections.api.factory.primitive.ObjectIntMaps;
 import org.eclipse.collections.api.map.primitive.MutableObjectIntMap;
 import org.jetbrains.annotations.Nullable;
 import tools.refinery.store.model.Model;
-import tools.refinery.store.query.dnf.RelationalQuery;
+import tools.refinery.logic.dnf.RelationalQuery;
-import tools.refinery.store.query.dnf.SymbolicParameter;
+import tools.refinery.logic.dnf.SymbolicParameter;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.NodeVariable;
 import java.util.*;
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/ActionLiteral.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/ActionLiteral.java
index a721ef73..86b4e3cd 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/ActionLiteral.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/ActionLiteral.java
@@ -6,7 +6,7 @@
 package tools.refinery.store.dse.transition.actions;
 import tools.refinery.store.model.Model;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.NodeVariable;
 import java.util.List;
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/ActionLiterals.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/ActionLiterals.java
index 275e1e25..d06e2479 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/ActionLiterals.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/ActionLiterals.java
@@ -5,7 +5,7 @@
 */
 package tools.refinery.store.dse.transition.actions;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.NodeVariable;
 import tools.refinery.store.representation.Symbol;
 import java.util.List;
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/PutActionLiteral.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/PutActionLiteral.java
index 86288921..6657b157 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/PutActionLiteral.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/actions/PutActionLiteral.java
@@ -6,7 +6,7 @@
 package tools.refinery.store.dse.transition.actions;
 import tools.refinery.store.model.Model;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.NodeVariable;
 import tools.refinery.store.representation.Symbol;
 import tools.refinery.store.tuple.Tuple;
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/ActionCallback1.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/ActionCallback1.java
index 869f1a96..7e1dd5b7 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/ActionCallback1.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/ActionCallback1.java
@@ -6,7 +6,7 @@
 package tools.refinery.store.dse.transition.callback;
 import tools.refinery.store.dse.transition.actions.ActionLiteral;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.NodeVariable;
 import java.util.List;
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/ActionCallback2.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/ActionCallback2.java
index a648fc93..1361482d 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/ActionCallback2.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/ActionCallback2.java
@@ -6,7 +6,7 @@
 package tools.refinery.store.dse.transition.callback;
 import tools.refinery.store.dse.transition.actions.ActionLiteral;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.NodeVariable;
 import java.util.List;
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/ActionCallback3.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/ActionCallback3.java
index a9b1d334..870ba088 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/ActionCallback3.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/ActionCallback3.java
@@ -6,7 +6,7 @@
 package tools.refinery.store.dse.transition.callback;
 import tools.refinery.store.dse.transition.actions.ActionLiteral;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.NodeVariable;
 import java.util.List;
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/ActionCallback4.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/ActionCallback4.java
index aef1351c..46c056ef 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/ActionCallback4.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/ActionCallback4.java
@@ -6,7 +6,7 @@
 package tools.refinery.store.dse.transition.callback;
 import tools.refinery.store.dse.transition.actions.ActionLiteral;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.NodeVariable;
 import java.util.List;
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/RuleCallback1.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/RuleCallback1.java
index bd7bf4f5..603500ae 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/RuleCallback1.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/RuleCallback1.java
@@ -6,7 +6,7 @@
 package tools.refinery.store.dse.transition.callback;
 import tools.refinery.store.dse.transition.RuleBuilder;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.NodeVariable;
 @FunctionalInterface
 public interface RuleCallback1 {
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/RuleCallback2.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/RuleCallback2.java
index 7b02b68a..88d3e43c 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/RuleCallback2.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/RuleCallback2.java
@@ -6,7 +6,7 @@
 package tools.refinery.store.dse.transition.callback;
 import tools.refinery.store.dse.transition.RuleBuilder;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.NodeVariable;
 @FunctionalInterface
 public interface RuleCallback2 {
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/RuleCallback3.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/RuleCallback3.java
index 6f112d48..d4d35e19 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/RuleCallback3.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/RuleCallback3.java
@@ -6,7 +6,7 @@
 package tools.refinery.store.dse.transition.callback;
 import tools.refinery.store.dse.transition.RuleBuilder;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.NodeVariable;
 @FunctionalInterface
 public interface RuleCallback3 {
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/RuleCallback4.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/RuleCallback4.java
index dbcf8567..67690169 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/RuleCallback4.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/callback/RuleCallback4.java
@@ -6,7 +6,7 @@
 package tools.refinery.store.dse.transition.callback;
 import tools.refinery.store.dse.transition.RuleBuilder;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.NodeVariable;
 @FunctionalInterface
 public interface RuleCallback4 {
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/AndCriterion.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/AndCriterion.java
index 0ad2b7a4..2a02ff14 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/AndCriterion.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/AndCriterion.java
@@ -5,9 +5,9 @@
 */
 package tools.refinery.store.dse.transition.objectives;
+import tools.refinery.logic.literal.Reduction;
 import tools.refinery.store.model.Model;
 import tools.refinery.store.model.ModelStore;
-import tools.refinery.store.query.literal.Reduction;
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/CompositeCriterion.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/CompositeCriterion.java
index 5746cc7e..1f2defab 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/CompositeCriterion.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/CompositeCriterion.java
@@ -5,11 +5,11 @@
 */
 package tools.refinery.store.dse.transition.objectives;
-import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.model.ModelStoreBuilder;
-import tools.refinery.store.query.literal.Reduction;
-import java.util.*;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
 public abstract sealed class CompositeCriterion implements Criterion permits AndCriterion, OrCriterion {
        private final List<Criterion> criteria;
@@ -32,9 +32,6 @@ public abstract sealed class CompositeCriterion implements Criterion permits And
        }
        @Override
-        public abstract Reduction getReduction(ModelStore store);
-        @Override
        public void configure(ModelStoreBuilder storeBuilder) {
                for (var criterion : criteria) {
                        criterion.configure(storeBuilder);
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/CountObjective.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/CountObjective.java
index fbd05ded..f9fe1459 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/CountObjective.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/CountObjective.java
@@ -5,14 +5,14 @@
 */
 package tools.refinery.store.dse.transition.objectives;
+import tools.refinery.logic.dnf.RelationalQuery;
+import tools.refinery.logic.literal.Reduction;
 import tools.refinery.store.model.Model;
 import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.model.ModelStoreBuilder;
 import tools.refinery.store.query.ModelQueryAdapter;
 import tools.refinery.store.query.ModelQueryBuilder;
 import tools.refinery.store.query.ModelQueryStoreAdapter;
-import tools.refinery.store.query.dnf.RelationalQuery;
-import tools.refinery.store.query.literal.Reduction;
 public class CountObjective implements Objective {
        private final RelationalQuery query;
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/Criteria.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/Criteria.java
index 0e4ec5c9..7d4c97ad 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/Criteria.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/Criteria.java
@@ -5,7 +5,7 @@
 */
 package tools.refinery.store.dse.transition.objectives;
-import tools.refinery.store.query.dnf.AnyQuery;
+import tools.refinery.logic.dnf.AnyQuery;
 import java.util.Collection;
 import java.util.List;
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/Criterion.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/Criterion.java
index c827f20e..da6b2102 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/Criterion.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/Criterion.java
@@ -5,10 +5,10 @@
 */
 package tools.refinery.store.dse.transition.objectives;
+import tools.refinery.logic.literal.Reduction;
 import tools.refinery.store.model.Model;
 import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.model.ModelStoreBuilder;
-import tools.refinery.store.query.literal.Reduction;
 public interface Criterion {
        default void configure(ModelStoreBuilder storeBuilder) {
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/Objectives.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/Objectives.java
index e552d14c..d2364c6a 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/Objectives.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/Objectives.java
@@ -5,8 +5,8 @@
 */
 package tools.refinery.store.dse.transition.objectives;
-import tools.refinery.store.query.dnf.FunctionalQuery;
+import tools.refinery.logic.dnf.FunctionalQuery;
-import tools.refinery.store.query.dnf.RelationalQuery;
+import tools.refinery.logic.dnf.RelationalQuery;
 import java.util.Collection;
 import java.util.List;
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/OrCriterion.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/OrCriterion.java
index 7a8d7778..4f7fcb26 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/OrCriterion.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/OrCriterion.java
@@ -5,9 +5,9 @@
 */
 package tools.refinery.store.dse.transition.objectives;
+import tools.refinery.logic.literal.Reduction;
 import tools.refinery.store.model.Model;
 import tools.refinery.store.model.ModelStore;
-import tools.refinery.store.query.literal.Reduction;
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/QueryCriterion.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/QueryCriterion.java
index e15e4e41..82dd8712 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/QueryCriterion.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/QueryCriterion.java
@@ -5,14 +5,14 @@
 */
 package tools.refinery.store.dse.transition.objectives;
+import tools.refinery.logic.dnf.AnyQuery;
+import tools.refinery.logic.literal.Reduction;
 import tools.refinery.store.model.Model;
 import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.model.ModelStoreBuilder;
 import tools.refinery.store.query.ModelQueryAdapter;
 import tools.refinery.store.query.ModelQueryBuilder;
 import tools.refinery.store.query.ModelQueryStoreAdapter;
-import tools.refinery.store.query.dnf.AnyQuery;
-import tools.refinery.store.query.literal.Reduction;
 public class QueryCriterion implements Criterion {
        protected final boolean satisfiedIfHasMatch;
diff --git a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/QueryObjective.java b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/QueryObjective.java
index 5a7ba8f4..1fa6327e 100644
--- a/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/QueryObjective.java
+++ b/subprojects/store-dse/src/main/java/tools/refinery/store/dse/transition/objectives/QueryObjective.java
@@ -9,7 +9,7 @@ import tools.refinery.store.model.Model;
 import tools.refinery.store.model.ModelStoreBuilder;
 import tools.refinery.store.query.ModelQueryAdapter;
 import tools.refinery.store.query.ModelQueryBuilder;
-import tools.refinery.store.query.dnf.FunctionalQuery;
+import tools.refinery.logic.dnf.FunctionalQuery;
 public class QueryObjective implements Objective {
        protected final FunctionalQuery<? extends Number> objectiveFunction;
diff --git a/subprojects/store-dse/src/test/java/tools/refinery/store/dse/CRAExamplesTest.java b/subprojects/store-dse/src/test/java/tools/refinery/store/dse/CRAExamplesTest.java
index fa0b3c73..7502f350 100644
--- a/subprojects/store-dse/src/test/java/tools/refinery/store/dse/CRAExamplesTest.java
+++ b/subprojects/store-dse/src/test/java/tools/refinery/store/dse/CRAExamplesTest.java
@@ -18,9 +18,9 @@ import tools.refinery.store.dse.transition.objectives.Criteria;
 import tools.refinery.store.dse.transition.objectives.Objectives;
 import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.query.ModelQueryAdapter;
-import tools.refinery.store.query.dnf.Query;
+import tools.refinery.logic.dnf.Query;
-import tools.refinery.store.query.dnf.RelationalQuery;
+import tools.refinery.logic.dnf.RelationalQuery;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
 import tools.refinery.store.query.interpreter.QueryInterpreterAdapter;
 import tools.refinery.store.query.view.AnySymbolView;
 import tools.refinery.store.query.view.KeyOnlyView;
@@ -36,7 +36,7 @@ import static tools.refinery.store.dse.modification.actions.ModificationActionLi
 import static tools.refinery.store.dse.modification.actions.ModificationActionLiterals.delete;
 import static tools.refinery.store.dse.transition.actions.ActionLiterals.add;
 import static tools.refinery.store.dse.transition.actions.ActionLiterals.remove;
-import static tools.refinery.store.query.literal.Literals.not;
+import static tools.refinery.logic.literal.Literals.not;
 class CRAExamplesTest {
        private static final Symbol<String> name = Symbol.of("Name", 1, String.class);
diff --git a/subprojects/store-dse/src/test/java/tools/refinery/store/dse/transition/TransitionTests.java b/subprojects/store-dse/src/test/java/tools/refinery/store/dse/transition/TransitionTests.java
index a79547ec..eb0ca8f9 100644
--- a/subprojects/store-dse/src/test/java/tools/refinery/store/dse/transition/TransitionTests.java
+++ b/subprojects/store-dse/src/test/java/tools/refinery/store/dse/transition/TransitionTests.java
@@ -6,17 +6,17 @@
 package tools.refinery.store.dse.transition;
 import org.junit.jupiter.api.Test;
+import tools.refinery.logic.dnf.FunctionalQuery;
+import tools.refinery.logic.dnf.Query;
+import tools.refinery.logic.dnf.RelationalQuery;
+import tools.refinery.logic.term.Variable;
+import tools.refinery.logic.term.int_.IntTerms;
 import tools.refinery.store.dse.modification.ModificationAdapter;
 import tools.refinery.store.dse.transition.objectives.Criteria;
 import tools.refinery.store.dse.transition.objectives.Objectives;
 import tools.refinery.store.model.Model;
 import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.query.ModelQueryAdapter;
-import tools.refinery.store.query.dnf.FunctionalQuery;
-import tools.refinery.store.query.dnf.Query;
-import tools.refinery.store.query.dnf.RelationalQuery;
-import tools.refinery.store.query.term.Variable;
-import tools.refinery.store.query.term.int_.IntTerms;
 import tools.refinery.store.query.interpreter.QueryInterpreterAdapter;
 import tools.refinery.store.query.view.AnySymbolView;
 import tools.refinery.store.query.view.KeyOnlyView;
@@ -27,8 +27,8 @@ import tools.refinery.store.tuple.Tuple;
 import java.util.List;
 import static org.junit.jupiter.api.Assertions.*;
-import static tools.refinery.store.query.literal.Literals.check;
+import static tools.refinery.logic.literal.Literals.check;
-import static tools.refinery.store.query.literal.Literals.not;
+import static tools.refinery.logic.literal.Literals.not;
 class TransitionBuildTests {
        Symbol<Boolean> person = new Symbol<>("Person", 1, Boolean.class, false);
diff --git a/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/QueryInterpreterBuilder.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/QueryInterpreterBuilder.java
index 6e167d0d..010164e2 100644
--- a/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/QueryInterpreterBuilder.java
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/QueryInterpreterBuilder.java
@@ -7,9 +7,9 @@ package tools.refinery.store.query.interpreter;
 import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.query.ModelQueryBuilder;
-import tools.refinery.store.query.dnf.AnyQuery;
+import tools.refinery.logic.dnf.AnyQuery;
-import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.logic.dnf.Dnf;
-import tools.refinery.store.query.rewriter.DnfRewriter;
+import tools.refinery.logic.rewriter.DnfRewriter;
 import tools.refinery.interpreter.api.InterpreterEngineOptions;
 import tools.refinery.interpreter.matchers.backend.IQueryBackendFactory;
 import tools.refinery.interpreter.matchers.backend.QueryEvaluationHint;
diff --git a/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/QueryInterpreterAdapterImpl.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/QueryInterpreterAdapterImpl.java
index ee527fd3..c5423223 100644
--- a/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/QueryInterpreterAdapterImpl.java
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/QueryInterpreterAdapterImpl.java
@@ -7,10 +7,10 @@ package tools.refinery.store.query.interpreter.internal;
 import tools.refinery.store.model.Model;
 import tools.refinery.store.model.ModelListener;
-import tools.refinery.store.query.dnf.AnyQuery;
+import tools.refinery.logic.dnf.AnyQuery;
-import tools.refinery.store.query.dnf.FunctionalQuery;
+import tools.refinery.logic.dnf.FunctionalQuery;
-import tools.refinery.store.query.dnf.Query;
+import tools.refinery.logic.dnf.Query;
-import tools.refinery.store.query.dnf.RelationalQuery;
+import tools.refinery.logic.dnf.RelationalQuery;
 import tools.refinery.store.query.resultset.AnyResultSet;
 import tools.refinery.store.query.resultset.EmptyResultSet;
 import tools.refinery.store.query.resultset.ResultSet;
diff --git a/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/QueryInterpreterBuilderImpl.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/QueryInterpreterBuilderImpl.java
index 4e839b43..1791e626 100644
--- a/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/QueryInterpreterBuilderImpl.java
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/QueryInterpreterBuilderImpl.java
@@ -9,12 +9,12 @@ import org.eclipse.emf.ecore.EPackage;
 import tools.refinery.interpreter.rete.recipes.RecipesPackage;
 import tools.refinery.store.adapter.AbstractModelAdapterBuilder;
 import tools.refinery.store.model.ModelStore;
-import tools.refinery.store.query.dnf.AnyQuery;
+import tools.refinery.logic.dnf.AnyQuery;
-import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.logic.dnf.Dnf;
-import tools.refinery.store.query.rewriter.CompositeRewriter;
+import tools.refinery.logic.rewriter.CompositeRewriter;
-import tools.refinery.store.query.rewriter.DnfRewriter;
+import tools.refinery.logic.rewriter.DnfRewriter;
-import tools.refinery.store.query.rewriter.DuplicateDnfRemover;
+import tools.refinery.logic.rewriter.DuplicateDnfRemover;
-import tools.refinery.store.query.rewriter.InputParameterResolver;
+import tools.refinery.logic.rewriter.InputParameterResolver;
 import tools.refinery.store.query.interpreter.QueryInterpreterBuilder;
 import tools.refinery.store.query.interpreter.internal.localsearch.FlatCostFunction;
 import tools.refinery.store.query.interpreter.internal.matcher.RawPatternMatcher;
diff --git a/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/QueryInterpreterStoreAdapterImpl.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/QueryInterpreterStoreAdapterImpl.java
index 10e7a402..d1ec3e3e 100644
--- a/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/QueryInterpreterStoreAdapterImpl.java
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/QueryInterpreterStoreAdapterImpl.java
@@ -11,8 +11,8 @@ import tools.refinery.interpreter.api.InterpreterEngineOptions;
 import tools.refinery.interpreter.matchers.context.IInputKey;
 import tools.refinery.store.model.Model;
 import tools.refinery.store.model.ModelStore;
-import tools.refinery.store.query.dnf.AnyQuery;
+import tools.refinery.logic.dnf.AnyQuery;
-import tools.refinery.store.query.dnf.Query;
+import tools.refinery.logic.dnf.Query;
 import tools.refinery.store.query.interpreter.QueryInterpreterStoreAdapter;
 import tools.refinery.store.query.interpreter.internal.matcher.RawPatternMatcher;
 import tools.refinery.store.query.view.AnySymbolView;
diff --git a/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/context/RelationalQueryMetaContext.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/context/RelationalQueryMetaContext.java
index 2b1ff2b4..117e81ba 100644
--- a/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/context/RelationalQueryMetaContext.java
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/context/RelationalQueryMetaContext.java
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2021-2023 The Refinery Authors <https://refinery.tools/>
+ * SPDX-FileCopyrightText: 2021-2024 The Refinery Authors <https://refinery.tools/>
 *
 * SPDX-License-Identifier: EPL-2.0
 */
@@ -48,7 +48,7 @@ public class RelationalQueryMetaContext extends AbstractQueryMetaContext {
                }
                var symbolView = checkKey(implyingKey);
                var relationViewImplications = symbolView.getImpliedRelationViews();
-                var inputKeyImplications = new HashSet<InputKeyImplication>(relationViewImplications.size());
+                var inputKeyImplications = HashSet.<InputKeyImplication>newHashSet(relationViewImplications.size());
                for (var relationViewImplication : relationViewImplications) {
                        if (!symbolView.equals(relationViewImplication.implyingView())) {
                                throw new IllegalArgumentException("Relation view %s returned unrelated implication %s".formatted(
@@ -82,7 +82,7 @@ public class RelationalQueryMetaContext extends AbstractQueryMetaContext {
                }
                var relationView = checkKey(key);
                var functionalDependencies = relationView.getFunctionalDependencies();
-                var flattened = new HashMap<Set<Integer>, Set<Integer>>(functionalDependencies.size());
+                var flattened = HashMap.<Set<Integer>, Set<Integer>>newHashMap(functionalDependencies.size());
                for (var functionalDependency : functionalDependencies) {
                        var forEach = functionalDependency.forEach();
                        checkValidIndices(relationView, forEach);
diff --git a/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/matcher/AbstractInterpretedMatcher.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/matcher/AbstractInterpretedMatcher.java
index 8cec0bf6..8e6a74ed 100644
--- a/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/matcher/AbstractInterpretedMatcher.java
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/matcher/AbstractInterpretedMatcher.java
@@ -7,7 +7,7 @@ package tools.refinery.store.query.interpreter.internal.matcher;
 import tools.refinery.interpreter.matchers.backend.IQueryResultProvider;
 import tools.refinery.interpreter.matchers.backend.IUpdateable;
-import tools.refinery.store.query.dnf.Query;
+import tools.refinery.logic.dnf.Query;
 import tools.refinery.store.query.resultset.AbstractResultSet;
 import tools.refinery.store.query.interpreter.internal.QueryInterpreterAdapterImpl;
diff --git a/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/matcher/InterpretedFunctionalMatcher.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/matcher/InterpretedFunctionalMatcher.java
index 249664a4..bf707487 100644
--- a/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/matcher/InterpretedFunctionalMatcher.java
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/matcher/InterpretedFunctionalMatcher.java
@@ -11,7 +11,7 @@ import tools.refinery.interpreter.matchers.tuple.Tuples;
 import tools.refinery.interpreter.rete.index.IterableIndexer;
 import tools.refinery.interpreter.rete.matcher.RetePatternMatcher;
 import tools.refinery.store.map.Cursor;
-import tools.refinery.store.query.dnf.FunctionalQuery;
+import tools.refinery.logic.dnf.FunctionalQuery;
 import tools.refinery.store.query.interpreter.internal.QueryInterpreterAdapterImpl;
 import tools.refinery.store.tuple.Tuple;
diff --git a/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/matcher/InterpretedRelationalMatcher.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/matcher/InterpretedRelationalMatcher.java
index 9278b46d..9d9c3042 100644
--- a/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/matcher/InterpretedRelationalMatcher.java
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/matcher/InterpretedRelationalMatcher.java
@@ -12,7 +12,7 @@ import tools.refinery.interpreter.rete.index.Indexer;
 import tools.refinery.interpreter.rete.matcher.RetePatternMatcher;
 import tools.refinery.store.map.Cursor;
 import tools.refinery.store.map.Cursors;
-import tools.refinery.store.query.dnf.RelationalQuery;
+import tools.refinery.logic.dnf.RelationalQuery;
 import tools.refinery.store.query.interpreter.internal.QueryInterpreterAdapterImpl;
 import tools.refinery.store.tuple.Tuple;
diff --git a/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/pquery/CheckEvaluator.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/pquery/CheckEvaluator.java
index 4a71e879..8cfc2226 100644
--- a/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/pquery/CheckEvaluator.java
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/pquery/CheckEvaluator.java
@@ -6,7 +6,7 @@
 package tools.refinery.store.query.interpreter.internal.pquery;
 import tools.refinery.interpreter.matchers.psystem.IValueProvider;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.Term;
 class CheckEvaluator extends TermEvaluator<Boolean> {
        public CheckEvaluator(Term<Boolean> term) {
diff --git a/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/pquery/Dnf2PQuery.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/pquery/Dnf2PQuery.java
index 4d30f998..0ffaa6b2 100644
--- a/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/pquery/Dnf2PQuery.java
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/pquery/Dnf2PQuery.java
@@ -22,18 +22,18 @@ import tools.refinery.interpreter.matchers.psystem.queries.PParameterDirection;
 import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
 import tools.refinery.interpreter.matchers.tuple.Tuple;
 import tools.refinery.interpreter.matchers.tuple.Tuples;
-import tools.refinery.store.query.Constraint;
+import tools.refinery.logic.Constraint;
-import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.logic.dnf.Dnf;
-import tools.refinery.store.query.dnf.DnfClause;
+import tools.refinery.logic.dnf.DnfClause;
-import tools.refinery.store.query.dnf.FunctionalDependency;
+import tools.refinery.logic.dnf.FunctionalDependency;
-import tools.refinery.store.query.dnf.SymbolicParameter;
+import tools.refinery.logic.dnf.SymbolicParameter;
-import tools.refinery.store.query.literal.*;
+import tools.refinery.logic.literal.*;
-import tools.refinery.store.query.term.ConstantTerm;
+import tools.refinery.logic.term.ConstantTerm;
-import tools.refinery.store.query.term.StatefulAggregator;
+import tools.refinery.logic.term.StatefulAggregator;
-import tools.refinery.store.query.term.StatelessAggregator;
+import tools.refinery.logic.term.StatelessAggregator;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
+import tools.refinery.logic.util.CycleDetectingMapper;
 import tools.refinery.store.query.view.AnySymbolView;
-import tools.refinery.store.util.CycleDetectingMapper;
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/pquery/QueryWrapperFactory.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/pquery/QueryWrapperFactory.java
index a710dab3..f855f1f0 100644
--- a/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/pquery/QueryWrapperFactory.java
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/pquery/QueryWrapperFactory.java
@@ -16,15 +16,15 @@ import tools.refinery.interpreter.matchers.psystem.queries.PQuery;
 import tools.refinery.interpreter.matchers.psystem.queries.PVisibility;
 import tools.refinery.interpreter.matchers.tuple.Tuple;
 import tools.refinery.interpreter.matchers.tuple.Tuples;
-import tools.refinery.store.query.Constraint;
+import tools.refinery.logic.Constraint;
-import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.logic.dnf.Dnf;
-import tools.refinery.store.query.dnf.DnfUtils;
+import tools.refinery.logic.dnf.DnfUtils;
-import tools.refinery.store.query.literal.AbstractCallLiteral;
+import tools.refinery.logic.literal.AbstractCallLiteral;
-import tools.refinery.store.query.term.ParameterDirection;
+import tools.refinery.logic.term.ParameterDirection;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
 import tools.refinery.store.query.view.AnySymbolView;
 import tools.refinery.store.query.view.SymbolView;
-import tools.refinery.store.util.CycleDetectingMapper;
+import tools.refinery.logic.util.CycleDetectingMapper;
 import java.util.*;
 import java.util.function.ToIntFunction;
diff --git a/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/pquery/StatefulMultisetAggregator.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/pquery/StatefulMultisetAggregator.java
index 7552117b..936b3513 100644
--- a/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/pquery/StatefulMultisetAggregator.java
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/pquery/StatefulMultisetAggregator.java
@@ -6,8 +6,8 @@
 package tools.refinery.store.query.interpreter.internal.pquery;
 import tools.refinery.interpreter.matchers.psystem.aggregations.IMultisetAggregationOperator;
-import tools.refinery.store.query.term.StatefulAggregate;
+import tools.refinery.logic.term.StatefulAggregate;
-import tools.refinery.store.query.term.StatefulAggregator;
+import tools.refinery.logic.term.StatefulAggregator;
 import java.util.stream.Stream;
diff --git a/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/pquery/StatelessMultisetAggregator.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/pquery/StatelessMultisetAggregator.java
index 2da7ba87..01432a5b 100644
--- a/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/pquery/StatelessMultisetAggregator.java
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/pquery/StatelessMultisetAggregator.java
@@ -6,7 +6,7 @@
 package tools.refinery.store.query.interpreter.internal.pquery;
 import tools.refinery.interpreter.matchers.psystem.aggregations.IMultisetAggregationOperator;
-import tools.refinery.store.query.term.StatelessAggregator;
+import tools.refinery.logic.term.StatelessAggregator;
 import java.util.stream.Stream;
diff --git a/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/pquery/TermEvaluator.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/pquery/TermEvaluator.java
index ed991091..8da9ece7 100644
--- a/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/pquery/TermEvaluator.java
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/pquery/TermEvaluator.java
@@ -5,8 +5,8 @@
 */
 package tools.refinery.store.query.interpreter.internal.pquery;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.Term;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
 import tools.refinery.interpreter.matchers.psystem.IExpressionEvaluator;
 import tools.refinery.interpreter.matchers.psystem.IValueProvider;
diff --git a/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/pquery/ValueProviderBasedValuation.java b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/pquery/ValueProviderBasedValuation.java
index 4124c9bb..a69c8bd2 100644
--- a/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/pquery/ValueProviderBasedValuation.java
+++ b/subprojects/store-query-interpreter/src/main/java/tools/refinery/store/query/interpreter/internal/pquery/ValueProviderBasedValuation.java
@@ -6,8 +6,8 @@
 package tools.refinery.store.query.interpreter.internal.pquery;
 import tools.refinery.interpreter.matchers.psystem.IValueProvider;
-import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.logic.term.DataVariable;
-import tools.refinery.store.query.valuation.Valuation;
+import tools.refinery.logic.valuation.Valuation;
 public record ValueProviderBasedValuation(IValueProvider valueProvider) implements Valuation {
        @Override
diff --git a/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/AggregatorBatchingTest.java b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/AggregatorBatchingTest.java
index d8e06d82..209d7ac0 100644
--- a/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/AggregatorBatchingTest.java
+++ b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/AggregatorBatchingTest.java
@@ -9,10 +9,10 @@ import org.junit.jupiter.api.Test;
 import tools.refinery.store.model.Model;
 import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.query.ModelQueryAdapter;
-import tools.refinery.store.query.dnf.Query;
+import tools.refinery.logic.dnf.Query;
-import tools.refinery.store.query.term.StatefulAggregate;
+import tools.refinery.logic.term.StatefulAggregate;
-import tools.refinery.store.query.term.StatefulAggregator;
+import tools.refinery.logic.term.StatefulAggregator;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
 import tools.refinery.store.query.view.AnySymbolView;
 import tools.refinery.store.query.view.FunctionView;
 import tools.refinery.store.query.view.KeyOnlyView;
diff --git a/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/DiagonalQueryTest.java b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/DiagonalQueryTest.java
index 76de8679..eba7173b 100644
--- a/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/DiagonalQueryTest.java
+++ b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/DiagonalQueryTest.java
@@ -8,8 +8,8 @@ package tools.refinery.store.query.interpreter;
 import tools.refinery.interpreter.matchers.backend.QueryEvaluationHint;
 import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.query.ModelQueryAdapter;
-import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.logic.dnf.Dnf;
-import tools.refinery.store.query.dnf.Query;
+import tools.refinery.logic.dnf.Query;
 import tools.refinery.store.query.interpreter.tests.QueryEngineTest;
 import tools.refinery.store.query.view.AnySymbolView;
 import tools.refinery.store.query.view.FunctionView;
@@ -21,8 +21,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import static tools.refinery.store.query.literal.Literals.not;
+import static tools.refinery.logic.literal.Literals.not;
-import static tools.refinery.store.query.term.int_.IntTerms.INT_SUM;
+import static tools.refinery.logic.term.int_.IntTerms.INT_SUM;
 import static tools.refinery.store.query.interpreter.tests.QueryAssertions.assertNullableResults;
 import static tools.refinery.store.query.interpreter.tests.QueryAssertions.assertResults;
diff --git a/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/FunctionalQueryTest.java b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/FunctionalQueryTest.java
index ca1512d8..c845e5ff 100644
--- a/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/FunctionalQueryTest.java
+++ b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/FunctionalQueryTest.java
@@ -9,15 +9,15 @@ import tools.refinery.interpreter.matchers.backend.QueryEvaluationHint;
 import tools.refinery.store.map.Cursor;
 import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.query.ModelQueryAdapter;
-import tools.refinery.store.query.dnf.Query;
+import tools.refinery.logic.dnf.Query;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
 import tools.refinery.store.query.interpreter.tests.QueryEngineTest;
 import tools.refinery.store.query.view.AnySymbolView;
 import tools.refinery.store.query.view.FilteredView;
 import tools.refinery.store.query.view.FunctionView;
 import tools.refinery.store.query.view.KeyOnlyView;
 import tools.refinery.store.representation.Symbol;
-import tools.refinery.store.representation.TruthValue;
+import tools.refinery.logic.term.truthvalue.TruthValue;
 import tools.refinery.store.tuple.Tuple;
 import java.util.List;
@@ -29,8 +29,8 @@ import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
 import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static tools.refinery.store.query.literal.Literals.check;
+import static tools.refinery.logic.literal.Literals.check;
-import static tools.refinery.store.query.term.int_.IntTerms.*;
+import static tools.refinery.logic.term.int_.IntTerms.*;
 import static tools.refinery.store.query.interpreter.tests.QueryAssertions.assertNullableResults;
 import static tools.refinery.store.query.interpreter.tests.QueryAssertions.assertResults;
diff --git a/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/LeftJoinTest.java b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/LeftJoinTest.java
index 4c849e9d..6633b3b1 100644
--- a/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/LeftJoinTest.java
+++ b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/LeftJoinTest.java
@@ -8,8 +8,8 @@ package tools.refinery.store.query.interpreter;
 import org.junit.jupiter.api.Test;
 import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.query.ModelQueryAdapter;
-import tools.refinery.store.query.dnf.Query;
+import tools.refinery.logic.dnf.Query;
-import tools.refinery.store.query.term.int_.IntTerms;
+import tools.refinery.logic.term.int_.IntTerms;
 import tools.refinery.store.query.view.AnySymbolView;
 import tools.refinery.store.query.view.FunctionView;
 import tools.refinery.store.query.view.KeyOnlyView;
diff --git a/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/OrderedResultSetTest.java b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/OrderedResultSetTest.java
index 96d0f302..cc3ddc10 100644
--- a/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/OrderedResultSetTest.java
+++ b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/OrderedResultSetTest.java
@@ -8,9 +8,9 @@ package tools.refinery.store.query.interpreter;
 import org.junit.jupiter.api.Test;
 import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.query.ModelQueryAdapter;
-import tools.refinery.store.query.dnf.Query;
+import tools.refinery.logic.dnf.Query;
 import tools.refinery.store.query.resultset.OrderedResultSet;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
 import tools.refinery.store.query.view.AnySymbolView;
 import tools.refinery.store.query.view.KeyOnlyView;
 import tools.refinery.store.representation.Symbol;
diff --git a/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/QueryTest.java b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/QueryTest.java
index 72728dcd..59f43147 100644
--- a/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/QueryTest.java
+++ b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/QueryTest.java
@@ -9,26 +9,26 @@ import tools.refinery.interpreter.matchers.backend.QueryEvaluationHint;
 import org.junit.jupiter.api.Test;
 import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.query.ModelQueryAdapter;
-import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.logic.dnf.Dnf;
-import tools.refinery.store.query.dnf.Query;
+import tools.refinery.logic.dnf.Query;
-import tools.refinery.store.query.term.ParameterDirection;
+import tools.refinery.logic.term.ParameterDirection;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
 import tools.refinery.store.query.interpreter.tests.QueryEngineTest;
 import tools.refinery.store.query.view.AnySymbolView;
 import tools.refinery.store.query.view.FilteredView;
 import tools.refinery.store.query.view.FunctionView;
 import tools.refinery.store.query.view.KeyOnlyView;
 import tools.refinery.store.representation.Symbol;
-import tools.refinery.store.representation.TruthValue;
+import tools.refinery.logic.term.truthvalue.TruthValue;
 import tools.refinery.store.tuple.Tuple;
 import java.util.List;
 import java.util.Map;
-import static tools.refinery.store.query.literal.Literals.check;
+import static tools.refinery.logic.literal.Literals.check;
-import static tools.refinery.store.query.literal.Literals.not;
+import static tools.refinery.logic.literal.Literals.not;
-import static tools.refinery.store.query.term.int_.IntTerms.constant;
+import static tools.refinery.logic.term.int_.IntTerms.constant;
-import static tools.refinery.store.query.term.int_.IntTerms.greaterEq;
+import static tools.refinery.logic.term.int_.IntTerms.greaterEq;
 import static tools.refinery.store.query.interpreter.tests.QueryAssertions.assertResults;
 class QueryTest {
diff --git a/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/QueryTransactionTest.java b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/QueryTransactionTest.java
index 1cd05d91..eb1ed68a 100644
--- a/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/QueryTransactionTest.java
+++ b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/QueryTransactionTest.java
@@ -9,8 +9,8 @@ import tools.refinery.interpreter.matchers.backend.QueryEvaluationHint;
 import org.junit.jupiter.api.Test;
 import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.query.ModelQueryAdapter;
-import tools.refinery.store.query.dnf.Query;
+import tools.refinery.logic.dnf.Query;
-import tools.refinery.store.query.dnf.RelationalQuery;
+import tools.refinery.logic.dnf.RelationalQuery;
 import tools.refinery.store.query.view.AnySymbolView;
 import tools.refinery.store.query.view.FilteredView;
 import tools.refinery.store.query.view.FunctionView;
diff --git a/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/StronglyConnectedComponentsTest.java b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/StronglyConnectedComponentsTest.java
index edbd9aff..f8b12d19 100644
--- a/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/StronglyConnectedComponentsTest.java
+++ b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/StronglyConnectedComponentsTest.java
@@ -6,11 +6,11 @@
 package tools.refinery.store.query.interpreter;
 import org.junit.jupiter.api.Test;
+import tools.refinery.logic.dnf.Query;
+import tools.refinery.logic.literal.Connectivity;
+import tools.refinery.logic.literal.RepresentativeElectionLiteral;
 import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.query.ModelQueryAdapter;
-import tools.refinery.store.query.dnf.Query;
-import tools.refinery.store.query.literal.Connectivity;
-import tools.refinery.store.query.literal.RepresentativeElectionLiteral;
 import tools.refinery.store.query.view.AnySymbolView;
 import tools.refinery.store.query.view.KeyOnlyView;
 import tools.refinery.store.representation.Symbol;
diff --git a/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/WeaklyConnectedComponentsTest.java b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/WeaklyConnectedComponentsTest.java
index 3fc85480..95b37f09 100644
--- a/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/WeaklyConnectedComponentsTest.java
+++ b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/WeaklyConnectedComponentsTest.java
@@ -6,11 +6,11 @@
 package tools.refinery.store.query.interpreter;
 import org.junit.jupiter.api.Test;
+import tools.refinery.logic.dnf.Query;
+import tools.refinery.logic.literal.Connectivity;
+import tools.refinery.logic.literal.RepresentativeElectionLiteral;
 import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.query.ModelQueryAdapter;
-import tools.refinery.store.query.dnf.Query;
-import tools.refinery.store.query.literal.Connectivity;
-import tools.refinery.store.query.literal.RepresentativeElectionLiteral;
 import tools.refinery.store.query.view.AnySymbolView;
 import tools.refinery.store.query.view.KeyOnlyView;
 import tools.refinery.store.representation.Symbol;
diff --git a/subprojects/store-query/build.gradle.kts b/subprojects/store-query/build.gradle.kts
index 4d8e2605..f5cbdebc 100644
--- a/subprojects/store-query/build.gradle.kts
+++ b/subprojects/store-query/build.gradle.kts
@@ -6,10 +6,9 @@
 plugins {
        id("tools.refinery.gradle.java-library")
-        id("tools.refinery.gradle.java-test-fixtures")
 }
 dependencies {
+        api(project(":refinery-logic"))
        api(project(":refinery-store"))
-        testFixturesApi(libs.hamcrest)
 }
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/ModelQueryAdapter.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/ModelQueryAdapter.java
index 1fa96a07..513825b7 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/ModelQueryAdapter.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/ModelQueryAdapter.java
@@ -6,8 +6,8 @@
 package tools.refinery.store.query;
 import tools.refinery.store.adapter.ModelAdapter;
-import tools.refinery.store.query.dnf.AnyQuery;
+import tools.refinery.logic.dnf.AnyQuery;
-import tools.refinery.store.query.dnf.Query;
+import tools.refinery.logic.dnf.Query;
 import tools.refinery.store.query.resultset.AnyResultSet;
 import tools.refinery.store.query.resultset.ResultSet;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/ModelQueryBuilder.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/ModelQueryBuilder.java
index 332e6381..71e2c5bf 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/ModelQueryBuilder.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/ModelQueryBuilder.java
@@ -7,8 +7,8 @@ package tools.refinery.store.query;
 import tools.refinery.store.adapter.ModelAdapterBuilder;
 import tools.refinery.store.model.ModelStore;
-import tools.refinery.store.query.dnf.AnyQuery;
+import tools.refinery.logic.dnf.AnyQuery;
-import tools.refinery.store.query.rewriter.DnfRewriter;
+import tools.refinery.logic.rewriter.DnfRewriter;
 import java.util.Collection;
 import java.util.List;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/ModelQueryStoreAdapter.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/ModelQueryStoreAdapter.java
index 8b67c5c1..fec8c999 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/ModelQueryStoreAdapter.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/ModelQueryStoreAdapter.java
@@ -7,8 +7,8 @@ package tools.refinery.store.query;
 import tools.refinery.store.adapter.ModelStoreAdapter;
 import tools.refinery.store.model.Model;
-import tools.refinery.store.query.dnf.AnyQuery;
+import tools.refinery.logic.dnf.AnyQuery;
-import tools.refinery.store.query.dnf.Query;
+import tools.refinery.logic.dnf.Query;
 import tools.refinery.store.query.view.AnySymbolView;
 import java.util.Collection;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/AbstractResultSet.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/AbstractResultSet.java
index dcfe6cc5..f8290b48 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/AbstractResultSet.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/AbstractResultSet.java
@@ -6,7 +6,7 @@
 package tools.refinery.store.query.resultset;
 import tools.refinery.store.query.ModelQueryAdapter;
-import tools.refinery.store.query.dnf.Query;
+import tools.refinery.logic.dnf.Query;
 import tools.refinery.store.tuple.Tuple;
 import java.util.ArrayList;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/AnyResultSet.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/AnyResultSet.java
index 5b75b103..038ca7f9 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/AnyResultSet.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/AnyResultSet.java
@@ -6,7 +6,7 @@
 package tools.refinery.store.query.resultset;
 import tools.refinery.store.query.ModelQueryAdapter;
-import tools.refinery.store.query.dnf.AnyQuery;
+import tools.refinery.logic.dnf.AnyQuery;
 public sealed interface AnyResultSet permits ResultSet {
        ModelQueryAdapter getAdapter();
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/EmptyResultSet.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/EmptyResultSet.java
index 991b1e32..daebfe7c 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/EmptyResultSet.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/EmptyResultSet.java
@@ -8,7 +8,7 @@ package tools.refinery.store.query.resultset;
 import tools.refinery.store.map.Cursor;
 import tools.refinery.store.map.Cursors;
 import tools.refinery.store.query.ModelQueryAdapter;
-import tools.refinery.store.query.dnf.Query;
+import tools.refinery.logic.dnf.Query;
 import tools.refinery.store.tuple.Tuple;
 public record EmptyResultSet<T>(ModelQueryAdapter adapter, Query<T> query) implements ResultSet<T> {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/OrderedResultSet.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/OrderedResultSet.java
index df12b967..606e197c 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/OrderedResultSet.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/OrderedResultSet.java
@@ -7,7 +7,7 @@ package tools.refinery.store.query.resultset;
 import tools.refinery.store.map.Cursor;
 import tools.refinery.store.query.ModelQueryAdapter;
-import tools.refinery.store.query.dnf.Query;
+import tools.refinery.logic.dnf.Query;
 import tools.refinery.store.query.utils.OrderStatisticTree;
 import tools.refinery.store.tuple.Tuple;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/ResultSet.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/ResultSet.java
index a6e99784..e84634ac 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/ResultSet.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/resultset/ResultSet.java
@@ -6,7 +6,7 @@
 package tools.refinery.store.query.resultset;
 import tools.refinery.store.map.Cursor;
-import tools.refinery.store.query.dnf.Query;
+import tools.refinery.logic.dnf.Query;
 import tools.refinery.store.tuple.Tuple;
 public non-sealed interface ResultSet<T> extends AnyResultSet {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/AbstractFunctionView.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/AbstractFunctionView.java
index f130fa59..d9809991 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/AbstractFunctionView.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/AbstractFunctionView.java
@@ -7,8 +7,8 @@ package tools.refinery.store.query.view;
 import tools.refinery.store.map.CursorAsIterator;
 import tools.refinery.store.model.Model;
-import tools.refinery.store.query.dnf.FunctionalDependency;
+import tools.refinery.logic.dnf.FunctionalDependency;
-import tools.refinery.store.query.term.Parameter;
+import tools.refinery.logic.term.Parameter;
 import tools.refinery.store.representation.Symbol;
 import tools.refinery.store.tuple.Tuple;
 import tools.refinery.store.tuple.Tuple1;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/AnySymbolView.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/AnySymbolView.java
index 7e9bf6df..b01c3988 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/AnySymbolView.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/AnySymbolView.java
@@ -5,10 +5,10 @@
 */
 package tools.refinery.store.query.view;
+import tools.refinery.logic.dnf.FunctionalDependency;
 import tools.refinery.store.model.Model;
-import tools.refinery.store.query.dnf.FunctionalDependency;
+import tools.refinery.logic.Constraint;
 import tools.refinery.store.representation.AnySymbol;
-import tools.refinery.store.query.Constraint;
 import java.util.Set;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/FilteredView.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/FilteredView.java
index 924277ed..7ce07442 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/FilteredView.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/FilteredView.java
@@ -5,7 +5,7 @@
 */
 package tools.refinery.store.query.view;
-import tools.refinery.store.query.InvalidQueryException;
+import tools.refinery.logic.InvalidQueryException;
 import tools.refinery.store.tuple.Tuple;
 import tools.refinery.store.representation.Symbol;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/ForbiddenView.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/ForbiddenView.java
index c312330e..8323ace7 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/ForbiddenView.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/ForbiddenView.java
@@ -6,7 +6,7 @@
 package tools.refinery.store.query.view;
 import tools.refinery.store.representation.Symbol;
-import tools.refinery.store.representation.TruthValue;
+import tools.refinery.logic.term.truthvalue.TruthValue;
 import tools.refinery.store.tuple.Tuple;
 public class ForbiddenView extends TuplePreservingView<TruthValue> {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/FunctionView.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/FunctionView.java
index 3dfb6777..5585f5f2 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/FunctionView.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/FunctionView.java
@@ -5,7 +5,7 @@
 */
 package tools.refinery.store.query.view;
-import tools.refinery.store.query.term.*;
+import tools.refinery.logic.term.*;
 import tools.refinery.store.representation.Symbol;
 import java.util.ArrayList;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/MayView.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/MayView.java
index c322e220..3a6cc93b 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/MayView.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/MayView.java
@@ -6,7 +6,7 @@
 package tools.refinery.store.query.view;
 import tools.refinery.store.representation.Symbol;
-import tools.refinery.store.representation.TruthValue;
+import tools.refinery.logic.term.truthvalue.TruthValue;
 import tools.refinery.store.tuple.Tuple;
 public class MayView extends TuplePreservingView<TruthValue> {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/MustView.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/MustView.java
index 65bb4e4c..af984327 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/MustView.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/MustView.java
@@ -6,7 +6,7 @@
 package tools.refinery.store.query.view;
 import tools.refinery.store.representation.Symbol;
-import tools.refinery.store.representation.TruthValue;
+import tools.refinery.logic.term.truthvalue.TruthValue;
 import tools.refinery.store.tuple.Tuple;
 public class MustView extends TuplePreservingView<TruthValue> {
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/NodeFunctionView.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/NodeFunctionView.java
index fcf11506..01865cbe 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/NodeFunctionView.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/NodeFunctionView.java
@@ -5,7 +5,7 @@
 */
 package tools.refinery.store.query.view;
-import tools.refinery.store.query.term.Parameter;
+import tools.refinery.logic.term.Parameter;
 import tools.refinery.store.representation.Symbol;
 import tools.refinery.store.tuple.Tuple1;
diff --git a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/TuplePreservingView.java b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/TuplePreservingView.java
index ed12cd9d..6841488d 100644
--- a/subprojects/store-query/src/main/java/tools/refinery/store/query/view/TuplePreservingView.java
+++ b/subprojects/store-query/src/main/java/tools/refinery/store/query/view/TuplePreservingView.java
@@ -7,7 +7,7 @@ package tools.refinery.store.query.view;
 import tools.refinery.store.map.CursorAsIterator;
 import tools.refinery.store.model.Model;
-import tools.refinery.store.query.term.Parameter;
+import tools.refinery.logic.term.Parameter;
 import tools.refinery.store.representation.Symbol;
 import tools.refinery.store.tuple.Tuple;
 import tools.refinery.store.tuple.Tuple1;
diff --git a/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/BoundScopePropagator.java b/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/BoundScopePropagator.java
index ecca6117..3a9efa58 100644
--- a/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/BoundScopePropagator.java
+++ b/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/BoundScopePropagator.java
@@ -13,12 +13,17 @@ import org.eclipse.collections.api.factory.primitive.IntObjectMaps;
 import org.eclipse.collections.api.factory.primitive.IntSets;
 import org.eclipse.collections.api.map.primitive.MutableIntObjectMap;
 import org.eclipse.collections.api.set.primitive.MutableIntSet;
+import tools.refinery.logic.term.cardinalityinterval.CardinalityInterval;
+import tools.refinery.logic.term.cardinalityinterval.CardinalityIntervals;
+import tools.refinery.logic.term.uppercardinality.FiniteUpperCardinality;
+import tools.refinery.logic.term.uppercardinality.UnboundedUpperCardinality;
+import tools.refinery.logic.term.uppercardinality.UpperCardinalities;
+import tools.refinery.logic.term.uppercardinality.UpperCardinality;
 import tools.refinery.store.dse.propagation.BoundPropagator;
 import tools.refinery.store.dse.propagation.PropagationResult;
 import tools.refinery.store.model.Interpretation;
 import tools.refinery.store.model.Model;
 import tools.refinery.store.query.ModelQueryAdapter;
-import tools.refinery.store.representation.cardinality.*;
 import tools.refinery.store.tuple.Tuple;
 class BoundScopePropagator implements BoundPropagator {
diff --git a/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/LowerTypeScopePropagator.java b/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/LowerTypeScopePropagator.java
index 702e570f..0700c696 100644
--- a/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/LowerTypeScopePropagator.java
+++ b/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/LowerTypeScopePropagator.java
@@ -5,26 +5,26 @@
 */
 package tools.refinery.store.reasoning.scope;
+import tools.refinery.logic.dnf.AnyQuery;
+import tools.refinery.logic.dnf.Query;
+import tools.refinery.logic.dnf.RelationalQuery;
+import tools.refinery.logic.term.Variable;
+import tools.refinery.logic.term.uppercardinality.UpperCardinality;
+import tools.refinery.logic.term.uppercardinality.UpperCardinalityTerms;
 import tools.refinery.store.dse.transition.DesignSpaceExplorationBuilder;
 import tools.refinery.store.dse.transition.objectives.Criteria;
 import tools.refinery.store.dse.transition.objectives.Objectives;
 import tools.refinery.store.model.ModelStoreBuilder;
-import tools.refinery.store.query.dnf.AnyQuery;
-import tools.refinery.store.query.dnf.Query;
-import tools.refinery.store.query.dnf.RelationalQuery;
-import tools.refinery.store.query.term.Variable;
-import tools.refinery.store.query.term.uppercardinality.UpperCardinalityTerms;
 import tools.refinery.store.reasoning.ReasoningBuilder;
 import tools.refinery.store.reasoning.literal.CountCandidateLowerBoundLiteral;
 import tools.refinery.store.reasoning.literal.CountUpperBoundLiteral;
 import tools.refinery.store.reasoning.representation.PartialRelation;
-import tools.refinery.store.representation.cardinality.UpperCardinality;
 import java.util.Collection;
 import java.util.List;
-import static tools.refinery.store.query.literal.Literals.check;
+import static tools.refinery.logic.literal.Literals.check;
-import static tools.refinery.store.query.term.int_.IntTerms.*;
+import static tools.refinery.logic.term.int_.IntTerms.*;
 import static tools.refinery.store.reasoning.literal.PartialLiterals.may;
 import static tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslator.MULTI_VIEW;
diff --git a/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/ScopePropagator.java b/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/ScopePropagator.java
index 25b1966c..bfe2ca41 100644
--- a/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/ScopePropagator.java
+++ b/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/ScopePropagator.java
@@ -13,8 +13,8 @@ import tools.refinery.store.reasoning.representation.PartialRelation;
 import tools.refinery.store.reasoning.translator.TranslationException;
 import tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslator;
 import tools.refinery.store.representation.Symbol;
-import tools.refinery.store.representation.cardinality.CardinalityInterval;
+import tools.refinery.logic.term.cardinalityinterval.CardinalityInterval;
-import tools.refinery.store.representation.cardinality.FiniteUpperCardinality;
+import tools.refinery.logic.term.uppercardinality.FiniteUpperCardinality;
 import java.util.*;
diff --git a/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/TypeScopePropagator.java b/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/TypeScopePropagator.java
index 193c132c..d117b0e2 100644
--- a/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/TypeScopePropagator.java
+++ b/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/TypeScopePropagator.java
@@ -8,8 +8,8 @@ package tools.refinery.store.reasoning.scope;
 import com.google.ortools.linearsolver.MPConstraint;
 import tools.refinery.store.model.ModelStoreBuilder;
 import tools.refinery.store.query.ModelQueryBuilder;
-import tools.refinery.store.query.dnf.AnyQuery;
+import tools.refinery.logic.dnf.AnyQuery;
-import tools.refinery.store.query.dnf.RelationalQuery;
+import tools.refinery.logic.dnf.RelationalQuery;
 import tools.refinery.store.query.resultset.ResultSet;
 import tools.refinery.store.tuple.Tuple;
diff --git a/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/UpperTypeScopePropagator.java b/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/UpperTypeScopePropagator.java
index b2f8d39b..ad56b9bd 100644
--- a/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/UpperTypeScopePropagator.java
+++ b/subprojects/store-reasoning-scope/src/main/java/tools/refinery/store/reasoning/scope/UpperTypeScopePropagator.java
@@ -5,14 +5,14 @@
 */
 package tools.refinery.store.reasoning.scope;
+import tools.refinery.logic.dnf.AnyQuery;
+import tools.refinery.logic.dnf.Query;
+import tools.refinery.logic.dnf.RelationalQuery;
+import tools.refinery.logic.term.Variable;
 import tools.refinery.store.dse.transition.DesignSpaceExplorationBuilder;
 import tools.refinery.store.dse.transition.objectives.Criteria;
 import tools.refinery.store.dse.transition.objectives.Objectives;
 import tools.refinery.store.model.ModelStoreBuilder;
-import tools.refinery.store.query.dnf.AnyQuery;
-import tools.refinery.store.query.dnf.Query;
-import tools.refinery.store.query.dnf.RelationalQuery;
-import tools.refinery.store.query.term.Variable;
 import tools.refinery.store.reasoning.ReasoningBuilder;
 import tools.refinery.store.reasoning.literal.CountCandidateUpperBoundLiteral;
 import tools.refinery.store.reasoning.literal.CountLowerBoundLiteral;
@@ -21,8 +21,8 @@ import tools.refinery.store.reasoning.representation.PartialRelation;
 import java.util.Collection;
 import java.util.List;
-import static tools.refinery.store.query.literal.Literals.check;
+import static tools.refinery.logic.literal.Literals.check;
-import static tools.refinery.store.query.term.int_.IntTerms.*;
+import static tools.refinery.logic.term.int_.IntTerms.*;
 import static tools.refinery.store.reasoning.literal.PartialLiterals.must;
 import static tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslator.MULTI_VIEW;
diff --git a/subprojects/store-reasoning-scope/src/test/java/tools/refinery/store/reasoning/scope/MultiObjectTest.java b/subprojects/store-reasoning-scope/src/test/java/tools/refinery/store/reasoning/scope/MultiObjectTest.java
index 97b9fa5e..2b8b4557 100644
--- a/subprojects/store-reasoning-scope/src/test/java/tools/refinery/store/reasoning/scope/MultiObjectTest.java
+++ b/subprojects/store-reasoning-scope/src/test/java/tools/refinery/store/reasoning/scope/MultiObjectTest.java
@@ -20,9 +20,9 @@ import tools.refinery.store.reasoning.seed.ModelSeed;
 import tools.refinery.store.reasoning.translator.PartialRelationTranslator;
 import tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslator;
 import tools.refinery.store.representation.Symbol;
-import tools.refinery.store.representation.TruthValue;
+import tools.refinery.logic.term.truthvalue.TruthValue;
-import tools.refinery.store.representation.cardinality.CardinalityInterval;
+import tools.refinery.logic.term.cardinalityinterval.CardinalityInterval;
-import tools.refinery.store.representation.cardinality.CardinalityIntervals;
+import tools.refinery.logic.term.cardinalityinterval.CardinalityIntervals;
 import tools.refinery.store.tuple.Tuple;
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/subprojects/store-reasoning-scope/src/test/java/tools/refinery/store/reasoning/scope/PredicateScopeTest.java b/subprojects/store-reasoning-scope/src/test/java/tools/refinery/store/reasoning/scope/PredicateScopeTest.java
index 5ee97ce1..f4d5fb60 100644
--- a/subprojects/store-reasoning-scope/src/test/java/tools/refinery/store/reasoning/scope/PredicateScopeTest.java
+++ b/subprojects/store-reasoning-scope/src/test/java/tools/refinery/store/reasoning/scope/PredicateScopeTest.java
@@ -9,13 +9,15 @@ import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
+import tools.refinery.logic.dnf.Query;
+import tools.refinery.logic.term.Variable;
+import tools.refinery.logic.term.cardinalityinterval.CardinalityIntervals;
+import tools.refinery.logic.term.truthvalue.TruthValue;
 import tools.refinery.store.dse.propagation.PropagationAdapter;
 import tools.refinery.store.dse.strategy.BestFirstStoreManager;
 import tools.refinery.store.dse.transition.DesignSpaceExplorationAdapter;
 import tools.refinery.store.model.ModelStore;
-import tools.refinery.store.query.dnf.Query;
 import tools.refinery.store.query.interpreter.QueryInterpreterAdapter;
-import tools.refinery.store.query.term.Variable;
 import tools.refinery.store.reasoning.ReasoningAdapter;
 import tools.refinery.store.reasoning.ReasoningStoreAdapter;
 import tools.refinery.store.reasoning.interpretation.PartialInterpretation;
@@ -27,14 +29,12 @@ import tools.refinery.store.reasoning.translator.containment.ContainmentHierarch
 import tools.refinery.store.reasoning.translator.metamodel.Metamodel;
 import tools.refinery.store.reasoning.translator.metamodel.MetamodelTranslator;
 import tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslator;
-import tools.refinery.store.representation.TruthValue;
-import tools.refinery.store.representation.cardinality.CardinalityIntervals;
 import tools.refinery.store.statecoding.StateCoderAdapter;
 import tools.refinery.store.tuple.Tuple;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
-import static tools.refinery.store.query.literal.Literals.not;
+import static tools.refinery.logic.literal.Literals.not;
 class PredicateScopeTest {
        private static final PartialRelation index = new PartialRelation("Index", 1);
diff --git a/subprojects/store-reasoning/build.gradle.kts b/subprojects/store-reasoning/build.gradle.kts
index 068256c2..d1d3c2e5 100644
--- a/subprojects/store-reasoning/build.gradle.kts
+++ b/subprojects/store-reasoning/build.gradle.kts
@@ -10,6 +10,6 @@ plugins {
 dependencies {
        api(project(":refinery-store-dse"))
-        testImplementation(testFixtures(project(":refinery-store-query")))
+        testImplementation(testFixtures(project(":refinery-logic")))
        testImplementation(project(":refinery-store-query-interpreter"))
 }
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/ReasoningBuilder.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/ReasoningBuilder.java
index 79bce33e..7ffa6faa 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/ReasoningBuilder.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/ReasoningBuilder.java
@@ -8,10 +8,10 @@ package tools.refinery.store.reasoning;
 import tools.refinery.store.adapter.ModelAdapterBuilder;
 import tools.refinery.store.dse.transition.objectives.Objective;
 import tools.refinery.store.model.ModelStore;
-import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.logic.dnf.Dnf;
-import tools.refinery.store.query.dnf.FunctionalQuery;
+import tools.refinery.logic.dnf.FunctionalQuery;
-import tools.refinery.store.query.dnf.Query;
+import tools.refinery.logic.dnf.Query;
-import tools.refinery.store.query.dnf.RelationalQuery;
+import tools.refinery.logic.dnf.RelationalQuery;
 import tools.refinery.store.reasoning.literal.Concreteness;
 import tools.refinery.store.reasoning.literal.Modality;
 import tools.refinery.store.reasoning.refinement.PartialModelInitializer;
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/actions/CleanupActionLiteral.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/actions/CleanupActionLiteral.java
index 62c35cee..6a0004d9 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/actions/CleanupActionLiteral.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/actions/CleanupActionLiteral.java
@@ -8,7 +8,7 @@ package tools.refinery.store.reasoning.actions;
 import tools.refinery.store.dse.transition.actions.AbstractActionLiteral;
 import tools.refinery.store.dse.transition.actions.BoundActionLiteral;
 import tools.refinery.store.model.Model;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.NodeVariable;
 import tools.refinery.store.reasoning.ReasoningAdapter;
 import tools.refinery.store.tuple.Tuple;
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/actions/FocusActionLiteral.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/actions/FocusActionLiteral.java
index 5a6f22d2..c819a1f9 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/actions/FocusActionLiteral.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/actions/FocusActionLiteral.java
@@ -8,7 +8,7 @@ package tools.refinery.store.reasoning.actions;
 import tools.refinery.store.dse.transition.actions.AbstractActionLiteral;
 import tools.refinery.store.dse.transition.actions.BoundActionLiteral;
 import tools.refinery.store.model.Model;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.NodeVariable;
 import tools.refinery.store.reasoning.ReasoningAdapter;
 import java.util.List;
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/actions/MergeActionLiteral.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/actions/MergeActionLiteral.java
index 8d0d7961..79e0237c 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/actions/MergeActionLiteral.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/actions/MergeActionLiteral.java
@@ -8,7 +8,7 @@ package tools.refinery.store.reasoning.actions;
 import tools.refinery.store.dse.transition.actions.AbstractActionLiteral;
 import tools.refinery.store.dse.transition.actions.BoundActionLiteral;
 import tools.refinery.store.model.Model;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.NodeVariable;
 import tools.refinery.store.reasoning.ReasoningAdapter;
 import tools.refinery.store.reasoning.representation.PartialSymbol;
 import tools.refinery.store.tuple.Tuple;
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/actions/PartialActionLiterals.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/actions/PartialActionLiterals.java
index f36fde44..7b4c5446 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/actions/PartialActionLiterals.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/actions/PartialActionLiterals.java
@@ -5,10 +5,10 @@
 */
 package tools.refinery.store.reasoning.actions;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.NodeVariable;
 import tools.refinery.store.reasoning.representation.PartialRelation;
 import tools.refinery.store.reasoning.representation.PartialSymbol;
-import tools.refinery.store.representation.TruthValue;
+import tools.refinery.logic.term.truthvalue.TruthValue;
 import java.util.List;
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/PartialClauseRewriter.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/PartialClauseRewriter.java
index 40993235..dc508a7b 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/PartialClauseRewriter.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/PartialClauseRewriter.java
@@ -5,25 +5,25 @@
 */
 package tools.refinery.store.reasoning.internal;
-import tools.refinery.store.query.Constraint;
+import tools.refinery.logic.Constraint;
-import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.logic.dnf.Dnf;
-import tools.refinery.store.query.dnf.DnfBuilder;
+import tools.refinery.logic.dnf.DnfBuilder;
-import tools.refinery.store.query.dnf.DnfClause;
+import tools.refinery.logic.dnf.DnfClause;
-import tools.refinery.store.query.literal.AbstractCallLiteral;
+import tools.refinery.logic.literal.AbstractCallLiteral;
-import tools.refinery.store.query.literal.AbstractCountLiteral;
+import tools.refinery.logic.literal.AbstractCountLiteral;
-import tools.refinery.store.query.literal.CallPolarity;
+import tools.refinery.logic.literal.CallPolarity;
-import tools.refinery.store.query.literal.Literal;
+import tools.refinery.logic.literal.Literal;
-import tools.refinery.store.query.term.Aggregator;
+import tools.refinery.logic.term.Aggregator;
-import tools.refinery.store.query.term.ConstantTerm;
+import tools.refinery.logic.term.ConstantTerm;
-import tools.refinery.store.query.term.Term;
+import tools.refinery.logic.term.Term;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
-import tools.refinery.store.query.term.int_.IntTerms;
+import tools.refinery.logic.term.int_.IntTerms;
-import tools.refinery.store.query.term.uppercardinality.UpperCardinalityTerms;
+import tools.refinery.logic.term.uppercardinality.UpperCardinalities;
+import tools.refinery.logic.term.uppercardinality.UpperCardinalityTerms;
 import tools.refinery.store.reasoning.ReasoningAdapter;
 import tools.refinery.store.reasoning.literal.*;
 import tools.refinery.store.reasoning.representation.PartialRelation;
 import tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslator;
-import tools.refinery.store.representation.cardinality.UpperCardinalities;
 import java.util.*;
 import java.util.function.BinaryOperator;
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/PartialQueryRewriter.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/PartialQueryRewriter.java
index 79cba263..9a916b69 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/PartialQueryRewriter.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/PartialQueryRewriter.java
@@ -5,8 +5,8 @@
 */
 package tools.refinery.store.reasoning.internal;
-import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.logic.dnf.Dnf;
-import tools.refinery.store.query.rewriter.AbstractRecursiveRewriter;
+import tools.refinery.logic.rewriter.AbstractRecursiveRewriter;
 import tools.refinery.store.reasoning.interpretation.PartialRelationRewriter;
 import tools.refinery.store.reasoning.lifting.DnfLifter;
 import tools.refinery.store.reasoning.representation.PartialRelation;
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/ReasoningAdapterImpl.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/ReasoningAdapterImpl.java
index bd16bdfa..a287cce3 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/ReasoningAdapterImpl.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/ReasoningAdapterImpl.java
@@ -19,8 +19,8 @@ import tools.refinery.store.reasoning.representation.AnyPartialSymbol;
 import tools.refinery.store.reasoning.representation.PartialSymbol;
 import tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslator;
 import tools.refinery.store.representation.Symbol;
-import tools.refinery.store.representation.cardinality.CardinalityInterval;
+import tools.refinery.logic.term.cardinalityinterval.CardinalityInterval;
-import tools.refinery.store.representation.cardinality.CardinalityIntervals;
+import tools.refinery.logic.term.cardinalityinterval.CardinalityIntervals;
 import tools.refinery.store.tuple.Tuple;
 import tools.refinery.store.tuple.Tuple1;
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/ReasoningBuilderImpl.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/ReasoningBuilderImpl.java
index 722458c8..87122b1d 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/ReasoningBuilderImpl.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/ReasoningBuilderImpl.java
@@ -12,10 +12,10 @@ import tools.refinery.store.dse.transition.objectives.Objectives;
 import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.model.ModelStoreBuilder;
 import tools.refinery.store.query.ModelQueryBuilder;
-import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.logic.dnf.Dnf;
-import tools.refinery.store.query.dnf.FunctionalQuery;
+import tools.refinery.logic.dnf.FunctionalQuery;
-import tools.refinery.store.query.dnf.Query;
+import tools.refinery.logic.dnf.Query;
-import tools.refinery.store.query.dnf.RelationalQuery;
+import tools.refinery.logic.dnf.RelationalQuery;
 import tools.refinery.store.reasoning.ReasoningBuilder;
 import tools.refinery.store.reasoning.interpretation.PartialInterpretation;
 import tools.refinery.store.reasoning.lifting.DnfLifter;
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/PartialRelationRewriter.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/PartialRelationRewriter.java
index 6ad35c20..72ad386c 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/PartialRelationRewriter.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/PartialRelationRewriter.java
@@ -5,9 +5,9 @@
 */
 package tools.refinery.store.reasoning.interpretation;
-import tools.refinery.store.query.literal.AbstractCallLiteral;
+import tools.refinery.logic.literal.AbstractCallLiteral;
-import tools.refinery.store.query.literal.Literal;
+import tools.refinery.logic.literal.Literal;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
 import tools.refinery.store.reasoning.literal.Concreteness;
 import tools.refinery.store.reasoning.literal.Modality;
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/QueryBasedRelationInterpretationFactory.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/QueryBasedRelationInterpretationFactory.java
index 5cdaa185..8fe34b27 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/QueryBasedRelationInterpretationFactory.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/QueryBasedRelationInterpretationFactory.java
@@ -9,12 +9,12 @@ import tools.refinery.store.map.Cursor;
 import tools.refinery.store.model.ModelStoreBuilder;
 import tools.refinery.store.query.ModelQueryAdapter;
 import tools.refinery.store.query.ModelQueryBuilder;
-import tools.refinery.store.query.dnf.Query;
+import tools.refinery.logic.dnf.Query;
 import tools.refinery.store.query.resultset.ResultSet;
 import tools.refinery.store.reasoning.ReasoningAdapter;
 import tools.refinery.store.reasoning.literal.Concreteness;
 import tools.refinery.store.reasoning.representation.PartialSymbol;
-import tools.refinery.store.representation.TruthValue;
+import tools.refinery.logic.term.truthvalue.TruthValue;
 import tools.refinery.store.tuple.Tuple;
 import java.util.Set;
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/QueryBasedRelationRewriter.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/QueryBasedRelationRewriter.java
index 78fdbb89..a6850e75 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/QueryBasedRelationRewriter.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/interpretation/QueryBasedRelationRewriter.java
@@ -5,10 +5,10 @@
 */
 package tools.refinery.store.reasoning.interpretation;
-import tools.refinery.store.query.dnf.RelationalQuery;
+import tools.refinery.logic.dnf.RelationalQuery;
-import tools.refinery.store.query.literal.AbstractCallLiteral;
+import tools.refinery.logic.literal.AbstractCallLiteral;
-import tools.refinery.store.query.literal.Literal;
+import tools.refinery.logic.literal.Literal;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
 import tools.refinery.store.reasoning.literal.Concreteness;
 import tools.refinery.store.reasoning.literal.Modality;
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/lifting/ClauseLifter.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/lifting/ClauseLifter.java
index 17916c02..02e16dc5 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/lifting/ClauseLifter.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/lifting/ClauseLifter.java
@@ -5,13 +5,13 @@
 */
 package tools.refinery.store.reasoning.lifting;
-import tools.refinery.store.query.Constraint;
+import tools.refinery.logic.Constraint;
-import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.logic.dnf.Dnf;
-import tools.refinery.store.query.dnf.DnfClause;
+import tools.refinery.logic.dnf.DnfClause;
-import tools.refinery.store.query.literal.*;
+import tools.refinery.logic.literal.*;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.NodeVariable;
-import tools.refinery.store.query.term.ParameterDirection;
+import tools.refinery.logic.term.ParameterDirection;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
 import tools.refinery.store.reasoning.ReasoningAdapter;
 import tools.refinery.store.reasoning.literal.Concreteness;
 import tools.refinery.store.reasoning.literal.ModalConstraint;
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/lifting/DnfLifter.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/lifting/DnfLifter.java
index 889f595f..1eeb5de1 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/lifting/DnfLifter.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/lifting/DnfLifter.java
@@ -5,9 +5,9 @@
 */
 package tools.refinery.store.reasoning.lifting;
-import tools.refinery.store.query.dnf.*;
+import tools.refinery.logic.dnf.*;
-import tools.refinery.store.query.equality.DnfEqualityChecker;
+import tools.refinery.logic.equality.DnfEqualityChecker;
-import tools.refinery.store.query.literal.Literal;
+import tools.refinery.logic.literal.Literal;
 import tools.refinery.store.reasoning.literal.Concreteness;
 import tools.refinery.store.reasoning.literal.Modality;
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/CountCandidateLowerBoundLiteral.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/CountCandidateLowerBoundLiteral.java
index 91dd2b72..e4c180fc 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/CountCandidateLowerBoundLiteral.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/CountCandidateLowerBoundLiteral.java
@@ -5,13 +5,13 @@
 */
 package tools.refinery.store.reasoning.literal;
-import tools.refinery.store.query.Constraint;
+import tools.refinery.logic.Constraint;
-import tools.refinery.store.query.literal.AbstractCallLiteral;
+import tools.refinery.logic.literal.AbstractCallLiteral;
-import tools.refinery.store.query.literal.AbstractCountLiteral;
+import tools.refinery.logic.literal.AbstractCountLiteral;
-import tools.refinery.store.query.literal.Literal;
+import tools.refinery.logic.literal.Literal;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.logic.term.DataVariable;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
 import java.util.List;
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/CountCandidateUpperBoundLiteral.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/CountCandidateUpperBoundLiteral.java
index 94c9399d..2faeda22 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/CountCandidateUpperBoundLiteral.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/CountCandidateUpperBoundLiteral.java
@@ -5,13 +5,13 @@
 */
 package tools.refinery.store.reasoning.literal;
-import tools.refinery.store.query.Constraint;
+import tools.refinery.logic.Constraint;
-import tools.refinery.store.query.literal.AbstractCallLiteral;
+import tools.refinery.logic.literal.AbstractCallLiteral;
-import tools.refinery.store.query.literal.AbstractCountLiteral;
+import tools.refinery.logic.literal.AbstractCountLiteral;
-import tools.refinery.store.query.literal.Literal;
+import tools.refinery.logic.literal.Literal;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.logic.term.DataVariable;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
 import java.util.List;
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/CountLowerBoundLiteral.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/CountLowerBoundLiteral.java
index b75b0cab..c009cfae 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/CountLowerBoundLiteral.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/CountLowerBoundLiteral.java
@@ -5,13 +5,13 @@
 */
 package tools.refinery.store.reasoning.literal;
-import tools.refinery.store.query.Constraint;
+import tools.refinery.logic.Constraint;
-import tools.refinery.store.query.literal.AbstractCallLiteral;
+import tools.refinery.logic.literal.AbstractCallLiteral;
-import tools.refinery.store.query.literal.AbstractCountLiteral;
+import tools.refinery.logic.literal.AbstractCountLiteral;
-import tools.refinery.store.query.literal.Literal;
+import tools.refinery.logic.literal.Literal;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.logic.term.DataVariable;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
 import java.util.List;
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/CountUpperBoundLiteral.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/CountUpperBoundLiteral.java
index 03842143..84bea8c0 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/CountUpperBoundLiteral.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/CountUpperBoundLiteral.java
@@ -5,15 +5,15 @@
 */
 package tools.refinery.store.reasoning.literal;
-import tools.refinery.store.query.Constraint;
+import tools.refinery.logic.Constraint;
-import tools.refinery.store.query.literal.AbstractCallLiteral;
+import tools.refinery.logic.literal.AbstractCallLiteral;
-import tools.refinery.store.query.literal.AbstractCountLiteral;
+import tools.refinery.logic.literal.AbstractCountLiteral;
-import tools.refinery.store.query.literal.Literal;
+import tools.refinery.logic.literal.Literal;
-import tools.refinery.store.query.substitution.Substitution;
+import tools.refinery.logic.substitution.Substitution;
-import tools.refinery.store.query.term.DataVariable;
+import tools.refinery.logic.term.DataVariable;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
-import tools.refinery.store.representation.cardinality.UpperCardinalities;
+import tools.refinery.logic.term.uppercardinality.UpperCardinalities;
-import tools.refinery.store.representation.cardinality.UpperCardinality;
+import tools.refinery.logic.term.uppercardinality.UpperCardinality;
 import java.util.List;
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/ModalConstraint.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/ModalConstraint.java
index 2235a95d..6b8af460 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/ModalConstraint.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/ModalConstraint.java
@@ -5,11 +5,11 @@
 */
 package tools.refinery.store.reasoning.literal;
-import tools.refinery.store.query.Constraint;
+import tools.refinery.logic.Constraint;
-import tools.refinery.store.query.InvalidQueryException;
+import tools.refinery.logic.InvalidQueryException;
-import tools.refinery.store.query.equality.LiteralEqualityHelper;
+import tools.refinery.logic.equality.LiteralEqualityHelper;
-import tools.refinery.store.query.literal.Reduction;
+import tools.refinery.logic.literal.Reduction;
-import tools.refinery.store.query.term.Parameter;
+import tools.refinery.logic.term.Parameter;
 import tools.refinery.store.query.view.AnySymbolView;
 import java.util.List;
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/Modality.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/Modality.java
index c99a0399..045b7147 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/Modality.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/Modality.java
@@ -5,7 +5,8 @@
 */
 package tools.refinery.store.reasoning.literal;
-import tools.refinery.store.query.literal.CallPolarity;
+import tools.refinery.logic.literal.CallPolarity;
 import java.util.Locale;
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/PartialLiterals.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/PartialLiterals.java
index 2614c26e..72b085a5 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/PartialLiterals.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/PartialLiterals.java
@@ -5,8 +5,8 @@
 */
 package tools.refinery.store.reasoning.literal;
-import tools.refinery.store.query.InvalidQueryException;
+import tools.refinery.logic.InvalidQueryException;
-import tools.refinery.store.query.literal.CallLiteral;
+import tools.refinery.logic.literal.CallLiteral;
 public final class PartialLiterals {
        private PartialLiterals() {
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/AnyPartialSymbol.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/AnyPartialSymbol.java
index 788eef73..3e10c6c1 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/AnyPartialSymbol.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/AnyPartialSymbol.java
@@ -5,7 +5,7 @@
 */
 package tools.refinery.store.reasoning.representation;
-import tools.refinery.store.representation.AnyAbstractDomain;
+import tools.refinery.logic.AnyAbstractDomain;
 public sealed interface AnyPartialSymbol permits AnyPartialFunction, PartialSymbol {
        String name();
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/PartialFunction.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/PartialFunction.java
index e59c8af8..236be7f8 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/PartialFunction.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/PartialFunction.java
@@ -5,7 +5,7 @@
 */
 package tools.refinery.store.reasoning.representation;
-import tools.refinery.store.representation.AbstractDomain;
+import tools.refinery.logic.AbstractDomain;
 public record PartialFunction<A, C>(String name, int arity, AbstractDomain<A, C> abstractDomain)
                implements AnyPartialFunction, PartialSymbol<A, C> {
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/PartialRelation.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/PartialRelation.java
index 4ccb7033..0f108247 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/PartialRelation.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/PartialRelation.java
@@ -5,11 +5,11 @@
 */
 package tools.refinery.store.reasoning.representation;
-import tools.refinery.store.query.Constraint;
+import tools.refinery.logic.AbstractDomain;
-import tools.refinery.store.query.term.Parameter;
+import tools.refinery.logic.Constraint;
-import tools.refinery.store.representation.AbstractDomain;
+import tools.refinery.logic.term.Parameter;
-import tools.refinery.store.representation.TruthValue;
+import tools.refinery.logic.term.truthvalue.TruthValue;
-import tools.refinery.store.representation.TruthValueDomain;
+import tools.refinery.logic.term.truthvalue.TruthValueDomain;
 import java.util.Arrays;
 import java.util.List;
@@ -44,7 +44,7 @@ public record PartialRelation(String name, int arity) implements PartialSymbol<T
        @Override
        public int hashCode() {
-                // Compare by identity to make hash table lookups more efficient.
+                // Compare by identity to make hash table look-ups more efficient.
                return System.identityHashCode(this);
        }
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/PartialSymbol.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/PartialSymbol.java
index 38b2e466..6986d518 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/PartialSymbol.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/PartialSymbol.java
@@ -5,7 +5,7 @@
 */
 package tools.refinery.store.reasoning.representation;
-import tools.refinery.store.representation.AbstractDomain;
+import tools.refinery.logic.AbstractDomain;
 public sealed interface PartialSymbol<A, C> extends AnyPartialSymbol permits PartialFunction, PartialRelation {
        @Override
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/PartialRelationTranslator.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/PartialRelationTranslator.java
index c2039afc..75fb3397 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/PartialRelationTranslator.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/PartialRelationTranslator.java
@@ -5,18 +5,19 @@
 */
 package tools.refinery.store.reasoning.translator;
+import tools.refinery.logic.Constraint;
+import tools.refinery.logic.dnf.Query;
+import tools.refinery.logic.dnf.QueryBuilder;
+import tools.refinery.logic.dnf.RelationalQuery;
+import tools.refinery.logic.literal.Literal;
+import tools.refinery.logic.term.NodeVariable;
+import tools.refinery.logic.term.truthvalue.TruthValue;
 import tools.refinery.store.dse.transition.Rule;
 import tools.refinery.store.dse.transition.objectives.Criteria;
 import tools.refinery.store.dse.transition.objectives.Criterion;
 import tools.refinery.store.dse.transition.objectives.Objective;
 import tools.refinery.store.dse.transition.objectives.Objectives;
 import tools.refinery.store.model.ModelStoreBuilder;
-import tools.refinery.store.query.Constraint;
-import tools.refinery.store.query.dnf.Query;
-import tools.refinery.store.query.dnf.QueryBuilder;
-import tools.refinery.store.query.dnf.RelationalQuery;
-import tools.refinery.store.query.literal.Literal;
-import tools.refinery.store.query.term.NodeVariable;
 import tools.refinery.store.query.view.MayView;
 import tools.refinery.store.query.view.MustView;
 import tools.refinery.store.reasoning.ReasoningAdapter;
@@ -36,12 +37,11 @@ import tools.refinery.store.reasoning.refinement.StorageRefiner;
 import tools.refinery.store.reasoning.representation.PartialRelation;
 import tools.refinery.store.representation.AnySymbol;
 import tools.refinery.store.representation.Symbol;
-import tools.refinery.store.representation.TruthValue;
 import java.util.ArrayList;
 import java.util.function.BiConsumer;
-import static tools.refinery.store.query.literal.Literals.not;
+import static tools.refinery.logic.literal.Literals.not;
 @SuppressWarnings("UnusedReturnValue")
 public final class PartialRelationTranslator extends PartialSymbolTranslator<TruthValue, Boolean> {
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/ContainmentHierarchyTranslator.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/ContainmentHierarchyTranslator.java
index c85bd8b7..1183d456 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/ContainmentHierarchyTranslator.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/ContainmentHierarchyTranslator.java
@@ -5,16 +5,18 @@
 */
 package tools.refinery.store.reasoning.translator.containment;
+import tools.refinery.logic.dnf.Query;
+import tools.refinery.logic.dnf.RelationalQuery;
+import tools.refinery.logic.literal.Connectivity;
+import tools.refinery.logic.literal.Literal;
+import tools.refinery.logic.literal.RepresentativeElectionLiteral;
+import tools.refinery.logic.term.Variable;
+import tools.refinery.logic.term.cardinalityinterval.CardinalityIntervals;
+import tools.refinery.logic.term.uppercardinality.FiniteUpperCardinality;
 import tools.refinery.store.dse.transition.DesignSpaceExplorationBuilder;
 import tools.refinery.store.dse.transition.Rule;
 import tools.refinery.store.model.ModelStoreBuilder;
 import tools.refinery.store.model.ModelStoreConfiguration;
-import tools.refinery.store.query.dnf.Query;
-import tools.refinery.store.query.dnf.RelationalQuery;
-import tools.refinery.store.query.literal.Connectivity;
-import tools.refinery.store.query.literal.Literal;
-import tools.refinery.store.query.literal.RepresentativeElectionLiteral;
-import tools.refinery.store.query.term.Variable;
 import tools.refinery.store.query.view.AnySymbolView;
 import tools.refinery.store.reasoning.lifting.DnfLifter;
 import tools.refinery.store.reasoning.literal.Concreteness;
@@ -28,17 +30,15 @@ import tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslat
 import tools.refinery.store.reasoning.translator.multiplicity.ConstrainedMultiplicity;
 import tools.refinery.store.reasoning.translator.multiplicity.InvalidMultiplicityErrorTranslator;
 import tools.refinery.store.representation.Symbol;
-import tools.refinery.store.representation.cardinality.CardinalityIntervals;
-import tools.refinery.store.representation.cardinality.FiniteUpperCardinality;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import static tools.refinery.store.query.literal.Literals.check;
+import static tools.refinery.logic.term.int_.IntTerms.constant;
-import static tools.refinery.store.query.literal.Literals.not;
+import static tools.refinery.logic.term.int_.IntTerms.less;
-import static tools.refinery.store.query.term.int_.IntTerms.constant;
+import static tools.refinery.logic.literal.Literals.check;
-import static tools.refinery.store.query.term.int_.IntTerms.less;
+import static tools.refinery.logic.literal.Literals.not;
 import static tools.refinery.store.reasoning.ReasoningAdapter.EXISTS_SYMBOL;
 import static tools.refinery.store.reasoning.actions.PartialActionLiterals.add;
 import static tools.refinery.store.reasoning.actions.PartialActionLiterals.focus;
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/ContainmentLinkRefiner.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/ContainmentLinkRefiner.java
index e44fcffd..ef007efc 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/ContainmentLinkRefiner.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/ContainmentLinkRefiner.java
@@ -12,7 +12,7 @@ import tools.refinery.store.reasoning.refinement.PartialInterpretationRefiner;
 import tools.refinery.store.reasoning.representation.PartialRelation;
 import tools.refinery.store.reasoning.representation.PartialSymbol;
 import tools.refinery.store.representation.Symbol;
-import tools.refinery.store.representation.TruthValue;
+import tools.refinery.logic.term.truthvalue.TruthValue;
 import tools.refinery.store.tuple.Tuple;
 import java.util.ArrayList;
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/ContainsRefiner.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/ContainsRefiner.java
index a7196a1c..3fe63339 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/ContainsRefiner.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/ContainsRefiner.java
@@ -11,7 +11,7 @@ import tools.refinery.store.reasoning.refinement.AbstractPartialInterpretationRe
 import tools.refinery.store.reasoning.refinement.PartialInterpretationRefiner;
 import tools.refinery.store.reasoning.representation.PartialSymbol;
 import tools.refinery.store.representation.Symbol;
-import tools.refinery.store.representation.TruthValue;
+import tools.refinery.logic.term.truthvalue.TruthValue;
 import tools.refinery.store.tuple.Tuple;
 import java.util.LinkedHashMap;
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/InferredContainment.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/InferredContainment.java
index 8a757ed2..77c7aaf4 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/InferredContainment.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/containment/InferredContainment.java
@@ -6,7 +6,7 @@
 package tools.refinery.store.reasoning.translator.containment;
 import tools.refinery.store.reasoning.representation.PartialRelation;
-import tools.refinery.store.representation.TruthValue;
+import tools.refinery.logic.term.truthvalue.TruthValue;
 import java.util.Objects;
 import java.util.Set;
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/CrossReferenceUtils.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/CrossReferenceUtils.java
index c4a2f2b3..26449df5 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/CrossReferenceUtils.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/CrossReferenceUtils.java
@@ -5,22 +5,22 @@
 */
 package tools.refinery.store.reasoning.translator.crossreference;
-import tools.refinery.store.query.dnf.Query;
+import tools.refinery.logic.dnf.Query;
-import tools.refinery.store.query.dnf.RelationalQuery;
+import tools.refinery.logic.dnf.RelationalQuery;
-import tools.refinery.store.query.literal.Literal;
+import tools.refinery.logic.literal.Literal;
-import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.logic.term.NodeVariable;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
+import tools.refinery.logic.term.uppercardinality.FiniteUpperCardinality;
 import tools.refinery.store.reasoning.literal.CountLowerBoundLiteral;
 import tools.refinery.store.reasoning.representation.PartialRelation;
 import tools.refinery.store.reasoning.translator.multiplicity.Multiplicity;
-import tools.refinery.store.representation.cardinality.FiniteUpperCardinality;
 import java.util.ArrayList;
 import java.util.List;
-import static tools.refinery.store.query.literal.Literals.check;
+import static tools.refinery.logic.literal.Literals.check;
-import static tools.refinery.store.query.term.int_.IntTerms.constant;
+import static tools.refinery.logic.term.int_.IntTerms.constant;
-import static tools.refinery.store.query.term.int_.IntTerms.less;
+import static tools.refinery.logic.term.int_.IntTerms.less;
 import static tools.refinery.store.reasoning.literal.PartialLiterals.may;
 class CrossReferenceUtils {
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/DirectedCrossReferenceInfo.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/DirectedCrossReferenceInfo.java
index 7241b032..982f835f 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/DirectedCrossReferenceInfo.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/DirectedCrossReferenceInfo.java
@@ -7,7 +7,7 @@ package tools.refinery.store.reasoning.translator.crossreference;
 import tools.refinery.store.reasoning.representation.PartialRelation;
 import tools.refinery.store.reasoning.translator.multiplicity.Multiplicity;
-import tools.refinery.store.representation.TruthValue;
+import tools.refinery.logic.term.truthvalue.TruthValue;
 public record DirectedCrossReferenceInfo(PartialRelation sourceType, Multiplicity sourceMultiplicity,
                                                                                 PartialRelation targetType, Multiplicity targetMultiplicity,
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/DirectedCrossReferenceInitializer.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/DirectedCrossReferenceInitializer.java
index 9347e91e..7cb16a28 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/DirectedCrossReferenceInitializer.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/DirectedCrossReferenceInitializer.java
@@ -11,7 +11,7 @@ import tools.refinery.store.reasoning.refinement.PartialModelInitializer;
 import tools.refinery.store.reasoning.representation.PartialRelation;
 import tools.refinery.store.reasoning.seed.ModelSeed;
 import tools.refinery.store.representation.Symbol;
-import tools.refinery.store.representation.TruthValue;
+import tools.refinery.logic.term.truthvalue.TruthValue;
 import tools.refinery.store.tuple.Tuple;
 class DirectedCrossReferenceInitializer implements PartialModelInitializer {
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/DirectedCrossReferenceRefiner.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/DirectedCrossReferenceRefiner.java
index 2e804b44..75dd5dad 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/DirectedCrossReferenceRefiner.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/DirectedCrossReferenceRefiner.java
@@ -11,7 +11,7 @@ import tools.refinery.store.reasoning.refinement.PartialInterpretationRefiner;
 import tools.refinery.store.reasoning.representation.PartialRelation;
 import tools.refinery.store.reasoning.representation.PartialSymbol;
 import tools.refinery.store.representation.Symbol;
-import tools.refinery.store.representation.TruthValue;
+import tools.refinery.logic.term.truthvalue.TruthValue;
 import tools.refinery.store.tuple.Tuple;
 class DirectedCrossReferenceRefiner extends ConcreteSymbolRefiner<TruthValue, Boolean> {
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/DirectedCrossReferenceTranslator.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/DirectedCrossReferenceTranslator.java
index fc7477f1..5bf1f5ab 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/DirectedCrossReferenceTranslator.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/DirectedCrossReferenceTranslator.java
@@ -5,12 +5,13 @@
 */
 package tools.refinery.store.reasoning.translator.crossreference;
+import tools.refinery.logic.dnf.Query;
+import tools.refinery.logic.dnf.RelationalQuery;
+import tools.refinery.logic.term.truthvalue.TruthValue;
 import tools.refinery.store.dse.propagation.PropagationBuilder;
 import tools.refinery.store.dse.transition.Rule;
 import tools.refinery.store.model.ModelStoreBuilder;
 import tools.refinery.store.model.ModelStoreConfiguration;
-import tools.refinery.store.query.dnf.Query;
-import tools.refinery.store.query.dnf.RelationalQuery;
 import tools.refinery.store.query.view.ForbiddenView;
 import tools.refinery.store.reasoning.lifting.DnfLifter;
 import tools.refinery.store.reasoning.literal.Concreteness;
@@ -21,9 +22,8 @@ import tools.refinery.store.reasoning.translator.TranslationException;
 import tools.refinery.store.reasoning.translator.multiplicity.InvalidMultiplicityErrorTranslator;
 import tools.refinery.store.reasoning.translator.multiplicity.Multiplicity;
 import tools.refinery.store.representation.Symbol;
-import tools.refinery.store.representation.TruthValue;
-import static tools.refinery.store.query.literal.Literals.not;
+import static tools.refinery.logic.literal.Literals.not;
 import static tools.refinery.store.reasoning.actions.PartialActionLiterals.add;
 import static tools.refinery.store.reasoning.actions.PartialActionLiterals.merge;
 import static tools.refinery.store.reasoning.literal.PartialLiterals.*;
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/UndirectedCrossReferenceInfo.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/UndirectedCrossReferenceInfo.java
index 34e9032a..560eb04a 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/UndirectedCrossReferenceInfo.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/UndirectedCrossReferenceInfo.java
@@ -7,7 +7,7 @@ package tools.refinery.store.reasoning.translator.crossreference;
 import tools.refinery.store.reasoning.representation.PartialRelation;
 import tools.refinery.store.reasoning.translator.multiplicity.Multiplicity;
-import tools.refinery.store.representation.TruthValue;
+import tools.refinery.logic.term.truthvalue.TruthValue;
 public record UndirectedCrossReferenceInfo(PartialRelation type, Multiplicity multiplicity, TruthValue defaultValue) {
        public boolean isConstrained() {
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/UndirectedCrossReferenceInitializer.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/UndirectedCrossReferenceInitializer.java
index 77339aa0..5bb1b967 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/UndirectedCrossReferenceInitializer.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/UndirectedCrossReferenceInitializer.java
@@ -13,7 +13,7 @@ import tools.refinery.store.reasoning.representation.PartialRelation;
 import tools.refinery.store.reasoning.seed.ModelSeed;
 import tools.refinery.store.reasoning.translator.TranslationException;
 import tools.refinery.store.representation.Symbol;
-import tools.refinery.store.representation.TruthValue;
+import tools.refinery.logic.term.truthvalue.TruthValue;
 import tools.refinery.store.tuple.Tuple;
 import java.util.LinkedHashMap;
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/UndirectedCrossReferenceRefiner.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/UndirectedCrossReferenceRefiner.java
index 43c1462b..54aca80f 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/UndirectedCrossReferenceRefiner.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/UndirectedCrossReferenceRefiner.java
@@ -11,7 +11,7 @@ import tools.refinery.store.reasoning.refinement.PartialInterpretationRefiner;
 import tools.refinery.store.reasoning.representation.PartialRelation;
 import tools.refinery.store.reasoning.representation.PartialSymbol;
 import tools.refinery.store.representation.Symbol;
-import tools.refinery.store.representation.TruthValue;
+import tools.refinery.logic.term.truthvalue.TruthValue;
 import tools.refinery.store.tuple.Tuple;
 class UndirectedCrossReferenceRefiner extends ConcreteSymbolRefiner<TruthValue, Boolean> {
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/UndirectedCrossReferenceTranslator.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/UndirectedCrossReferenceTranslator.java
index b76838b3..97c0b800 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/UndirectedCrossReferenceTranslator.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/crossreference/UndirectedCrossReferenceTranslator.java
@@ -9,7 +9,7 @@ import tools.refinery.store.dse.propagation.PropagationBuilder;
 import tools.refinery.store.dse.transition.Rule;
 import tools.refinery.store.model.ModelStoreBuilder;
 import tools.refinery.store.model.ModelStoreConfiguration;
-import tools.refinery.store.query.dnf.Query;
+import tools.refinery.logic.dnf.Query;
 import tools.refinery.store.query.view.ForbiddenView;
 import tools.refinery.store.reasoning.lifting.DnfLifter;
 import tools.refinery.store.reasoning.literal.Concreteness;
@@ -19,9 +19,9 @@ import tools.refinery.store.reasoning.translator.PartialRelationTranslator;
 import tools.refinery.store.reasoning.translator.TranslationException;
 import tools.refinery.store.reasoning.translator.multiplicity.InvalidMultiplicityErrorTranslator;
 import tools.refinery.store.representation.Symbol;
-import tools.refinery.store.representation.TruthValue;
+import tools.refinery.logic.term.truthvalue.TruthValue;
-import static tools.refinery.store.query.literal.Literals.not;
+import static tools.refinery.logic.literal.Literals.not;
 import static tools.refinery.store.reasoning.actions.PartialActionLiterals.add;
 import static tools.refinery.store.reasoning.actions.PartialActionLiterals.merge;
 import static tools.refinery.store.reasoning.literal.PartialLiterals.*;
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/metamodel/ReferenceInfo.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/metamodel/ReferenceInfo.java
index 9d7fc9c3..47a2e95f 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/metamodel/ReferenceInfo.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/metamodel/ReferenceInfo.java
@@ -7,7 +7,7 @@ package tools.refinery.store.reasoning.translator.metamodel;
 import tools.refinery.store.reasoning.representation.PartialRelation;
 import tools.refinery.store.reasoning.translator.multiplicity.Multiplicity;
-import tools.refinery.store.representation.TruthValue;
+import tools.refinery.logic.term.truthvalue.TruthValue;
 public record ReferenceInfo(boolean containment, PartialRelation sourceType, Multiplicity multiplicity,
                                                        PartialRelation targetType, PartialRelation opposite, TruthValue defaultValue) {
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/metamodel/ReferenceInfoBuilder.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/metamodel/ReferenceInfoBuilder.java
index 43d01503..39240d6b 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/metamodel/ReferenceInfoBuilder.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/metamodel/ReferenceInfoBuilder.java
@@ -11,8 +11,8 @@ import tools.refinery.store.reasoning.representation.PartialRelation;
 import tools.refinery.store.reasoning.translator.multiplicity.ConstrainedMultiplicity;
 import tools.refinery.store.reasoning.translator.multiplicity.Multiplicity;
 import tools.refinery.store.reasoning.translator.multiplicity.UnconstrainedMultiplicity;
-import tools.refinery.store.representation.TruthValue;
+import tools.refinery.logic.term.truthvalue.TruthValue;
-import tools.refinery.store.representation.cardinality.CardinalityInterval;
+import tools.refinery.logic.term.cardinalityinterval.CardinalityInterval;
 public final class ReferenceInfoBuilder {
        private boolean containment;
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/EqualsRefiner.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/EqualsRefiner.java
index d8db4ec4..0b89ec58 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/EqualsRefiner.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/EqualsRefiner.java
@@ -10,9 +10,9 @@ import tools.refinery.store.reasoning.ReasoningAdapter;
 import tools.refinery.store.reasoning.refinement.AbstractPartialInterpretationRefiner;
 import tools.refinery.store.reasoning.representation.PartialSymbol;
 import tools.refinery.store.representation.Symbol;
-import tools.refinery.store.representation.TruthValue;
+import tools.refinery.logic.term.truthvalue.TruthValue;
-import tools.refinery.store.representation.cardinality.CardinalityInterval;
+import tools.refinery.logic.term.cardinalityinterval.CardinalityInterval;
-import tools.refinery.store.representation.cardinality.CardinalityIntervals;
+import tools.refinery.logic.term.cardinalityinterval.CardinalityIntervals;
 import tools.refinery.store.tuple.Tuple;
 public class EqualsRefiner extends AbstractPartialInterpretationRefiner<TruthValue, Boolean> {
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/EqualsRelationRewriter.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/EqualsRelationRewriter.java
index 61b9488c..d4852f91 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/EqualsRelationRewriter.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/EqualsRelationRewriter.java
@@ -5,25 +5,25 @@
 */
 package tools.refinery.store.reasoning.translator.multiobject;
-import tools.refinery.store.query.dnf.Query;
+import tools.refinery.logic.dnf.Query;
-import tools.refinery.store.query.dnf.RelationalQuery;
+import tools.refinery.logic.dnf.RelationalQuery;
-import tools.refinery.store.query.literal.AbstractCallLiteral;
+import tools.refinery.logic.literal.AbstractCallLiteral;
-import tools.refinery.store.query.literal.CallLiteral;
+import tools.refinery.logic.literal.CallLiteral;
-import tools.refinery.store.query.literal.Literal;
+import tools.refinery.logic.literal.Literal;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
+import tools.refinery.logic.term.uppercardinality.UpperCardinalities;
+import tools.refinery.logic.term.uppercardinality.UpperCardinality;
 import tools.refinery.store.query.view.AnySymbolView;
 import tools.refinery.store.reasoning.interpretation.QueryBasedRelationRewriter;
 import tools.refinery.store.reasoning.literal.Concreteness;
 import tools.refinery.store.reasoning.literal.Modality;
-import tools.refinery.store.representation.cardinality.UpperCardinalities;
-import tools.refinery.store.representation.cardinality.UpperCardinality;
 import java.util.List;
 import java.util.Set;
-import static tools.refinery.store.query.literal.Literals.check;
+import static tools.refinery.logic.literal.Literals.check;
-import static tools.refinery.store.query.term.uppercardinality.UpperCardinalityTerms.constant;
+import static tools.refinery.logic.term.uppercardinality.UpperCardinalityTerms.constant;
-import static tools.refinery.store.query.term.uppercardinality.UpperCardinalityTerms.lessEq;
+import static tools.refinery.logic.term.uppercardinality.UpperCardinalityTerms.lessEq;
 class EqualsRelationRewriter extends QueryBasedRelationRewriter {
        private EqualsRelationRewriter(RelationalQuery may, RelationalQuery must) {
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/ExistsRefiner.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/ExistsRefiner.java
index f134fe92..3908fedb 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/ExistsRefiner.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/ExistsRefiner.java
@@ -10,9 +10,9 @@ import tools.refinery.store.reasoning.ReasoningAdapter;
 import tools.refinery.store.reasoning.refinement.AbstractPartialInterpretationRefiner;
 import tools.refinery.store.reasoning.representation.PartialSymbol;
 import tools.refinery.store.representation.Symbol;
-import tools.refinery.store.representation.TruthValue;
+import tools.refinery.logic.term.truthvalue.TruthValue;
-import tools.refinery.store.representation.cardinality.CardinalityInterval;
+import tools.refinery.logic.term.cardinalityinterval.CardinalityInterval;
-import tools.refinery.store.representation.cardinality.CardinalityIntervals;
+import tools.refinery.logic.term.cardinalityinterval.CardinalityIntervals;
 import tools.refinery.store.tuple.Tuple;
 public class ExistsRefiner extends AbstractPartialInterpretationRefiner<TruthValue, Boolean> {
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/LowerCardinalityView.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/LowerCardinalityView.java
index 9873888c..5691b9e3 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/LowerCardinalityView.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/LowerCardinalityView.java
@@ -5,10 +5,10 @@
 */
 package tools.refinery.store.reasoning.translator.multiobject;
-import tools.refinery.store.query.term.Parameter;
+import tools.refinery.logic.term.Parameter;
 import tools.refinery.store.query.view.AbstractFunctionView;
 import tools.refinery.store.representation.Symbol;
-import tools.refinery.store.representation.cardinality.CardinalityInterval;
+import tools.refinery.logic.term.cardinalityinterval.CardinalityInterval;
 class LowerCardinalityView extends AbstractFunctionView<CardinalityInterval> {
        public LowerCardinalityView(Symbol<CardinalityInterval> symbol) {
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/MultiObjectInitializer.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/MultiObjectInitializer.java
index 89918155..694a800b 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/MultiObjectInitializer.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/MultiObjectInitializer.java
@@ -12,9 +12,9 @@ import tools.refinery.store.reasoning.refinement.PartialModelInitializer;
 import tools.refinery.store.reasoning.seed.ModelSeed;
 import tools.refinery.store.reasoning.translator.TranslationException;
 import tools.refinery.store.representation.Symbol;
-import tools.refinery.store.representation.TruthValue;
+import tools.refinery.logic.term.truthvalue.TruthValue;
-import tools.refinery.store.representation.cardinality.CardinalityInterval;
+import tools.refinery.logic.term.cardinalityinterval.CardinalityInterval;
-import tools.refinery.store.representation.cardinality.CardinalityIntervals;
+import tools.refinery.logic.term.cardinalityinterval.CardinalityIntervals;
 import tools.refinery.store.tuple.Tuple;
 import java.util.Arrays;
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/MultiObjectStorageRefiner.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/MultiObjectStorageRefiner.java
index e48934d8..147ae486 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/MultiObjectStorageRefiner.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/MultiObjectStorageRefiner.java
@@ -9,8 +9,8 @@ import tools.refinery.store.model.Interpretation;
 import tools.refinery.store.model.Model;
 import tools.refinery.store.reasoning.refinement.StorageRefiner;
 import tools.refinery.store.representation.Symbol;
-import tools.refinery.store.representation.cardinality.CardinalityInterval;
+import tools.refinery.logic.term.cardinalityinterval.CardinalityInterval;
-import tools.refinery.store.representation.cardinality.CardinalityIntervals;
+import tools.refinery.logic.term.cardinalityinterval.CardinalityIntervals;
 import tools.refinery.store.tuple.Tuple;
 class MultiObjectStorageRefiner implements StorageRefiner {
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/MultiObjectTranslator.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/MultiObjectTranslator.java
index 97fda9d5..be15b6d7 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/MultiObjectTranslator.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/MultiObjectTranslator.java
@@ -5,17 +5,21 @@
 */
 package tools.refinery.store.reasoning.translator.multiobject;
+import tools.refinery.logic.dnf.Query;
+import tools.refinery.logic.literal.Literals;
+import tools.refinery.logic.term.Variable;
+import tools.refinery.logic.term.cardinalityinterval.CardinalityDomain;
+import tools.refinery.logic.term.cardinalityinterval.CardinalityInterval;
+import tools.refinery.logic.term.int_.IntTerms;
+import tools.refinery.logic.term.uppercardinality.UpperCardinalities;
+import tools.refinery.logic.term.uppercardinality.UpperCardinality;
+import tools.refinery.logic.term.uppercardinality.UpperCardinalityTerms;
 import tools.refinery.store.dse.propagation.PropagationBuilder;
 import tools.refinery.store.dse.transition.Rule;
 import tools.refinery.store.dse.transition.objectives.Criteria;
 import tools.refinery.store.dse.transition.objectives.Objectives;
 import tools.refinery.store.model.ModelStoreBuilder;
 import tools.refinery.store.model.ModelStoreConfiguration;
-import tools.refinery.store.query.dnf.Query;
-import tools.refinery.store.query.literal.Literals;
-import tools.refinery.store.query.term.Variable;
-import tools.refinery.store.query.term.int_.IntTerms;
-import tools.refinery.store.query.term.uppercardinality.UpperCardinalityTerms;
 import tools.refinery.store.query.view.AnySymbolView;
 import tools.refinery.store.reasoning.ReasoningAdapter;
 import tools.refinery.store.reasoning.ReasoningBuilder;
@@ -24,15 +28,11 @@ import tools.refinery.store.reasoning.representation.PartialFunction;
 import tools.refinery.store.reasoning.translator.PartialRelationTranslator;
 import tools.refinery.store.reasoning.translator.RoundingMode;
 import tools.refinery.store.representation.Symbol;
-import tools.refinery.store.representation.cardinality.CardinalityDomain;
-import tools.refinery.store.representation.cardinality.CardinalityInterval;
-import tools.refinery.store.representation.cardinality.UpperCardinalities;
-import tools.refinery.store.representation.cardinality.UpperCardinality;
 import java.util.List;
-import static tools.refinery.store.query.literal.Literals.check;
+import static tools.refinery.logic.literal.Literals.check;
-import static tools.refinery.store.query.term.int_.IntTerms.*;
+import static tools.refinery.logic.term.int_.IntTerms.*;
 public class MultiObjectTranslator implements ModelStoreConfiguration {
        public static final Symbol<CardinalityInterval> COUNT_STORAGE = Symbol.of("COUNT", 1, CardinalityInterval.class,
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/MultiView.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/MultiView.java
index 498bcd83..d81274b3 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/MultiView.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/MultiView.java
@@ -7,8 +7,8 @@ package tools.refinery.store.reasoning.translator.multiobject;
 import tools.refinery.store.query.view.TuplePreservingView;
 import tools.refinery.store.representation.Symbol;
-import tools.refinery.store.representation.cardinality.CardinalityInterval;
+import tools.refinery.logic.term.cardinalityinterval.CardinalityInterval;
-import tools.refinery.store.representation.cardinality.CardinalityIntervals;
+import tools.refinery.logic.term.cardinalityinterval.CardinalityIntervals;
 import tools.refinery.store.tuple.Tuple;
 class MultiView extends TuplePreservingView<CardinalityInterval> {
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/UpperCardinalityView.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/UpperCardinalityView.java
index 6be6ae1b..5797c4b0 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/UpperCardinalityView.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiobject/UpperCardinalityView.java
@@ -5,11 +5,11 @@
 */
 package tools.refinery.store.reasoning.translator.multiobject;
-import tools.refinery.store.query.term.Parameter;
+import tools.refinery.logic.term.Parameter;
 import tools.refinery.store.query.view.AbstractFunctionView;
 import tools.refinery.store.representation.Symbol;
-import tools.refinery.store.representation.cardinality.CardinalityInterval;
+import tools.refinery.logic.term.cardinalityinterval.CardinalityInterval;
-import tools.refinery.store.representation.cardinality.UpperCardinality;
+import tools.refinery.logic.term.uppercardinality.UpperCardinality;
 class UpperCardinalityView extends AbstractFunctionView<CardinalityInterval> {
        public UpperCardinalityView(Symbol<CardinalityInterval> symbol) {
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiplicity/ConstrainedMultiplicity.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiplicity/ConstrainedMultiplicity.java
index 9db9cc96..c327aac8 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiplicity/ConstrainedMultiplicity.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiplicity/ConstrainedMultiplicity.java
@@ -7,9 +7,9 @@ package tools.refinery.store.reasoning.translator.multiplicity;
 import tools.refinery.store.reasoning.representation.PartialRelation;
 import tools.refinery.store.reasoning.translator.TranslationException;
-import tools.refinery.store.representation.cardinality.CardinalityInterval;
+import tools.refinery.logic.term.cardinalityinterval.CardinalityInterval;
-import tools.refinery.store.representation.cardinality.CardinalityIntervals;
+import tools.refinery.logic.term.cardinalityinterval.CardinalityIntervals;
-import tools.refinery.store.representation.cardinality.NonEmptyCardinalityInterval;
+import tools.refinery.logic.term.cardinalityinterval.NonEmptyCardinalityInterval;
 public record ConstrainedMultiplicity(NonEmptyCardinalityInterval multiplicity, PartialRelation errorSymbol)
                implements Multiplicity {
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiplicity/InvalidMultiplicityErrorTranslator.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiplicity/InvalidMultiplicityErrorTranslator.java
index a506d802..0ca6eac2 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiplicity/InvalidMultiplicityErrorTranslator.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiplicity/InvalidMultiplicityErrorTranslator.java
@@ -5,31 +5,26 @@
 */
 package tools.refinery.store.reasoning.translator.multiplicity;
+import tools.refinery.logic.dnf.Query;
+import tools.refinery.logic.term.Variable;
+import tools.refinery.logic.term.uppercardinality.FiniteUpperCardinality;
+import tools.refinery.logic.term.uppercardinality.UpperCardinalities;
+import tools.refinery.logic.term.uppercardinality.UpperCardinality;
+import tools.refinery.logic.term.uppercardinality.UpperCardinalityTerms;
 import tools.refinery.store.dse.transition.objectives.Objectives;
 import tools.refinery.store.model.ModelStoreBuilder;
 import tools.refinery.store.model.ModelStoreConfiguration;
-import tools.refinery.store.query.dnf.Query;
-import tools.refinery.store.query.term.Variable;
-import tools.refinery.store.query.term.int_.IntTerms;
 import tools.refinery.store.reasoning.ReasoningAdapter;
 import tools.refinery.store.reasoning.lifting.DnfLifter;
 import tools.refinery.store.reasoning.literal.*;
 import tools.refinery.store.reasoning.representation.PartialRelation;
 import tools.refinery.store.reasoning.translator.PartialRelationTranslator;
 import tools.refinery.store.reasoning.translator.TranslationException;
-import tools.refinery.store.representation.cardinality.FiniteUpperCardinality;
-import tools.refinery.store.representation.cardinality.UpperCardinalities;
-import tools.refinery.store.representation.cardinality.UpperCardinality;
 import java.util.List;
-import static tools.refinery.store.query.literal.Literals.check;
+import static tools.refinery.logic.literal.Literals.check;
-import static tools.refinery.store.query.term.int_.IntTerms.INT_SUM;
+import static tools.refinery.logic.term.int_.IntTerms.*;
-import static tools.refinery.store.query.term.int_.IntTerms.constant;
-import static tools.refinery.store.query.term.int_.IntTerms.greater;
-import static tools.refinery.store.query.term.int_.IntTerms.sub;
-import static tools.refinery.store.query.term.uppercardinality.UpperCardinalityTerms.constant;
-import static tools.refinery.store.query.term.uppercardinality.UpperCardinalityTerms.less;
 import static tools.refinery.store.reasoning.literal.PartialLiterals.candidateMust;
 import static tools.refinery.store.reasoning.literal.PartialLiterals.must;
@@ -81,17 +76,18 @@ public class InvalidMultiplicityErrorTranslator implements ModelStoreConfigurati
                        mustBuilder.clause(UpperCardinality.class, existingContents -> List.of(
                                        must(nodeType.call(node)),
                                        new CountUpperBoundLiteral(existingContents, linkType, arguments),
-                                        check(less(existingContents, constant(lowerBoundCardinality)))
+                                        check(UpperCardinalityTerms.less(existingContents,
+                                                        UpperCardinalityTerms.constant(lowerBoundCardinality)))
                        ));
                        candidateMayBuilder.clause(Integer.class, existingContents -> List.of(
                                        candidateMust(nodeType.call(node)),
                                        new CountCandidateLowerBoundLiteral(existingContents, linkType, arguments),
-                                        check(IntTerms.less(existingContents, constant(lowerBound)))
+                                        check(less(existingContents, constant(lowerBound)))
                        ));
                        candidateMustBuilder.clause(Integer.class, existingContents -> List.of(
                                        candidateMust(nodeType.call(node)),
                                        new CountCandidateUpperBoundLiteral(existingContents, linkType, arguments),
-                                        check(IntTerms.less(existingContents, constant(lowerBound)))
+                                        check(less(existingContents, constant(lowerBound)))
                        ));
                        missingBuilder.clause(Integer.class, existingContents -> List.of(
                                        candidateMust(nodeType.call(node)),
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiplicity/Multiplicity.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiplicity/Multiplicity.java
index d1d6dd1e..d6035781 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiplicity/Multiplicity.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiplicity/Multiplicity.java
@@ -5,7 +5,7 @@
 */
 package tools.refinery.store.reasoning.translator.multiplicity;
-import tools.refinery.store.representation.cardinality.CardinalityInterval;
+import tools.refinery.logic.term.cardinalityinterval.CardinalityInterval;
 public sealed interface Multiplicity permits ConstrainedMultiplicity, UnconstrainedMultiplicity {
        CardinalityInterval multiplicity();
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiplicity/UnconstrainedMultiplicity.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiplicity/UnconstrainedMultiplicity.java
index 2159b88c..fb669a79 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiplicity/UnconstrainedMultiplicity.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/multiplicity/UnconstrainedMultiplicity.java
@@ -5,8 +5,8 @@
 */
 package tools.refinery.store.reasoning.translator.multiplicity;
-import tools.refinery.store.representation.cardinality.CardinalityInterval;
+import tools.refinery.logic.term.cardinalityinterval.CardinalityInterval;
-import tools.refinery.store.representation.cardinality.CardinalityIntervals;
+import tools.refinery.logic.term.cardinalityinterval.CardinalityIntervals;
 // Singleton implementation, because there is only a single complete interval.
 @SuppressWarnings("squid:S6548")
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/opposite/OppositeRelationTranslator.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/opposite/OppositeRelationTranslator.java
index 6e15a628..29abed7a 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/opposite/OppositeRelationTranslator.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/opposite/OppositeRelationTranslator.java
@@ -5,11 +5,11 @@
 */
 package tools.refinery.store.reasoning.translator.opposite;
+import tools.refinery.logic.literal.AbstractCallLiteral;
+import tools.refinery.logic.literal.Literal;
+import tools.refinery.logic.term.Variable;
 import tools.refinery.store.model.ModelStoreBuilder;
 import tools.refinery.store.model.ModelStoreConfiguration;
-import tools.refinery.store.query.literal.AbstractCallLiteral;
-import tools.refinery.store.query.literal.Literal;
-import tools.refinery.store.query.term.Variable;
 import tools.refinery.store.reasoning.interpretation.PartialRelationRewriter;
 import tools.refinery.store.reasoning.literal.Concreteness;
 import tools.refinery.store.reasoning.literal.ModalConstraint;
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/predicate/PredicateTranslator.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/predicate/PredicateTranslator.java
index b401118e..010ce977 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/predicate/PredicateTranslator.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/predicate/PredicateTranslator.java
@@ -5,13 +5,14 @@
 */
 package tools.refinery.store.reasoning.translator.predicate;
+import tools.refinery.logic.dnf.Query;
+import tools.refinery.logic.dnf.RelationalQuery;
+import tools.refinery.logic.literal.Literal;
+import tools.refinery.logic.term.NodeVariable;
+import tools.refinery.logic.term.Variable;
+import tools.refinery.logic.term.truthvalue.TruthValue;
 import tools.refinery.store.model.ModelStoreBuilder;
 import tools.refinery.store.model.ModelStoreConfiguration;
-import tools.refinery.store.query.dnf.Query;
-import tools.refinery.store.query.dnf.RelationalQuery;
-import tools.refinery.store.query.literal.Literal;
-import tools.refinery.store.query.term.NodeVariable;
-import tools.refinery.store.query.term.Variable;
 import tools.refinery.store.query.view.ForbiddenView;
 import tools.refinery.store.query.view.MayView;
 import tools.refinery.store.query.view.MustView;
@@ -19,9 +20,8 @@ import tools.refinery.store.reasoning.representation.PartialRelation;
 import tools.refinery.store.reasoning.translator.PartialRelationTranslator;
 import tools.refinery.store.reasoning.translator.TranslationException;
 import tools.refinery.store.representation.Symbol;
-import tools.refinery.store.representation.TruthValue;
-import static tools.refinery.store.query.literal.Literals.not;
+import static tools.refinery.logic.literal.Literals.not;
 import static tools.refinery.store.reasoning.literal.PartialLiterals.may;
 import static tools.refinery.store.reasoning.literal.PartialLiterals.must;
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/proxy/PartialRelationTranslatorProxy.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/proxy/PartialRelationTranslatorProxy.java
index 45dc5bd2..50873993 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/proxy/PartialRelationTranslatorProxy.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/proxy/PartialRelationTranslatorProxy.java
@@ -5,11 +5,11 @@
 */
 package tools.refinery.store.reasoning.translator.proxy;
+import tools.refinery.logic.literal.AbstractCallLiteral;
+import tools.refinery.logic.literal.Literal;
+import tools.refinery.logic.term.Variable;
 import tools.refinery.store.model.ModelStoreBuilder;
 import tools.refinery.store.model.ModelStoreConfiguration;
-import tools.refinery.store.query.literal.AbstractCallLiteral;
-import tools.refinery.store.query.literal.Literal;
-import tools.refinery.store.query.term.Variable;
 import tools.refinery.store.reasoning.interpretation.PartialRelationRewriter;
 import tools.refinery.store.reasoning.literal.Concreteness;
 import tools.refinery.store.reasoning.literal.ModalConstraint;
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/InferredTypeRefiner.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/InferredTypeRefiner.java
index 40a7b3fa..257b9136 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/InferredTypeRefiner.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/InferredTypeRefiner.java
@@ -10,7 +10,7 @@ import tools.refinery.store.reasoning.ReasoningAdapter;
 import tools.refinery.store.reasoning.refinement.AbstractPartialInterpretationRefiner;
 import tools.refinery.store.reasoning.representation.PartialSymbol;
 import tools.refinery.store.representation.Symbol;
-import tools.refinery.store.representation.TruthValue;
+import tools.refinery.logic.term.truthvalue.TruthValue;
 import tools.refinery.store.tuple.Tuple;
 class InferredTypeRefiner extends AbstractPartialInterpretationRefiner<TruthValue, Boolean> {
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeAnalysisResult.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeAnalysisResult.java
index ebe0d1b9..324e2b9e 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeAnalysisResult.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeAnalysisResult.java
@@ -6,7 +6,7 @@
 package tools.refinery.store.reasoning.translator.typehierarchy;
 import tools.refinery.store.reasoning.representation.PartialRelation;
-import tools.refinery.store.representation.TruthValue;
+import tools.refinery.logic.term.truthvalue.TruthValue;
 import java.util.*;
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyInitializer.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyInitializer.java
index 233e43f0..aa76d927 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyInitializer.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyInitializer.java
@@ -10,7 +10,7 @@ import tools.refinery.store.reasoning.refinement.PartialModelInitializer;
 import tools.refinery.store.reasoning.representation.PartialRelation;
 import tools.refinery.store.reasoning.seed.ModelSeed;
 import tools.refinery.store.representation.Symbol;
-import tools.refinery.store.representation.TruthValue;
+import tools.refinery.logic.term.truthvalue.TruthValue;
 import tools.refinery.store.tuple.Tuple;
 import java.util.Arrays;
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyTranslator.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyTranslator.java
index 37ea1448..700bbe88 100644
--- a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyTranslator.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyTranslator.java
@@ -5,11 +5,11 @@
 */
 package tools.refinery.store.reasoning.translator.typehierarchy;
+import tools.refinery.logic.dnf.Query;
 import tools.refinery.store.dse.transition.Rule;
 import tools.refinery.store.dse.transition.actions.ActionLiteral;
 import tools.refinery.store.model.ModelStoreBuilder;
 import tools.refinery.store.model.ModelStoreConfiguration;
-import tools.refinery.store.query.dnf.Query;
 import tools.refinery.store.reasoning.ReasoningBuilder;
 import tools.refinery.store.reasoning.actions.PartialActionLiterals;
 import tools.refinery.store.reasoning.literal.PartialLiterals;
@@ -21,7 +21,7 @@ import tools.refinery.store.representation.Symbol;
 import java.util.ArrayList;
-import static tools.refinery.store.query.literal.Literals.not;
+import static tools.refinery.logic.literal.Literals.not;
 import static tools.refinery.store.reasoning.literal.PartialLiterals.candidateMust;
 import static tools.refinery.store.reasoning.literal.PartialLiterals.may;
diff --git a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/PartialModelTest.java b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/PartialModelTest.java
index f8135102..2aa058a4 100644
--- a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/PartialModelTest.java
+++ b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/PartialModelTest.java
@@ -6,10 +6,11 @@
 package tools.refinery.store.reasoning;
 import org.junit.jupiter.api.Test;
+import tools.refinery.logic.dnf.Query;
+import tools.refinery.logic.term.Variable;
+import tools.refinery.logic.term.truthvalue.TruthValue;
 import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.query.ModelQueryAdapter;
-import tools.refinery.store.query.dnf.Query;
-import tools.refinery.store.query.term.Variable;
 import tools.refinery.store.query.interpreter.QueryInterpreterAdapter;
 import tools.refinery.store.query.view.ForbiddenView;
 import tools.refinery.store.reasoning.literal.Concreteness;
@@ -18,14 +19,13 @@ import tools.refinery.store.reasoning.seed.ModelSeed;
 import tools.refinery.store.reasoning.translator.PartialRelationTranslator;
 import tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslator;
 import tools.refinery.store.representation.Symbol;
-import tools.refinery.store.representation.TruthValue;
 import tools.refinery.store.tuple.Tuple;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.Matchers.nullValue;
-import static tools.refinery.store.query.literal.Literals.not;
+import static tools.refinery.logic.literal.Literals.not;
 import static tools.refinery.store.reasoning.ReasoningAdapter.EQUALS_SYMBOL;
 import static tools.refinery.store.reasoning.ReasoningAdapter.EXISTS_SYMBOL;
 import static tools.refinery.store.reasoning.literal.PartialLiterals.may;
diff --git a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/lifting/DnfLifterTest.java b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/lifting/DnfLifterTest.java
index 793d1cec..f3e4d3b0 100644
--- a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/lifting/DnfLifterTest.java
+++ b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/lifting/DnfLifterTest.java
@@ -7,9 +7,10 @@ package tools.refinery.store.reasoning.lifting;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import tools.refinery.store.query.dnf.Dnf;
+import tools.refinery.logic.dnf.Dnf;
-import tools.refinery.store.query.dnf.Query;
+import tools.refinery.logic.dnf.Query;
-import tools.refinery.store.query.term.ParameterDirection;
+import tools.refinery.logic.term.ParameterDirection;
+import tools.refinery.logic.term.truthvalue.TruthValue;
 import tools.refinery.store.query.view.AnySymbolView;
 import tools.refinery.store.query.view.FunctionView;
 import tools.refinery.store.query.view.MustView;
@@ -20,15 +21,14 @@ import tools.refinery.store.reasoning.literal.Modality;
 import tools.refinery.store.reasoning.representation.PartialRelation;
 import tools.refinery.store.reasoning.representation.PartialSymbol;
 import tools.refinery.store.representation.Symbol;
-import tools.refinery.store.representation.TruthValue;
 import java.util.List;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static tools.refinery.store.query.literal.Literals.check;
+import static tools.refinery.logic.literal.Literals.check;
-import static tools.refinery.store.query.literal.Literals.not;
+import static tools.refinery.logic.literal.Literals.not;
-import static tools.refinery.store.query.term.int_.IntTerms.*;
+import static tools.refinery.logic.term.int_.IntTerms.*;
-import static tools.refinery.store.query.tests.QueryMatchers.structurallyEqualTo;
+import static tools.refinery.logic.tests.QueryMatchers.structurallyEqualTo;
 class DnfLifterTest {
        private static final Symbol<TruthValue> friendSymbol = Symbol.of("friend", 2, TruthValue.class,
@@ -49,7 +49,7 @@ class DnfLifterTest {
        @Test
        void liftPartialRelationCallTest() {
                var input = Query.of("Actual", (builder, p1) -> builder.clause((v1) -> List.of(
-                        friend.call(p1, v1)
+                                friend.call(p1, v1)
                ))).getDnf();
                var actual = sut.lift(Modality.MUST, Concreteness.PARTIAL, input);
@@ -204,7 +204,7 @@ class DnfLifterTest {
        @Test
        void liftPartialRelationTransitiveCallTest() {
-                var input = Query.of("Actual", (builder, p1, p2)-> builder.clause(
+                var input = Query.of("Actual", (builder, p1, p2) -> builder.clause(
                                friend.callTransitive(p1, p2),
                                not(person.call(p2))
                )).getDnf();
@@ -233,7 +233,7 @@ class DnfLifterTest {
        @Test
        void liftPartialSymbolTransitiveCallTest() {
-                var input = Query.of("Actual", (builder, p1, p2)-> builder.clause(
+                var input = Query.of("Actual", (builder, p1, p2) -> builder.clause(
                                friendMustView.callTransitive(p1, p2),
                                not(person.call(p2))
                )).getDnf();
@@ -332,7 +332,8 @@ class DnfLifterTest {
                var expected = Query.of("Expected", (builder, p1, p2) -> builder.clause(
                                ModalConstraint.of(Modality.MAY, Concreteness.PARTIAL, friend).call(p1, p2),
-                                not(ModalConstraint.of(Modality.MUST, Concreteness.PARTIAL, ReasoningAdapter.EQUALS_SYMBOL).call(p1, p2))
+                                not(ModalConstraint.of(Modality.MUST, Concreteness.PARTIAL, ReasoningAdapter.EQUALS_SYMBOL).call(p1,
+                        p2))
                )).getDnf();
                assertThat(actual, structurallyEqualTo(expected));
diff --git a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/containment/ContainmentHierarchyTranslatorTest.java b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/containment/ContainmentHierarchyTranslatorTest.java
index 1d0ac02d..e889b80d 100644
--- a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/containment/ContainmentHierarchyTranslatorTest.java
+++ b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/containment/ContainmentHierarchyTranslatorTest.java
@@ -18,8 +18,8 @@ import tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslat
 import tools.refinery.store.reasoning.translator.multiplicity.UnconstrainedMultiplicity;
 import tools.refinery.store.reasoning.translator.typehierarchy.TypeHierarchy;
 import tools.refinery.store.reasoning.translator.typehierarchy.TypeHierarchyTranslator;
-import tools.refinery.store.representation.TruthValue;
+import tools.refinery.logic.term.truthvalue.TruthValue;
-import tools.refinery.store.representation.cardinality.CardinalityIntervals;
+import tools.refinery.logic.term.cardinalityinterval.CardinalityIntervals;
 import tools.refinery.store.tuple.Tuple;
 import java.util.Map;
diff --git a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/metamodel/MetamodelBuilderTest.java b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/metamodel/MetamodelBuilderTest.java
index ba6ba6da..e2b3f31e 100644
--- a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/metamodel/MetamodelBuilderTest.java
+++ b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/metamodel/MetamodelBuilderTest.java
@@ -8,7 +8,7 @@ package tools.refinery.store.reasoning.translator.metamodel;
 import org.junit.jupiter.api.Test;
 import tools.refinery.store.reasoning.representation.PartialRelation;
 import tools.refinery.store.reasoning.translator.TranslationException;
-import tools.refinery.store.representation.cardinality.CardinalityIntervals;
+import tools.refinery.logic.term.cardinalityinterval.CardinalityIntervals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
diff --git a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/metamodel/MetamodelTest.java b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/metamodel/MetamodelTest.java
index 88e6a4d7..f8e9e1b5 100644
--- a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/metamodel/MetamodelTest.java
+++ b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/metamodel/MetamodelTest.java
@@ -16,8 +16,8 @@ import tools.refinery.store.reasoning.representation.PartialRelation;
 import tools.refinery.store.reasoning.seed.ModelSeed;
 import tools.refinery.store.reasoning.translator.containment.ContainmentHierarchyTranslator;
 import tools.refinery.store.reasoning.translator.multiobject.MultiObjectTranslator;
-import tools.refinery.store.representation.TruthValue;
+import tools.refinery.logic.term.truthvalue.TruthValue;
-import tools.refinery.store.representation.cardinality.CardinalityIntervals;
+import tools.refinery.logic.term.cardinalityinterval.CardinalityIntervals;
 import tools.refinery.store.tuple.Tuple;
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/multiobject/PartialCountTest.java b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/multiobject/PartialCountTest.java
index 48a046fc..5ef189d5 100644
--- a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/multiobject/PartialCountTest.java
+++ b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/multiobject/PartialCountTest.java
@@ -8,9 +8,9 @@ package tools.refinery.store.reasoning.translator.multiobject;
 import org.junit.jupiter.api.Test;
 import tools.refinery.store.model.ModelStore;
 import tools.refinery.store.query.ModelQueryAdapter;
-import tools.refinery.store.query.dnf.Query;
+import tools.refinery.logic.dnf.Query;
 import tools.refinery.store.query.resultset.ResultSet;
-import tools.refinery.store.query.term.Variable;
+import tools.refinery.logic.term.Variable;
 import tools.refinery.store.query.interpreter.QueryInterpreterAdapter;
 import tools.refinery.store.reasoning.ReasoningAdapter;
 import tools.refinery.store.reasoning.ReasoningStoreAdapter;
@@ -20,17 +20,17 @@ import tools.refinery.store.reasoning.representation.PartialRelation;
 import tools.refinery.store.reasoning.seed.ModelSeed;
 import tools.refinery.store.reasoning.translator.PartialRelationTranslator;
 import tools.refinery.store.representation.Symbol;
-import tools.refinery.store.representation.TruthValue;
+import tools.refinery.logic.term.truthvalue.TruthValue;
-import tools.refinery.store.representation.cardinality.CardinalityIntervals;
+import tools.refinery.logic.term.cardinalityinterval.CardinalityIntervals;
-import tools.refinery.store.representation.cardinality.UpperCardinalities;
+import tools.refinery.logic.term.uppercardinality.UpperCardinalities;
-import tools.refinery.store.representation.cardinality.UpperCardinality;
+import tools.refinery.logic.term.uppercardinality.UpperCardinality;
 import tools.refinery.store.tuple.Tuple;
 import java.util.List;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
-import static tools.refinery.store.query.literal.Literals.not;
+import static tools.refinery.logic.literal.Literals.not;
 import static tools.refinery.store.reasoning.literal.PartialLiterals.must;
 class PartialCountTest {
diff --git a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/ConcreteSupertypeTest.java b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/ConcreteSupertypeTest.java
index 4bef9d8e..b9edcf75 100644
--- a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/ConcreteSupertypeTest.java
+++ b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/ConcreteSupertypeTest.java
@@ -14,7 +14,7 @@ import tools.refinery.store.reasoning.ReasoningStoreAdapter;
 import tools.refinery.store.reasoning.literal.Concreteness;
 import tools.refinery.store.reasoning.representation.PartialRelation;
 import tools.refinery.store.reasoning.seed.ModelSeed;
-import tools.refinery.store.representation.TruthValue;
+import tools.refinery.logic.term.truthvalue.TruthValue;
 import tools.refinery.store.tuple.Tuple;
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeAnalysisExampleHierarchyTest.java b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeAnalysisExampleHierarchyTest.java
index d9a5477e..d860c7d6 100644
--- a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeAnalysisExampleHierarchyTest.java
+++ b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeAnalysisExampleHierarchyTest.java
@@ -9,7 +9,7 @@ import org.hamcrest.Matchers;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import tools.refinery.store.reasoning.representation.PartialRelation;
-import tools.refinery.store.representation.TruthValue;
+import tools.refinery.logic.term.truthvalue.TruthValue;
 import java.util.Set;
diff --git a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyPartialModelTest.java b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyPartialModelTest.java
index 5af725bb..e87b2684 100644
--- a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyPartialModelTest.java
+++ b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyPartialModelTest.java
@@ -16,7 +16,7 @@ import tools.refinery.store.reasoning.ReasoningStoreAdapter;
 import tools.refinery.store.reasoning.literal.Concreteness;
 import tools.refinery.store.reasoning.representation.PartialRelation;
 import tools.refinery.store.reasoning.seed.ModelSeed;
-import tools.refinery.store.representation.TruthValue;
+import tools.refinery.logic.term.truthvalue.TruthValue;
 import tools.refinery.store.tuple.Tuple;
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyTest.java b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyTest.java
index 931c62dd..b7c99d2d 100644
--- a/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyTest.java
+++ b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyTest.java
@@ -9,7 +9,7 @@ import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Test;
 import tools.refinery.store.reasoning.representation.PartialRelation;
 import tools.refinery.store.reasoning.translator.TranslationException;
-import tools.refinery.store.representation.TruthValue;
+import tools.refinery.logic.term.truthvalue.TruthValue;
 import java.util.Set;
author	Kristóf Marussy <kristof@marussy.com>	2024-03-07 22:10:42 +0100
committer	Kristóf Marussy <kristof@marussy.com>	2024-04-07 14:55:46 +0200
commit	16a9b534adec2c53b50f92a43c1623918b1c59c0 (patch)
tree	690b299a2ca31e302ddad219a7aa94bcf86d5d0b
parent	fix(frontend): * operator highlighting (diff)
download	refinery-16a9b534adec2c53b50f92a43c1623918b1c59c0.tar.gz refinery-16a9b534adec2c53b50f92a43c1623918b1c59c0.tar.zst refinery-16a9b534adec2c53b50f92a43c1623918b1c59c0.zip