refactor: rename PartialInterpretation adapter

57 files changed, 335 insertions, 329 deletions

diff --git a/settings.gradle b/settings.gradle
index 94a3c2e6..81bcb53b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -7,9 +7,9 @@ include 'language-model'
 include 'language-semantics'
 include 'language-web'
 include 'store'
-include 'store-partial'
 include 'store-query'
 include 'store-query-viatra'
+include 'store-reasoning'
 
 for (project in rootProject.children) {
         def projectName = project.name
diff --git a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/AnyPartialSymbolInterpretation.java b/subprojects/store-partial/src/main/java/tools/refinery/store/partial/AnyPartialSymbolInterpretation.java
deleted file mode 100644
index b6b1f2be..00000000
--- a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/AnyPartialSymbolInterpretation.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package tools.refinery.store.partial;
-
-import tools.refinery.store.partial.representation.AnyPartialSymbol;
-
-public sealed interface AnyPartialSymbolInterpretation permits PartialSymbolInterpretation {
-        PartialInterpretationAdapter getAdapter();
-
-        AnyPartialSymbol getPartialSymbol();
-
-        int countUnfinished();
-
-        int countErrors();
-}
diff --git a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/PartialInterpretation.java b/subprojects/store-partial/src/main/java/tools/refinery/store/partial/PartialInterpretation.java
deleted file mode 100644
index d76f8728..00000000
--- a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/PartialInterpretation.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package tools.refinery.store.partial;
-
-import tools.refinery.store.partial.internal.PartialInterpretationBuilderImpl;
-import tools.refinery.store.adapter.ModelAdapterBuilderFactory;
-import tools.refinery.store.model.ModelStoreBuilder;
-import tools.refinery.store.partial.representation.PartialRelation;
-
-public final class PartialInterpretation extends ModelAdapterBuilderFactory<PartialInterpretationAdapter,
-                PartialInterpretationStoreAdapter, PartialInterpretationBuilder> {
-        public static final PartialInterpretation ADAPTER = new PartialInterpretation();
-
-        public static final PartialRelation EXISTS = new PartialRelation("exists", 1);
-
-        public static final PartialRelation EQUALS = new PartialRelation("equals", 1);
-
-        private PartialInterpretation() {
-                super(PartialInterpretationAdapter.class, PartialInterpretationStoreAdapter.class, PartialInterpretationBuilder.class);
-        }
-
-        @Override
-        public PartialInterpretationBuilder createBuilder(ModelStoreBuilder storeBuilder) {
-                return new PartialInterpretationBuilderImpl(storeBuilder);
-        }
-}
diff --git a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/PartialInterpretationAdapter.java b/subprojects/store-partial/src/main/java/tools/refinery/store/partial/PartialInterpretationAdapter.java
deleted file mode 100644
index b811ae7a..00000000
--- a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/PartialInterpretationAdapter.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package tools.refinery.store.partial;
-
-import tools.refinery.store.adapter.ModelAdapter;
-import tools.refinery.store.partial.representation.AnyPartialSymbol;
-import tools.refinery.store.partial.representation.PartialSymbol;
-import tools.refinery.store.query.Dnf;
-import tools.refinery.store.query.ResultSet;
-
-public interface PartialInterpretationAdapter extends ModelAdapter {
-        @Override
-        PartialInterpretationStoreAdapter getStoreAdapter();
-
-        default AnyPartialSymbolInterpretation getPartialInterpretation(AnyPartialSymbol partialSymbol) {
-                return getPartialInterpretation((PartialSymbol<?, ?>) partialSymbol);
-        }
-
-        <A, C> PartialSymbolInterpretation<A, C> getPartialInterpretation(PartialSymbol<A, C> partialSymbol);
-
-        ResultSet getLiftedResultSet(Dnf query);
-}
diff --git a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/PartialInterpretationBuilder.java b/subprojects/store-partial/src/main/java/tools/refinery/store/partial/PartialInterpretationBuilder.java
deleted file mode 100644
index db042466..00000000
--- a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/PartialInterpretationBuilder.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package tools.refinery.store.partial;
-
-import tools.refinery.store.adapter.ModelAdapterBuilder;
-import tools.refinery.store.model.ModelStore;
-import tools.refinery.store.query.Dnf;
-import tools.refinery.store.partial.literal.Modality;
-
-import java.util.Collection;
-import java.util.List;
-
-@SuppressWarnings("UnusedReturnValue")
-public interface PartialInterpretationBuilder extends ModelAdapterBuilder {
-        default PartialInterpretationBuilder liftedQueries(Dnf... liftedQueries) {
-                return liftedQueries(List.of(liftedQueries));
-        }
-
-        default PartialInterpretationBuilder liftedQueries(Collection<Dnf> liftedQueries) {
-                liftedQueries.forEach(this::liftedQuery);
-                return this;
-        }
-
-        PartialInterpretationBuilder liftedQuery(Dnf liftedQuery);
-
-        Dnf lift(Modality modality, Dnf query);
-
-        @Override
-        PartialInterpretationStoreAdapter createStoreAdapter(ModelStore store);
-}
diff --git a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/internal/PartialInterpretationAdapterImpl.java b/subprojects/store-partial/src/main/java/tools/refinery/store/partial/internal/PartialInterpretationAdapterImpl.java
deleted file mode 100644
index c482d8a2..00000000
--- a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/internal/PartialInterpretationAdapterImpl.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package tools.refinery.store.partial.internal;
-
-import tools.refinery.store.model.Model;
-import tools.refinery.store.partial.PartialInterpretationAdapter;
-import tools.refinery.store.partial.PartialSymbolInterpretation;
-import tools.refinery.store.partial.representation.PartialSymbol;
-import tools.refinery.store.query.Dnf;
-import tools.refinery.store.query.ResultSet;
-
-public class PartialInterpretationAdapterImpl implements PartialInterpretationAdapter {
-        private final Model model;
-        private final PartialInterpretationStoreAdapterImpl storeAdapter;
-
-        PartialInterpretationAdapterImpl(Model model, PartialInterpretationStoreAdapterImpl storeAdapter) {
-                this.model = model;
-                this.storeAdapter = storeAdapter;
-        }
-
-        @Override
-        public Model getModel() {
-                return model;
-        }
-
-        @Override
-        public PartialInterpretationStoreAdapterImpl getStoreAdapter() {
-                return storeAdapter;
-        }
-
-        @Override
-        public <A, C> PartialSymbolInterpretation<A, C> getPartialInterpretation(PartialSymbol<A, C> partialSymbol) {
-                return null;
-        }
-
-        @Override
-        public ResultSet getLiftedResultSet(Dnf query) {
-                return null;
-        }
-}
diff --git a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/internal/PartialInterpretationBuilderImpl.java b/subprojects/store-partial/src/main/java/tools/refinery/store/partial/internal/PartialInterpretationBuilderImpl.java
deleted file mode 100644
index 5853aeaf..00000000
--- a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/internal/PartialInterpretationBuilderImpl.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package tools.refinery.store.partial.internal;
-
-import tools.refinery.store.adapter.AbstractModelAdapterBuilder;
-import tools.refinery.store.model.ModelStore;
-import tools.refinery.store.model.ModelStoreBuilder;
-import tools.refinery.store.partial.PartialInterpretationBuilder;
-import tools.refinery.store.partial.literal.Modality;
-import tools.refinery.store.query.Dnf;
-
-public class PartialInterpretationBuilderImpl extends AbstractModelAdapterBuilder implements PartialInterpretationBuilder {
-        public PartialInterpretationBuilderImpl(ModelStoreBuilder storeBuilder) {
-                super(storeBuilder);
-        }
-
-        @Override
-        public PartialInterpretationBuilder liftedQuery(Dnf liftedQuery) {
-                return null;
-        }
-
-        @Override
-        public Dnf lift(Modality modality, Dnf query) {
-                return null;
-        }
-
-        @Override
-        public PartialInterpretationStoreAdapterImpl createStoreAdapter(ModelStore store) {
-                return null;
-        }
-}
diff --git a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/internal/PartialInterpretationStoreAdapterImpl.java b/subprojects/store-partial/src/main/java/tools/refinery/store/partial/internal/PartialInterpretationStoreAdapterImpl.java
deleted file mode 100644
index 0486af6e..00000000
--- a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/internal/PartialInterpretationStoreAdapterImpl.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package tools.refinery.store.partial.internal;
-
-import tools.refinery.store.partial.PartialInterpretationStoreAdapter;
-import tools.refinery.store.model.Model;
-import tools.refinery.store.model.ModelStore;
-import tools.refinery.store.partial.representation.AnyPartialSymbol;
-import tools.refinery.store.query.Dnf;
-
-import java.util.Collection;
-
-public class PartialInterpretationStoreAdapterImpl implements PartialInterpretationStoreAdapter {
-        private final ModelStore store;
-
-        PartialInterpretationStoreAdapterImpl(ModelStore store) {
-                this.store = store;
-        }
-
-        @Override
-        public ModelStore getStore() {
-                return store;
-        }
-
-        @Override
-        public Collection<AnyPartialSymbol> getPartialSymbols() {
-                return null;
-        }
-
-        @Override
-        public Collection<Dnf> getLiftedQueries() {
-                return null;
-        }
-
-        @Override
-        public PartialInterpretationAdapterImpl createModelAdapter(Model model) {
-                return new PartialInterpretationAdapterImpl(model, this);
-        }
-}
diff --git a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/translator/TranslationUnit.java b/subprojects/store-partial/src/main/java/tools/refinery/store/partial/translator/TranslationUnit.java
deleted file mode 100644
index 26bd909b..00000000
--- a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/translator/TranslationUnit.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package tools.refinery.store.partial.translator;
-
-import tools.refinery.store.partial.PartialInterpretationBuilder;
-import tools.refinery.store.model.Model;
-import tools.refinery.store.model.ModelStoreBuilder;
-import tools.refinery.store.partial.AnyPartialSymbolInterpretation;
-import tools.refinery.store.partial.literal.Modality;
-import tools.refinery.store.partial.representation.AnyPartialSymbol;
-import tools.refinery.store.partial.representation.PartialRelation;
-import tools.refinery.store.query.Variable;
-import tools.refinery.store.query.literal.CallPolarity;
-import tools.refinery.store.query.literal.Literal;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-public abstract class TranslationUnit {
-        private PartialInterpretationBuilder partialInterpretationBuilder;
-
-        protected PartialInterpretationBuilder getPartialInterpretationBuilder() {
-                return partialInterpretationBuilder;
-        }
-
-        public void setPartialInterpretationBuilder(PartialInterpretationBuilder partialInterpretationBuilder) {
-                this.partialInterpretationBuilder = partialInterpretationBuilder;
-        }
-
-        protected ModelStoreBuilder getModelStoreBuilder() {
-                return partialInterpretationBuilder.getStoreBuilder();
-        }
-
-        public abstract Collection<AnyPartialSymbol> getTranslatedPartialSymbols();
-
-        public Collection<Advice> computeAdvices() {
-                // No advices to give by default.
-                return List.of();
-        }
-
-        public abstract void configure(Collection<Advice> advices);
-
-        public abstract List<Literal> call(CallPolarity polarity, Modality modality, PartialRelation target,
-                                                                           List<Variable> arguments);
-
-        public abstract Map<AnyPartialSymbol, AnyPartialSymbolInterpretation> createPartialInterpretations(Model model);
-
-        public abstract void initializeModel(Model model, int nodeCount);
-}
diff --git a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/translator/typehierarchy/EliminatedType.java b/subprojects/store-partial/src/main/java/tools/refinery/store/partial/translator/typehierarchy/EliminatedType.java
deleted file mode 100644
index 9adf6bc8..00000000
--- a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/translator/typehierarchy/EliminatedType.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package tools.refinery.store.partial.translator.typehierarchy;
-
-import tools.refinery.store.partial.representation.PartialRelation;
-
-record EliminatedType(PartialRelation replacement) implements TypeAnalysisResult {
-}
diff --git a/subprojects/store-partial/build.gradle b/subprojects/store-reasoning/build.gradle
index cb440d9f..cb440d9f 100644
--- a/subprojects/store-partial/build.gradle
+++ b/subprojects/store-reasoning/build.gradle
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/AnyPartialInterpretation.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/AnyPartialInterpretation.java
new file mode 100644
index 00000000..ebe82c8b
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/AnyPartialInterpretation.java
@@ -0,0 +1,13 @@
+package tools.refinery.store.reasoning;
+
+import tools.refinery.store.reasoning.representation.AnyPartialSymbol;
+
+public sealed interface AnyPartialInterpretation permits PartialInterpretation {
+        ReasoningAdapter getAdapter();
+
+        AnyPartialSymbol getPartialSymbol();
+
+        int countUnfinished();
+
+        int countErrors();
+}
diff --git a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/MergeResult.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/MergeResult.java
index 82414d87..0d51598b 100644
--- a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/MergeResult.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/MergeResult.java
@@ -1,4 +1,4 @@
-package tools.refinery.store.partial;
+package tools.refinery.store.reasoning;
 
 public enum MergeResult {
         UNCHANGED,
diff --git a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/PartialSymbolInterpretation.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/PartialInterpretation.java
index fa9e9216..99656da8 100644
--- a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/PartialSymbolInterpretation.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/PartialInterpretation.java
@@ -1,10 +1,10 @@
-package tools.refinery.store.partial;
+package tools.refinery.store.reasoning;
 
-import tools.refinery.store.partial.representation.PartialSymbol;
+import tools.refinery.store.reasoning.representation.PartialSymbol;
 import tools.refinery.store.map.Cursor;
 import tools.refinery.store.tuple.Tuple;
 
-public non-sealed interface PartialSymbolInterpretation<A, C> extends AnyPartialSymbolInterpretation {
+public non-sealed interface PartialInterpretation<A, C> extends AnyPartialInterpretation {
         @Override
         PartialSymbol<A, C> getPartialSymbol();
 
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/Reasoning.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/Reasoning.java
new file mode 100644
index 00000000..d7d0a999
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/Reasoning.java
@@ -0,0 +1,24 @@
+package tools.refinery.store.reasoning;
+
+import tools.refinery.store.reasoning.internal.ReasoningBuilderImpl;
+import tools.refinery.store.adapter.ModelAdapterBuilderFactory;
+import tools.refinery.store.model.ModelStoreBuilder;
+import tools.refinery.store.reasoning.representation.PartialRelation;
+
+public final class Reasoning extends ModelAdapterBuilderFactory<ReasoningAdapter,
+                ReasoningStoreAdapter, ReasoningBuilder> {
+        public static final Reasoning ADAPTER = new Reasoning();
+
+        public static final PartialRelation EXISTS = new PartialRelation("exists", 1);
+
+        public static final PartialRelation EQUALS = new PartialRelation("equals", 1);
+
+        private Reasoning() {
+                super(ReasoningAdapter.class, ReasoningStoreAdapter.class, ReasoningBuilder.class);
+        }
+
+        @Override
+        public ReasoningBuilder createBuilder(ModelStoreBuilder storeBuilder) {
+                return new ReasoningBuilderImpl(storeBuilder);
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/ReasoningAdapter.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/ReasoningAdapter.java
new file mode 100644
index 00000000..e602242e
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/ReasoningAdapter.java
@@ -0,0 +1,22 @@
+package tools.refinery.store.reasoning;
+
+import tools.refinery.store.adapter.ModelAdapter;
+import tools.refinery.store.reasoning.representation.AnyPartialSymbol;
+import tools.refinery.store.reasoning.representation.PartialSymbol;
+import tools.refinery.store.query.Dnf;
+import tools.refinery.store.query.ResultSet;
+
+public interface ReasoningAdapter extends ModelAdapter {
+        @Override
+        ReasoningStoreAdapter getStoreAdapter();
+
+        default AnyPartialInterpretation getPartialInterpretation(AnyPartialSymbol partialSymbol) {
+                // Cast to disambiguate overloads.
+                var typedPartialSymbol = (PartialSymbol<?, ?>) partialSymbol;
+                return getPartialInterpretation(typedPartialSymbol);
+        }
+
+        <A, C> PartialInterpretation<A, C> getPartialInterpretation(PartialSymbol<A, C> partialSymbol);
+
+        ResultSet getLiftedResultSet(Dnf query);
+}
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
new file mode 100644
index 00000000..588c2711
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/ReasoningBuilder.java
@@ -0,0 +1,28 @@
+package tools.refinery.store.reasoning;
+
+import tools.refinery.store.adapter.ModelAdapterBuilder;
+import tools.refinery.store.model.ModelStore;
+import tools.refinery.store.reasoning.literal.Modality;
+import tools.refinery.store.query.Dnf;
+
+import java.util.Collection;
+import java.util.List;
+
+@SuppressWarnings("UnusedReturnValue")
+public interface ReasoningBuilder extends ModelAdapterBuilder {
+        default ReasoningBuilder liftedQueries(Dnf... liftedQueries) {
+                return liftedQueries(List.of(liftedQueries));
+        }
+
+        default ReasoningBuilder liftedQueries(Collection<Dnf> liftedQueries) {
+                liftedQueries.forEach(this::liftedQuery);
+                return this;
+        }
+
+        ReasoningBuilder liftedQuery(Dnf liftedQuery);
+
+        Dnf lift(Modality modality, Dnf query);
+
+        @Override
+        ReasoningStoreAdapter createStoreAdapter(ModelStore store);
+}
diff --git a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/PartialInterpretationStoreAdapter.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/ReasoningStoreAdapter.java
index a1813671..69c0f5eb 100644
--- a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/PartialInterpretationStoreAdapter.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/ReasoningStoreAdapter.java
@@ -1,17 +1,17 @@
-package tools.refinery.store.partial;
+package tools.refinery.store.reasoning;
 
 import tools.refinery.store.adapter.ModelStoreAdapter;
 import tools.refinery.store.model.Model;
-import tools.refinery.store.partial.representation.AnyPartialSymbol;
+import tools.refinery.store.reasoning.representation.AnyPartialSymbol;
 import tools.refinery.store.query.Dnf;
 
 import java.util.Collection;
 
-public interface PartialInterpretationStoreAdapter extends ModelStoreAdapter {
+public interface ReasoningStoreAdapter extends ModelStoreAdapter {
         Collection<AnyPartialSymbol> getPartialSymbols();
 
         Collection<Dnf> getLiftedQueries();
 
         @Override
-        PartialInterpretationAdapter createModelAdapter(Model model);
+        ReasoningAdapter createModelAdapter(Model model);
 }
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
new file mode 100644
index 00000000..a7a56680
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/ReasoningAdapterImpl.java
@@ -0,0 +1,38 @@
+package tools.refinery.store.reasoning.internal;
+
+import tools.refinery.store.model.Model;
+import tools.refinery.store.reasoning.ReasoningAdapter;
+import tools.refinery.store.reasoning.PartialInterpretation;
+import tools.refinery.store.reasoning.representation.PartialSymbol;
+import tools.refinery.store.query.Dnf;
+import tools.refinery.store.query.ResultSet;
+
+public class ReasoningAdapterImpl implements ReasoningAdapter {
+        private final Model model;
+        private final ReasoningStoreAdapterImpl storeAdapter;
+
+        ReasoningAdapterImpl(Model model, ReasoningStoreAdapterImpl storeAdapter) {
+                this.model = model;
+                this.storeAdapter = storeAdapter;
+        }
+
+        @Override
+        public Model getModel() {
+                return model;
+        }
+
+        @Override
+        public ReasoningStoreAdapterImpl getStoreAdapter() {
+                return storeAdapter;
+        }
+
+        @Override
+        public <A, C> PartialInterpretation<A, C> getPartialInterpretation(PartialSymbol<A, C> partialSymbol) {
+                return null;
+        }
+
+        @Override
+        public ResultSet getLiftedResultSet(Dnf query) {
+                return null;
+        }
+}
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
new file mode 100644
index 00000000..2860e2b9
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/ReasoningBuilderImpl.java
@@ -0,0 +1,29 @@
+package tools.refinery.store.reasoning.internal;
+
+import tools.refinery.store.adapter.AbstractModelAdapterBuilder;
+import tools.refinery.store.model.ModelStore;
+import tools.refinery.store.model.ModelStoreBuilder;
+import tools.refinery.store.reasoning.ReasoningBuilder;
+import tools.refinery.store.reasoning.literal.Modality;
+import tools.refinery.store.query.Dnf;
+
+public class ReasoningBuilderImpl extends AbstractModelAdapterBuilder implements ReasoningBuilder {
+        public ReasoningBuilderImpl(ModelStoreBuilder storeBuilder) {
+                super(storeBuilder);
+        }
+
+        @Override
+        public ReasoningBuilder liftedQuery(Dnf liftedQuery) {
+                return null;
+        }
+
+        @Override
+        public Dnf lift(Modality modality, Dnf query) {
+                return null;
+        }
+
+        @Override
+        public ReasoningStoreAdapterImpl createStoreAdapter(ModelStore store) {
+                return null;
+        }
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/ReasoningStoreAdapterImpl.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/ReasoningStoreAdapterImpl.java
new file mode 100644
index 00000000..763dad6d
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/internal/ReasoningStoreAdapterImpl.java
@@ -0,0 +1,37 @@
+package tools.refinery.store.reasoning.internal;
+
+import tools.refinery.store.reasoning.ReasoningStoreAdapter;
+import tools.refinery.store.model.Model;
+import tools.refinery.store.model.ModelStore;
+import tools.refinery.store.reasoning.representation.AnyPartialSymbol;
+import tools.refinery.store.query.Dnf;
+
+import java.util.Collection;
+
+public class ReasoningStoreAdapterImpl implements ReasoningStoreAdapter {
+        private final ModelStore store;
+
+        ReasoningStoreAdapterImpl(ModelStore store) {
+                this.store = store;
+        }
+
+        @Override
+        public ModelStore getStore() {
+                return store;
+        }
+
+        @Override
+        public Collection<AnyPartialSymbol> getPartialSymbols() {
+                return null;
+        }
+
+        @Override
+        public Collection<Dnf> getLiftedQueries() {
+                return null;
+        }
+
+        @Override
+        public ReasoningAdapterImpl createModelAdapter(Model model) {
+                return new ReasoningAdapterImpl(model, this);
+        }
+}
diff --git a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/lifting/DnfLifter.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/lifting/DnfLifter.java
index 1c35b925..966e080a 100644
--- a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/lifting/DnfLifter.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/lifting/DnfLifter.java
@@ -1,10 +1,10 @@
-package tools.refinery.store.partial.lifting;
+package tools.refinery.store.reasoning.lifting;
 
 import org.jetbrains.annotations.Nullable;
-import tools.refinery.store.partial.literal.ModalDnfCallLiteral;
-import tools.refinery.store.partial.PartialInterpretation;
-import tools.refinery.store.partial.literal.ModalRelationLiteral;
-import tools.refinery.store.partial.literal.PartialRelationLiteral;
+import tools.refinery.store.reasoning.literal.ModalDnfCallLiteral;
+import tools.refinery.store.reasoning.Reasoning;
+import tools.refinery.store.reasoning.literal.ModalRelationLiteral;
+import tools.refinery.store.reasoning.literal.PartialRelationLiteral;
 import tools.refinery.store.query.Dnf;
 import tools.refinery.store.query.DnfBuilder;
 import tools.refinery.store.query.DnfClause;
@@ -12,7 +12,7 @@ import tools.refinery.store.query.Variable;
 import tools.refinery.store.query.literal.CallPolarity;
 import tools.refinery.store.query.literal.DnfCallLiteral;
 import tools.refinery.store.query.literal.Literal;
-import tools.refinery.store.partial.literal.Modality;
+import tools.refinery.store.reasoning.literal.Modality;
 import tools.refinery.store.util.CycleDetectingMapper;
 
 import java.util.ArrayList;
@@ -66,7 +66,7 @@ public class DnfLifter {
                 }
                 for (var quantifiedVariable : quantifiedVariables) {
                         // Quantify over variables that are not already quantified with the expected modality.
-                        liftedLiterals.add(PartialInterpretation.EXISTS.call(CallPolarity.POSITIVE, modality,
+                        liftedLiterals.add(Reasoning.EXISTS.call(CallPolarity.POSITIVE, modality,
                                         List.of(quantifiedVariable)));
                 }
                 builder.clause(liftedLiterals);
@@ -78,7 +78,7 @@ public class DnfLifter {
                 if (literal instanceof ModalRelationLiteral modalRelationLiteral &&
                                 modalRelationLiteral.getPolarity() == CallPolarity.POSITIVE &&
                                 modalRelationLiteral.getModality() == modality &&
-                                modalRelationLiteral.getTarget().equals(PartialInterpretation.EXISTS)) {
+                                modalRelationLiteral.getTarget().equals(Reasoning.EXISTS)) {
                         return modalRelationLiteral.getArguments().get(0);
                 }
                 return null;
diff --git a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/lifting/ModalDnf.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/lifting/ModalDnf.java
index 6fe54ad9..7aa98bf2 100644
--- a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/lifting/ModalDnf.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/lifting/ModalDnf.java
@@ -1,7 +1,7 @@
-package tools.refinery.store.partial.lifting;
+package tools.refinery.store.reasoning.lifting;
 
 import tools.refinery.store.query.Dnf;
-import tools.refinery.store.partial.literal.Modality;
+import tools.refinery.store.reasoning.literal.Modality;
 
 public record ModalDnf(Modality modality, Dnf dnf) {
         @Override
diff --git a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/literal/ModalDnfCallLiteral.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/ModalDnfCallLiteral.java
index 8c157187..1090f1ae 100644
--- a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/literal/ModalDnfCallLiteral.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/ModalDnfCallLiteral.java
@@ -1,4 +1,4 @@
-package tools.refinery.store.partial.literal;
+package tools.refinery.store.reasoning.literal;
 
 import tools.refinery.store.query.Dnf;
 import tools.refinery.store.query.Variable;
diff --git a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/literal/ModalLiteral.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/ModalLiteral.java
index cebe9c9d..5992f172 100644
--- a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/literal/ModalLiteral.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/ModalLiteral.java
@@ -1,4 +1,4 @@
-package tools.refinery.store.partial.literal;
+package tools.refinery.store.reasoning.literal;
 
 import tools.refinery.store.query.RelationLike;
 import tools.refinery.store.query.Variable;
diff --git a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/literal/ModalRelationLiteral.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/ModalRelationLiteral.java
index 39054f22..9c72bd37 100644
--- a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/literal/ModalRelationLiteral.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/ModalRelationLiteral.java
@@ -1,6 +1,6 @@
-package tools.refinery.store.partial.literal;
+package tools.refinery.store.reasoning.literal;
 
-import tools.refinery.store.partial.representation.PartialRelation;
+import tools.refinery.store.reasoning.representation.PartialRelation;
 import tools.refinery.store.query.Variable;
 import tools.refinery.store.query.literal.CallPolarity;
 import tools.refinery.store.query.literal.PolarLiteral;
diff --git a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/literal/Modality.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/Modality.java
index d647ef0a..f0cb59de 100644
--- a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/literal/Modality.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/Modality.java
@@ -1,4 +1,4 @@
-package tools.refinery.store.partial.literal;
+package tools.refinery.store.reasoning.literal;
 
 import tools.refinery.store.query.literal.CallPolarity;
 
diff --git a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/literal/PartialLiterals.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/PartialLiterals.java
index 51d388d3..10e4c7f7 100644
--- a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/literal/PartialLiterals.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/PartialLiterals.java
@@ -1,4 +1,4 @@
-package tools.refinery.store.partial.literal;
+package tools.refinery.store.reasoning.literal;
 
 import tools.refinery.store.query.literal.DnfCallLiteral;
 
diff --git a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/literal/PartialRelationLiteral.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/PartialRelationLiteral.java
index b81d9a3d..aff84538 100644
--- a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/literal/PartialRelationLiteral.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/literal/PartialRelationLiteral.java
@@ -1,6 +1,6 @@
-package tools.refinery.store.partial.literal;
+package tools.refinery.store.reasoning.literal;
 
-import tools.refinery.store.partial.representation.PartialRelation;
+import tools.refinery.store.reasoning.representation.PartialRelation;
 import tools.refinery.store.query.Variable;
 import tools.refinery.store.query.literal.CallLiteral;
 import tools.refinery.store.query.literal.CallPolarity;
diff --git a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/representation/AnyPartialFunction.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/AnyPartialFunction.java
index 1113245e..e74cd58b 100644
--- a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/representation/AnyPartialFunction.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/AnyPartialFunction.java
@@ -1,4 +1,4 @@
-package tools.refinery.store.partial.representation;
+package tools.refinery.store.reasoning.representation;
 
 public sealed interface AnyPartialFunction extends AnyPartialSymbol permits PartialFunction {
 }
diff --git a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/representation/AnyPartialSymbol.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/AnyPartialSymbol.java
index 25096e74..6ff5031b 100644
--- a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/representation/AnyPartialSymbol.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/AnyPartialSymbol.java
@@ -1,4 +1,4 @@
-package tools.refinery.store.partial.representation;
+package tools.refinery.store.reasoning.representation;
 
 import tools.refinery.store.representation.AnyAbstractDomain;
 
diff --git a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/representation/PartialFunction.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/PartialFunction.java
index 3c186f6f..59eeeefe 100644
--- a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/representation/PartialFunction.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/PartialFunction.java
@@ -1,4 +1,4 @@
-package tools.refinery.store.partial.representation;
+package tools.refinery.store.reasoning.representation;
 
 import tools.refinery.store.representation.AbstractDomain;
 
diff --git a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/representation/PartialRelation.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/PartialRelation.java
index 51c2f28d..f884f8d6 100644
--- a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/representation/PartialRelation.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/PartialRelation.java
@@ -1,8 +1,8 @@
-package tools.refinery.store.partial.representation;
+package tools.refinery.store.reasoning.representation;
 
-import tools.refinery.store.partial.literal.Modality;
-import tools.refinery.store.partial.literal.PartialRelationLiteral;
-import tools.refinery.store.partial.literal.ModalRelationLiteral;
+import tools.refinery.store.reasoning.literal.Modality;
+import tools.refinery.store.reasoning.literal.PartialRelationLiteral;
+import tools.refinery.store.reasoning.literal.ModalRelationLiteral;
 import tools.refinery.store.query.RelationLike;
 import tools.refinery.store.query.Variable;
 import tools.refinery.store.query.literal.CallPolarity;
diff --git a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/representation/PartialSymbol.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/PartialSymbol.java
index 38533fa9..1af11f2e 100644
--- a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/representation/PartialSymbol.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/representation/PartialSymbol.java
@@ -1,4 +1,4 @@
-package tools.refinery.store.partial.representation;
+package tools.refinery.store.reasoning.representation;
 
 import tools.refinery.store.representation.AbstractDomain;
 
diff --git a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/rule/RelationRefinementAction.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/rule/RelationRefinementAction.java
index 6c89653d..c7681b53 100644
--- a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/rule/RelationRefinementAction.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/rule/RelationRefinementAction.java
@@ -1,7 +1,7 @@
-package tools.refinery.store.partial.rule;
+package tools.refinery.store.reasoning.rule;
 
-import tools.refinery.store.partial.PartialInterpretation;
-import tools.refinery.store.partial.representation.PartialRelation;
+import tools.refinery.store.reasoning.Reasoning;
+import tools.refinery.store.reasoning.representation.PartialRelation;
 import tools.refinery.store.model.Model;
 import tools.refinery.store.query.Variable;
 import tools.refinery.store.representation.TruthValue;
@@ -23,7 +23,7 @@ public record RelationRefinementAction(PartialRelation target, List<Variable> ar
 
         @Override
         public RuleActionExecutor createExecutor(int[] argumentIndices, Model model) {
-                var targetInterpretation = model.getAdapter(PartialInterpretation.ADAPTER).getPartialInterpretation(target);
+                var targetInterpretation = model.getAdapter(Reasoning.ADAPTER).getPartialInterpretation(target);
                 return activationTuple -> {
                         int arity = argumentIndices.length;
                         var arguments = new int[arity];
diff --git a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/rule/Rule.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/rule/Rule.java
index c114b8cf..8a812518 100644
--- a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/rule/Rule.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/rule/Rule.java
@@ -1,4 +1,4 @@
-package tools.refinery.store.partial.rule;
+package tools.refinery.store.reasoning.rule;
 
 import tools.refinery.store.model.Model;
 import tools.refinery.store.query.Dnf;
diff --git a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/rule/RuleAction.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/rule/RuleAction.java
index 7a8ede40..bf980759 100644
--- a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/rule/RuleAction.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/rule/RuleAction.java
@@ -1,4 +1,4 @@
-package tools.refinery.store.partial.rule;
+package tools.refinery.store.reasoning.rule;
 
 import tools.refinery.store.model.Model;
 import tools.refinery.store.query.Variable;
diff --git a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/rule/RuleActionExecutor.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/rule/RuleActionExecutor.java
index 1c2db5f1..80bfa6f8 100644
--- a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/rule/RuleActionExecutor.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/rule/RuleActionExecutor.java
@@ -1,6 +1,6 @@
-package tools.refinery.store.partial.rule;
+package tools.refinery.store.reasoning.rule;
 
-import tools.refinery.store.partial.MergeResult;
+import tools.refinery.store.reasoning.MergeResult;
 import tools.refinery.store.tuple.TupleLike;
 
 @FunctionalInterface
diff --git a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/rule/RuleExecutor.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/rule/RuleExecutor.java
index 41d79306..1e5322b4 100644
--- a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/rule/RuleExecutor.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/rule/RuleExecutor.java
@@ -1,6 +1,6 @@
-package tools.refinery.store.partial.rule;
+package tools.refinery.store.reasoning.rule;
 
-import tools.refinery.store.partial.MergeResult;
+import tools.refinery.store.reasoning.MergeResult;
 import tools.refinery.store.model.Model;
 import tools.refinery.store.tuple.TupleLike;
 
diff --git a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/translator/Advice.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/Advice.java
index 65040a8e..7909a7e1 100644
--- a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/translator/Advice.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/Advice.java
@@ -1,9 +1,10 @@
-package tools.refinery.store.partial.translator;
+package tools.refinery.store.reasoning.translator;
 
-import tools.refinery.store.partial.representation.AnyPartialSymbol;
-import tools.refinery.store.partial.representation.PartialRelation;
+import tools.refinery.store.reasoning.representation.AnyPartialSymbol;
+import tools.refinery.store.reasoning.representation.PartialRelation;
 import tools.refinery.store.query.Variable;
 import tools.refinery.store.query.literal.Literal;
+import tools.refinery.store.query.substitution.Substitutions;
 
 import java.util.*;
 
@@ -61,10 +62,13 @@ public final class Advice {
                 checkArity(substituteParameters);
                 markProcessed();
                 int arity = parameters.size();
-                var substitution = new HashMap<Variable, Variable>(arity);
+                var variableMap = new HashMap<Variable, Variable>(arity);
                 for (int i = 0; i < arity; i++) {
-                        substitution.put(parameters.get(i), substituteParameters.get(i));
+                        variableMap.put(parameters.get(i), substituteParameters.get(i));
                 }
+                // Use a renewing substitution to remove any non-parameter variables and avoid clashed between variables
+                // coming from different advice in the same clause.
+                var substitution = Substitutions.renewing(variableMap);
                 return literals.stream().map(literal -> literal.substitute(substitution)).toList();
         }
 
diff --git a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/translator/AdviceSlot.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/AdviceSlot.java
index 3702a8ac..f3bd9c5e 100644
--- a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/translator/AdviceSlot.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/AdviceSlot.java
@@ -1,4 +1,4 @@
-package tools.refinery.store.partial.translator;
+package tools.refinery.store.reasoning.translator;
 
 import tools.refinery.store.representation.TruthValue;
 
diff --git a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/translator/Seed.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/Seed.java
index c56b06ed..779eadbe 100644
--- a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/translator/Seed.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/Seed.java
@@ -1,4 +1,4 @@
-package tools.refinery.store.partial.translator;
+package tools.refinery.store.reasoning.translator;
 
 import tools.refinery.store.map.Cursor;
 import tools.refinery.store.tuple.Tuple;
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/TranslationUnit.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/TranslationUnit.java
new file mode 100644
index 00000000..e45d20c8
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/TranslationUnit.java
@@ -0,0 +1,48 @@
+package tools.refinery.store.reasoning.translator;
+
+import tools.refinery.store.reasoning.ReasoningBuilder;
+import tools.refinery.store.model.Model;
+import tools.refinery.store.model.ModelStoreBuilder;
+import tools.refinery.store.reasoning.AnyPartialInterpretation;
+import tools.refinery.store.reasoning.literal.Modality;
+import tools.refinery.store.reasoning.representation.AnyPartialSymbol;
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.query.Variable;
+import tools.refinery.store.query.literal.CallPolarity;
+import tools.refinery.store.query.literal.Literal;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+public abstract class TranslationUnit {
+        private ReasoningBuilder reasoningBuilder;
+
+        protected ReasoningBuilder getPartialInterpretationBuilder() {
+                return reasoningBuilder;
+        }
+
+        public void setPartialInterpretationBuilder(ReasoningBuilder reasoningBuilder) {
+                this.reasoningBuilder = reasoningBuilder;
+        }
+
+        protected ModelStoreBuilder getModelStoreBuilder() {
+                return reasoningBuilder.getStoreBuilder();
+        }
+
+        public abstract Collection<AnyPartialSymbol> getTranslatedPartialSymbols();
+
+        public Collection<Advice> computeAdvices() {
+                // No advices to give by default.
+                return List.of();
+        }
+
+        public abstract void configure(Collection<Advice> advices);
+
+        public abstract List<Literal> call(CallPolarity polarity, Modality modality, PartialRelation target,
+                                                                           List<Variable> arguments);
+
+        public abstract Map<AnyPartialSymbol, AnyPartialInterpretation> createPartialInterpretations(Model model);
+
+        public abstract void initializeModel(Model model, int nodeCount);
+}
diff --git a/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/EliminatedType.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/EliminatedType.java
new file mode 100644
index 00000000..1b8d7cc9
--- /dev/null
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/EliminatedType.java
@@ -0,0 +1,6 @@
+package tools.refinery.store.reasoning.translator.typehierarchy;
+
+import tools.refinery.store.reasoning.representation.PartialRelation;
+
+record EliminatedType(PartialRelation replacement) implements TypeAnalysisResult {
+}
diff --git a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/translator/typehierarchy/ExtendedTypeInfo.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/ExtendedTypeInfo.java
index d3f66a4c..43b8e1dd 100644
--- a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/translator/typehierarchy/ExtendedTypeInfo.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/ExtendedTypeInfo.java
@@ -1,7 +1,7 @@
-package tools.refinery.store.partial.translator.typehierarchy;
+package tools.refinery.store.reasoning.translator.typehierarchy;
 
 import org.jetbrains.annotations.NotNull;
-import tools.refinery.store.partial.representation.PartialRelation;
+import tools.refinery.store.reasoning.representation.PartialRelation;
 
 import java.util.HashSet;
 import java.util.LinkedHashSet;
diff --git a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/translator/typehierarchy/InferredMayTypeRelationView.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/InferredMayTypeRelationView.java
index ff761936..12c37c86 100644
--- a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/translator/typehierarchy/InferredMayTypeRelationView.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/InferredMayTypeRelationView.java
@@ -1,6 +1,6 @@
-package tools.refinery.store.partial.translator.typehierarchy;
+package tools.refinery.store.reasoning.translator.typehierarchy;
 
-import tools.refinery.store.partial.representation.PartialRelation;
+import tools.refinery.store.reasoning.representation.PartialRelation;
 import tools.refinery.store.query.view.TuplePreservingRelationView;
 import tools.refinery.store.tuple.Tuple;
 
diff --git a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/translator/typehierarchy/InferredMustTypeRelationView.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/InferredMustTypeRelationView.java
index 4eca0a1c..975f627e 100644
--- a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/translator/typehierarchy/InferredMustTypeRelationView.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/InferredMustTypeRelationView.java
@@ -1,6 +1,6 @@
-package tools.refinery.store.partial.translator.typehierarchy;
+package tools.refinery.store.reasoning.translator.typehierarchy;
 
-import tools.refinery.store.partial.representation.PartialRelation;
+import tools.refinery.store.reasoning.representation.PartialRelation;
 import tools.refinery.store.query.view.TuplePreservingRelationView;
 import tools.refinery.store.tuple.Tuple;
 
diff --git a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/translator/typehierarchy/InferredType.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/InferredType.java
index 729b1fb5..a366e262 100644
--- a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/translator/typehierarchy/InferredType.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/InferredType.java
@@ -1,6 +1,6 @@
-package tools.refinery.store.partial.translator.typehierarchy;
+package tools.refinery.store.reasoning.translator.typehierarchy;
 
-import tools.refinery.store.partial.representation.PartialRelation;
+import tools.refinery.store.reasoning.representation.PartialRelation;
 
 import java.util.Collections;
 import java.util.Set;
diff --git a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/translator/typehierarchy/PreservedType.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/PreservedType.java
index 0299ae03..63dba964 100644
--- a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/translator/typehierarchy/PreservedType.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/PreservedType.java
@@ -1,6 +1,6 @@
-package tools.refinery.store.partial.translator.typehierarchy;
+package tools.refinery.store.reasoning.translator.typehierarchy;
 
-import tools.refinery.store.partial.representation.PartialRelation;
+import tools.refinery.store.reasoning.representation.PartialRelation;
 import tools.refinery.store.representation.TruthValue;
 
 import java.util.*;
diff --git a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/translator/typehierarchy/TypeAnalysisResult.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeAnalysisResult.java
index 0745f84e..4f915108 100644
--- a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/translator/typehierarchy/TypeAnalysisResult.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeAnalysisResult.java
@@ -1,4 +1,4 @@
-package tools.refinery.store.partial.translator.typehierarchy;
+package tools.refinery.store.reasoning.translator.typehierarchy;
 
 sealed interface TypeAnalysisResult permits EliminatedType, PreservedType {
 }
diff --git a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/translator/typehierarchy/TypeAnalyzer.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeAnalyzer.java
index 062b4c49..62f8e750 100644
--- a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/translator/typehierarchy/TypeAnalyzer.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeAnalyzer.java
@@ -1,6 +1,6 @@
-package tools.refinery.store.partial.translator.typehierarchy;
+package tools.refinery.store.reasoning.translator.typehierarchy;
 
-import tools.refinery.store.partial.representation.PartialRelation;
+import tools.refinery.store.reasoning.representation.PartialRelation;
 
 import java.util.*;
 
diff --git a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/translator/typehierarchy/TypeHierarchyTranslationUnit.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyTranslationUnit.java
index 7f438f71..c800b4cd 100644
--- a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/translator/typehierarchy/TypeHierarchyTranslationUnit.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeHierarchyTranslationUnit.java
@@ -1,11 +1,11 @@
-package tools.refinery.store.partial.translator.typehierarchy;
-
-import tools.refinery.store.partial.AnyPartialSymbolInterpretation;
-import tools.refinery.store.partial.literal.Modality;
-import tools.refinery.store.partial.representation.AnyPartialSymbol;
-import tools.refinery.store.partial.representation.PartialRelation;
-import tools.refinery.store.partial.translator.Advice;
-import tools.refinery.store.partial.translator.TranslationUnit;
+package tools.refinery.store.reasoning.translator.typehierarchy;
+
+import tools.refinery.store.reasoning.AnyPartialInterpretation;
+import tools.refinery.store.reasoning.literal.Modality;
+import tools.refinery.store.reasoning.representation.AnyPartialSymbol;
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.reasoning.translator.Advice;
+import tools.refinery.store.reasoning.translator.TranslationUnit;
 import tools.refinery.store.model.Model;
 import tools.refinery.store.query.Variable;
 import tools.refinery.store.query.literal.CallPolarity;
@@ -18,10 +18,10 @@ public class TypeHierarchyTranslationUnit extends TranslationUnit {
         static final Symbol<InferredType> INFERRED_TYPE_SYMBOL = new Symbol<>("inferredType", 1,
                         InferredType.class, InferredType.UNTYPED);
 
-        private final Map<PartialRelation, TypeInfo> typeInfoMap;
+        private final TypeAnalyzer typeAnalyzer;
 
         public TypeHierarchyTranslationUnit(Map<PartialRelation, TypeInfo> typeInfoMap) {
-                this.typeInfoMap = new LinkedHashMap<>(typeInfoMap);
+                typeAnalyzer = new TypeAnalyzer(typeInfoMap);
         }
 
         @Override
@@ -41,7 +41,7 @@ public class TypeHierarchyTranslationUnit extends TranslationUnit {
         }
 
         @Override
-        public Map<AnyPartialSymbol, AnyPartialSymbolInterpretation> createPartialInterpretations(Model model) {
+        public Map<AnyPartialSymbol, AnyPartialInterpretation> createPartialInterpretations(Model model) {
                 return null;
         }
 
diff --git a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/translator/typehierarchy/TypeInfo.java b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeInfo.java
index 1b0922fe..313df4df 100644
--- a/subprojects/store-partial/src/main/java/tools/refinery/store/partial/translator/typehierarchy/TypeInfo.java
+++ b/subprojects/store-reasoning/src/main/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeInfo.java
@@ -1,6 +1,6 @@
-package tools.refinery.store.partial.translator.typehierarchy;
+package tools.refinery.store.reasoning.translator.typehierarchy;
 
-import tools.refinery.store.partial.representation.PartialRelation;
+import tools.refinery.store.reasoning.representation.PartialRelation;
 
 import java.util.*;
 
diff --git a/subprojects/store-partial/src/test/java/tools/refinery/store/partial/translator/typehierarchy/InferredTypeTest.java b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/InferredTypeTest.java
index 9efa76ef..a8df2312 100644
--- a/subprojects/store-partial/src/test/java/tools/refinery/store/partial/translator/typehierarchy/InferredTypeTest.java
+++ b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/InferredTypeTest.java
@@ -1,7 +1,7 @@
-package tools.refinery.store.partial.translator.typehierarchy;
+package tools.refinery.store.reasoning.translator.typehierarchy;
 
 import org.junit.jupiter.api.Test;
-import tools.refinery.store.partial.representation.PartialRelation;
+import tools.refinery.store.reasoning.representation.PartialRelation;
 
 import java.util.Set;
 
diff --git a/subprojects/store-partial/src/test/java/tools/refinery/store/partial/translator/typehierarchy/TypeAnalyzerExampleHierarchyTest.java b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeAnalyzerExampleHierarchyTest.java
index 5f528328..b2c1ef1b 100644
--- a/subprojects/store-partial/src/test/java/tools/refinery/store/partial/translator/typehierarchy/TypeAnalyzerExampleHierarchyTest.java
+++ b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeAnalyzerExampleHierarchyTest.java
@@ -1,8 +1,8 @@
-package tools.refinery.store.partial.translator.typehierarchy;
+package tools.refinery.store.reasoning.translator.typehierarchy;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import tools.refinery.store.partial.representation.PartialRelation;
+import tools.refinery.store.reasoning.representation.PartialRelation;
 import tools.refinery.store.representation.TruthValue;
 
 import java.util.LinkedHashMap;
diff --git a/subprojects/store-partial/src/test/java/tools/refinery/store/partial/translator/typehierarchy/TypeAnalyzerTest.java b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeAnalyzerTest.java
index 02903026..b7b69ed8 100644
--- a/subprojects/store-partial/src/test/java/tools/refinery/store/partial/translator/typehierarchy/TypeAnalyzerTest.java
+++ b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeAnalyzerTest.java
@@ -1,7 +1,7 @@
-package tools.refinery.store.partial.translator.typehierarchy;
+package tools.refinery.store.reasoning.translator.typehierarchy;
 
 import org.junit.jupiter.api.Test;
-import tools.refinery.store.partial.representation.PartialRelation;
+import tools.refinery.store.reasoning.representation.PartialRelation;
 import tools.refinery.store.representation.TruthValue;
 
 import java.util.LinkedHashMap;
diff --git a/subprojects/store-partial/src/test/java/tools/refinery/store/partial/translator/typehierarchy/TypeAnalyzerTester.java b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeAnalyzerTester.java
index ce600ea6..56407730 100644
--- a/subprojects/store-partial/src/test/java/tools/refinery/store/partial/translator/typehierarchy/TypeAnalyzerTester.java
+++ b/subprojects/store-reasoning/src/test/java/tools/refinery/store/reasoning/translator/typehierarchy/TypeAnalyzerTester.java
@@ -1,6 +1,6 @@
-package tools.refinery.store.partial.translator.typehierarchy;
+package tools.refinery.store.reasoning.translator.typehierarchy;
 
-import tools.refinery.store.partial.representation.PartialRelation;
+import tools.refinery.store.reasoning.representation.PartialRelation;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;