refactor: smenatics and facades

Also moves model metadata into language-web, since we only use it on the
frontent.

27 files changed, 333 insertions, 428 deletions

diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/model/ModelInitializer.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/ModelInitializer.java
index a05e647d..b3c58366 100644
--- a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/model/ModelInitializer.java
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/ModelInitializer.java
@@ -3,13 +3,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.language.semantics.model;
+package tools.refinery.language.semantics;
 
 import com.google.inject.Inject;
-import org.eclipse.collections.api.factory.primitive.ObjectIntMaps;
-import org.eclipse.collections.api.map.primitive.MutableObjectIntMap;
 import tools.refinery.language.model.problem.*;
-import tools.refinery.language.semantics.model.internal.MutableSeed;
+import tools.refinery.language.semantics.internal.MutableSeed;
 import tools.refinery.language.utils.BuiltinSymbols;
 import tools.refinery.language.utils.ProblemDesugarer;
 import tools.refinery.language.utils.ProblemUtil;
@@ -23,11 +21,11 @@ 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.AnyPartialSymbol;
 import tools.refinery.store.reasoning.representation.PartialRelation;
 import tools.refinery.store.reasoning.scope.ScopePropagator;
 import tools.refinery.store.reasoning.seed.ModelSeed;
 import tools.refinery.store.reasoning.seed.Seed;
+import tools.refinery.store.reasoning.translator.TranslationException;
 import tools.refinery.store.reasoning.translator.containment.ContainmentHierarchyTranslator;
 import tools.refinery.store.reasoning.translator.metamodel.Metamodel;
 import tools.refinery.store.reasoning.translator.metamodel.MetamodelBuilder;
@@ -52,24 +50,19 @@ public class ModelInitializer {
         @Inject
         private SemanticsUtils semanticsUtils;
 
-        private Problem problem;
+        @Inject
+        private ProblemTraceImpl problemTrace;
 
-        private ModelStoreBuilder storeBuilder;
+        private Problem problem;
 
         private BuiltinSymbols builtinSymbols;
 
         private PartialRelation nodeRelation;
 
-        private final MutableObjectIntMap<Node> nodeTrace = ObjectIntMaps.mutable.empty();
-
         private final Map<Relation, RelationInfo> relationInfoMap = new LinkedHashMap<>();
 
         private final Map<PartialRelation, RelationInfo> partialRelationInfoMap = new HashMap<>();
 
-        private final Map<AnyPartialSymbol, Relation> inverseTrace = new HashMap<>();
-
-        private final Map<Relation, PartialRelation> relationTrace = new LinkedHashMap<>();
-
         private final MetamodelBuilder metamodelBuilder = Metamodel.builder();
 
         private Metamodel metamodel;
@@ -80,81 +73,74 @@ public class ModelInitializer {
 
         private ModelSeed modelSeed;
 
-        public Problem getProblem() {
-                return problem;
-        }
-
-        public int getNodeCount() {
-                return nodeTrace.size();
-        }
-
-        public MutableObjectIntMap<Node> getNodeTrace() {
-                return nodeTrace;
-        }
-
-        public Map<Relation, PartialRelation> getRelationTrace() {
-                return relationTrace;
-        }
-
-        public Relation getInverseTrace(AnyPartialSymbol partialRelation) {
-                return inverseTrace.get(partialRelation);
-        }
-
-        public Metamodel getMetamodel() {
-                return metamodel;
-        }
-
         public void readProblem(Problem problem) {
+                if (this.problem != null) {
+                        throw new IllegalArgumentException("Problem was already set");
+                }
                 this.problem = problem;
-                builtinSymbols = desugarer.getBuiltinSymbols(problem).orElseThrow(() -> new IllegalArgumentException(
-                                "Problem has no builtin library"));
-                var nodeInfo = collectPartialRelation(builtinSymbols.node(), 1, TruthValue.TRUE, TruthValue.TRUE);
-                nodeRelation = nodeInfo.partialRelation();
-                metamodelBuilder.type(nodeRelation);
-                putRelationInfo(builtinSymbols.exists(), new RelationInfo(ReasoningAdapter.EXISTS_SYMBOL, null,
-                                TruthValue.TRUE));
-                putRelationInfo(builtinSymbols.equals(), new RelationInfo(ReasoningAdapter.EQUALS_SYMBOL,
-                                (TruthValue) null,
-                                null));
-                putRelationInfo(builtinSymbols.contained(), new RelationInfo(ContainmentHierarchyTranslator.CONTAINED_SYMBOL,
-                                null, TruthValue.UNKNOWN));
-                putRelationInfo(builtinSymbols.contains(), new RelationInfo(ContainmentHierarchyTranslator.CONTAINS_SYMBOL,
-                                null, TruthValue.UNKNOWN));
-                putRelationInfo(builtinSymbols.invalidContainer(),
-                                new RelationInfo(ContainmentHierarchyTranslator.INVALID_CONTAINER, TruthValue.FALSE,
-                                                TruthValue.FALSE));
-                collectNodes();
-                collectPartialSymbols();
-                collectMetamodel();
-                metamodel = metamodelBuilder.build();
-                collectAssertions();
-                int nodeCount = getNodeCount();
-                var modelSeedBuilder = ModelSeed.builder(nodeCount);
-                for (var entry : relationInfoMap.entrySet()) {
-                        var relation = entry.getKey();
-                        var info = entry.getValue();
-                        var partialRelation = info.partialRelation();
-                        relationTrace.put(relation, partialRelation);
-                        modelSeedBuilder.seed(partialRelation, info.toSeed(nodeCount));
-                }
-                collectScopes();
-                modelSeedBuilder.seed(MultiObjectTranslator.COUNT_SYMBOL, builder -> builder
-                                .reducedValue(CardinalityIntervals.SET)
-                                .putAll(countSeed));
-                modelSeed = modelSeedBuilder.build();
+                problemTrace.setProblem(problem);
+                try {
+                        builtinSymbols = desugarer.getBuiltinSymbols(problem).orElseThrow(() -> new IllegalArgumentException(
+                                        "Problem has no builtin library"));
+                        var nodeInfo = collectPartialRelation(builtinSymbols.node(), 1, TruthValue.TRUE, TruthValue.TRUE);
+                        nodeRelation = nodeInfo.partialRelation();
+                        metamodelBuilder.type(nodeRelation);
+                        putRelationInfo(builtinSymbols.exists(), new RelationInfo(ReasoningAdapter.EXISTS_SYMBOL, null,
+                                        TruthValue.TRUE));
+                        putRelationInfo(builtinSymbols.equals(), new RelationInfo(ReasoningAdapter.EQUALS_SYMBOL,
+                                        (TruthValue) null,
+                                        null));
+                        putRelationInfo(builtinSymbols.contained(),
+                                        new RelationInfo(ContainmentHierarchyTranslator.CONTAINED_SYMBOL, null, TruthValue.UNKNOWN));
+                        putRelationInfo(builtinSymbols.contains(), new RelationInfo(ContainmentHierarchyTranslator.CONTAINS_SYMBOL,
+                                        null, TruthValue.UNKNOWN));
+                        putRelationInfo(builtinSymbols.invalidContainer(),
+                                        new RelationInfo(ContainmentHierarchyTranslator.INVALID_CONTAINER, TruthValue.FALSE,
+                                                        TruthValue.FALSE));
+                        collectNodes();
+                        collectPartialSymbols();
+                        collectMetamodel();
+                        metamodel = metamodelBuilder.build();
+                        problemTrace.setMetamodel(metamodel);
+                        collectAssertions();
+                        int nodeCount = problemTrace.getNodeTrace().size();
+                        var modelSeedBuilder = ModelSeed.builder(nodeCount);
+                        for (var entry : relationInfoMap.entrySet()) {
+                                var info = entry.getValue();
+                                var partialRelation = info.partialRelation();
+                                modelSeedBuilder.seed(partialRelation, info.toSeed(nodeCount));
+                        }
+                        collectScopes();
+                        modelSeedBuilder.seed(MultiObjectTranslator.COUNT_SYMBOL, builder -> builder
+                                        .reducedValue(CardinalityIntervals.SET)
+                                        .putAll(countSeed));
+                        modelSeed = modelSeedBuilder.build();
+                } catch (TranslationException e) {
+                        throw problemTrace.wrapException(e);
+                }
         }
 
         public void configureStoreBuilder(ModelStoreBuilder storeBuilder) {
-                this.storeBuilder = storeBuilder;
-                storeBuilder.with(new MultiObjectTranslator());
-                storeBuilder.with(new MetamodelTranslator(metamodel));
-                if (scopePropagator != null) {
-                        if (storeBuilder.tryGetAdapter(PropagationBuilder.class).isEmpty()) {
-                                throw new TracedException(problem, "Type scopes require a PropagationBuilder");
+                checkProblem();
+                try {
+                        storeBuilder.with(new MultiObjectTranslator());
+                        storeBuilder.with(new MetamodelTranslator(metamodel));
+                        if (scopePropagator != null) {
+                                if (storeBuilder.tryGetAdapter(PropagationBuilder.class).isEmpty()) {
+                                        throw new TracedException(problem, "Type scopes require a PropagationBuilder");
+                                }
+                                storeBuilder.with(scopePropagator);
                         }
-                        storeBuilder.with(scopePropagator);
+                        collectPredicates(storeBuilder);
+                } catch (TranslationException e) {
+                        throw problemTrace.wrapException(e);
+                }
+        }
+
+        private void checkProblem() {
+                if (problem == null) {
+                        throw new IllegalStateException("Problem is not set");
                 }
-                collectPredicates();
         }
 
         public ModelSeed createModel(Problem problem, ModelStoreBuilder storeBuilder) {
@@ -163,7 +149,13 @@ public class ModelInitializer {
                 return getModelSeed();
         }
 
+        public ProblemTrace getProblemTrace() {
+                checkProblem();
+                return problemTrace;
+        }
+
         public ModelSeed getModelSeed() {
+                checkProblem();
                 return modelSeed;
         }
 
@@ -190,7 +182,7 @@ public class ModelInitializer {
         }
 
         private void collectNode(Node node) {
-                nodeTrace.getIfAbsentPut(node, this::getNodeCount);
+                problemTrace.collectNode(node);
         }
 
         private void collectPartialSymbols() {
@@ -232,7 +224,7 @@ public class ModelInitializer {
         private void putRelationInfo(Relation relation, RelationInfo info) {
                 relationInfoMap.put(relation, info);
                 partialRelationInfoMap.put(info.partialRelation(), info);
-                inverseTrace.put(info.partialRelation(), relation);
+                problemTrace.putRelation(relation, info.partialRelation());
         }
 
         private RelationInfo collectPartialRelation(Relation relation, int arity, TruthValue value,
@@ -241,7 +233,7 @@ public class ModelInitializer {
                         var name = getName(relation);
                         var info = new RelationInfo(name, arity, value, defaultValue);
                         partialRelationInfoMap.put(info.partialRelation(), info);
-                        inverseTrace.put(info.partialRelation(), relation);
+                        problemTrace.putRelation(relation, info.partialRelation());
                         return info;
                 });
         }
@@ -421,7 +413,7 @@ public class ModelInitializer {
         }
 
         private int getNodeId(Node node) {
-                return nodeTrace.getOrThrow(node);
+                return problemTrace.getNodeId(node);
         }
 
         private Tuple getTuple(Assertion assertion) {
@@ -453,17 +445,18 @@ public class ModelInitializer {
                 };
         }
 
-        private void collectPredicates() {
+        private void collectPredicates(ModelStoreBuilder storeBuilder) {
                 for (var statement : problem.getStatements()) {
                         if (statement instanceof PredicateDefinition predicateDefinition) {
-                                collectPredicateDefinitionTraced(predicateDefinition);
+                                collectPredicateDefinitionTraced(predicateDefinition, storeBuilder);
                         }
                 }
         }
 
-        private void collectPredicateDefinitionTraced(PredicateDefinition predicateDefinition) {
+        private void collectPredicateDefinitionTraced(PredicateDefinition predicateDefinition,
+                                                                                                  ModelStoreBuilder storeBuilder) {
                 try {
-                        collectPredicateDefinition(predicateDefinition);
+                        collectPredicateDefinition(predicateDefinition, storeBuilder);
                 } catch (InvalidClauseException e) {
                         int clauseIndex = e.getClauseIndex();
                         var bodies = predicateDefinition.getBodies();
@@ -477,7 +470,7 @@ public class ModelInitializer {
                 }
         }
 
-        private void collectPredicateDefinition(PredicateDefinition predicateDefinition) {
+        private void collectPredicateDefinition(PredicateDefinition predicateDefinition, ModelStoreBuilder storeBuilder) {
                 var partialRelation = getPartialRelation(predicateDefinition);
                 var query = toQuery(partialRelation.name(), predicateDefinition);
                 boolean mutable;
@@ -488,7 +481,7 @@ public class ModelInitializer {
                 } else {
                         var seed = modelSeed.getSeed(partialRelation);
                         defaultValue = seed.reducedValue() == TruthValue.FALSE ? TruthValue.FALSE : TruthValue.UNKNOWN;
-                        var cursor = seed.getCursor(defaultValue, getNodeCount());
+                        var cursor = seed.getCursor(defaultValue, problemTrace.getNodeTrace().size());
                         // The symbol should be mutable if there is at least one non-default entry in the seed.
                         mutable = cursor.move();
                 }
@@ -652,8 +645,8 @@ public class ModelInitializer {
                 if (newNode == null) {
                         throw new TracedException(typeScope, "Target of incremental type scope must be concrete class");
                 }
-                int newNodeId = nodeTrace.get(newNode);
-                var type = relationTrace.get(classDeclaration);
+                int newNodeId = getNodeId(newNode);
+                var type = problemTrace.getPartialRelation(classDeclaration);
                 var typeInfo = metamodel.typeHierarchy().getAnalysisResult(type);
                 if (!typeInfo.getDirectSubtypes().isEmpty()) {
                         throw new TracedException(typeScope, "Target of incremental type scope cannot have any subclasses");
@@ -664,10 +657,7 @@ public class ModelInitializer {
         }
 
         private void collectTypeScope(TypeScope typeScope) {
-                var type = relationTrace.get(typeScope.getTargetType());
-                if (type == null) {
-                        throw new TracedException(typeScope, "Unknown target type");
-                }
+                var type = problemTrace.getPartialRelation(typeScope.getTargetType());
                 var interval = getCardinalityInterval(typeScope.getMultiplicity());
                 if (scopePropagator == null) {
                         scopePropagator = new ScopePropagator();
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/ProblemTrace.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/ProblemTrace.java
new file mode 100644
index 00000000..b8d0b804
--- /dev/null
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/ProblemTrace.java
@@ -0,0 +1,46 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.language.semantics;
+
+import org.eclipse.collections.api.map.primitive.ObjectIntMap;
+import org.eclipse.xtext.naming.QualifiedName;
+import tools.refinery.language.model.problem.Node;
+import tools.refinery.language.model.problem.Problem;
+import tools.refinery.language.model.problem.Relation;
+import tools.refinery.store.reasoning.representation.AnyPartialSymbol;
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.reasoning.translator.TranslationException;
+import tools.refinery.store.reasoning.translator.metamodel.Metamodel;
+
+import java.util.Map;
+
+public interface ProblemTrace {
+        Problem getProblem();
+
+        Metamodel getMetamodel();
+
+        ObjectIntMap<Node> getNodeTrace();
+
+        int getNodeId(Node node);
+
+        int getNodeId(QualifiedName qualifiedName);
+
+        int getNodeId(String qualifiedName);
+
+        Map<Relation, PartialRelation> getRelationTrace();
+
+        Map<AnyPartialSymbol, Relation> getInverseRelationTrace();
+
+        Relation getRelation(AnyPartialSymbol partialSymbol);
+
+        RuntimeException wrapException(TranslationException translationException);
+
+        PartialRelation getPartialRelation(Relation relation);
+
+        PartialRelation getPartialRelation(QualifiedName qualifiedName);
+
+        PartialRelation getPartialRelation(String qualifiedName);
+}
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/ProblemTraceImpl.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/ProblemTraceImpl.java
new file mode 100644
index 00000000..cc634949
--- /dev/null
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/ProblemTraceImpl.java
@@ -0,0 +1,187 @@
+/*
+ * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package tools.refinery.language.semantics;
+
+import com.google.inject.Inject;
+import org.eclipse.collections.api.factory.primitive.ObjectIntMaps;
+import org.eclipse.collections.api.map.primitive.MutableObjectIntMap;
+import org.eclipse.collections.api.map.primitive.ObjectIntMap;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.xtext.naming.IQualifiedNameConverter;
+import org.eclipse.xtext.naming.QualifiedName;
+import org.eclipse.xtext.scoping.IScope;
+import org.eclipse.xtext.scoping.IScopeProvider;
+import tools.refinery.language.model.problem.Node;
+import tools.refinery.language.model.problem.Problem;
+import tools.refinery.language.model.problem.ProblemPackage;
+import tools.refinery.language.model.problem.Relation;
+import tools.refinery.store.reasoning.representation.AnyPartialSymbol;
+import tools.refinery.store.reasoning.representation.PartialRelation;
+import tools.refinery.store.reasoning.translator.TranslationException;
+import tools.refinery.store.reasoning.translator.metamodel.Metamodel;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+public class ProblemTraceImpl implements ProblemTrace {
+        @Inject
+        private IQualifiedNameConverter qualifiedNameConverter;
+
+        @Inject
+        private SemanticsUtils semanticsUtils;
+
+        @Inject
+        private IScopeProvider scopeProvider;
+
+        private Problem problem;
+        private Metamodel metamodel;
+        private final MutableObjectIntMap<Node> mutableNodeTrace = ObjectIntMaps.mutable.empty();
+        private final ObjectIntMap<Node> nodeTrace = mutableNodeTrace.asUnmodifiable();
+        private final Map<Relation, PartialRelation> mutableRelationTrace = new LinkedHashMap<>();
+        private final Map<Relation, PartialRelation> relationTrace =
+                        Collections.unmodifiableMap(mutableRelationTrace);
+        private final Map<AnyPartialSymbol, Relation> mutableInverseTrace = new HashMap<>();
+        private final Map<AnyPartialSymbol, Relation> inverseTrace = Collections.unmodifiableMap(mutableInverseTrace);
+
+        @Override
+        public Problem getProblem() {
+                return problem;
+        }
+
+        void setProblem(Problem problem) {
+                this.problem = problem;
+        }
+
+        @Override
+        public Metamodel getMetamodel() {
+                return metamodel;
+        }
+
+        void setMetamodel(Metamodel metamodel) {
+                this.metamodel = metamodel;
+        }
+
+        @Override
+        public ObjectIntMap<Node> getNodeTrace() {
+                return nodeTrace;
+        }
+
+        void collectNode(Node node) {
+                mutableNodeTrace.getIfAbsentPut(node, mutableNodeTrace.size());
+        }
+
+        @Override
+        public int getNodeId(Node node) {
+                try {
+                        return nodeTrace.getOrThrow(node);
+                } catch (IllegalStateException e) {
+                        var qualifiedName = semanticsUtils.getName(node);
+                        throw new TracedException(node, "No node ID for " + qualifiedName, e);
+                }
+        }
+
+        @Override
+        public int getNodeId(QualifiedName qualifiedName) {
+                var nodeScope = scopeProvider.getScope(problem, ProblemPackage.Literals.NODE_ASSERTION_ARGUMENT__NODE);
+                return getNodeId(getElement(nodeScope, qualifiedName, Node.class));
+        }
+
+        @Override
+        public int getNodeId(String qualifiedName) {
+                var convertedName = qualifiedNameConverter.toQualifiedName(qualifiedName);
+                return getNodeId(convertedName);
+        }
+
+        @Override
+        public Map<Relation, PartialRelation> getRelationTrace() {
+                return relationTrace;
+        }
+
+        void putRelation(Relation relation, PartialRelation partialRelation) {
+                var oldPartialRelation = mutableRelationTrace.put(relation, partialRelation);
+                if (oldPartialRelation != null) {
+                        throw new TracedException(relation, "Relation already mapped to partial relation: " + oldPartialRelation);
+                }
+                var oldRelation = mutableInverseTrace.put(partialRelation, relation);
+                if (oldRelation != null) {
+                        throw new TracedException(oldRelation, "Partial relation %s was already mapped to relation"
+                                        .formatted(partialRelation));
+                }
+        }
+
+        @Override
+        public Map<AnyPartialSymbol, Relation> getInverseRelationTrace() {
+                return inverseTrace;
+        }
+
+        @Override
+        public Relation getRelation(AnyPartialSymbol partialSymbol) {
+                var relation = mutableInverseTrace.get(partialSymbol);
+                if (relation == null) {
+                        throw new IllegalArgumentException("No relation for partial symbol: " + partialSymbol);
+                }
+                return relation;
+        }
+
+        @Override
+        public RuntimeException wrapException(TranslationException translationException) {
+                var partialSymbol = translationException.getPartialSymbol();
+                if (partialSymbol == null) {
+                        return translationException;
+                }
+                var relation = mutableInverseTrace.get(partialSymbol);
+                if (relation == null) {
+                        return translationException;
+                }
+                return new TracedException(relation, translationException);
+        }
+
+        @Override
+        public PartialRelation getPartialRelation(Relation relation) {
+                var partialRelation = mutableRelationTrace.get(relation);
+                if (partialRelation == null) {
+                        var qualifiedName = semanticsUtils.getName(relation);
+                        throw new TracedException(relation, "No partial relation for " + qualifiedName);
+                }
+                return partialRelation;
+        }
+
+        @Override
+        public PartialRelation getPartialRelation(QualifiedName qualifiedName) {
+                var relationScope = scopeProvider.getScope(problem, ProblemPackage.Literals.ASSERTION__RELATION);
+                return getPartialRelation(getElement(relationScope, qualifiedName, Relation.class));
+        }
+
+        @Override
+        public PartialRelation getPartialRelation(String qualifiedName) {
+                var convertedName = qualifiedNameConverter.toQualifiedName(qualifiedName);
+                return getPartialRelation(convertedName);
+        }
+
+        private <T> T getElement(IScope scope, QualifiedName qualifiedName, Class<T> type) {
+                var iterator = scope.getElements(qualifiedName).iterator();
+                if (!iterator.hasNext()) {
+                        var qualifiedNameString = qualifiedNameConverter.toString(qualifiedName);
+                        throw new IllegalArgumentException("No such %s: %s"
+                                        .formatted(type.getName(), qualifiedNameString));
+                }
+                var eObjectDescription = iterator.next();
+                if (iterator.hasNext()) {
+                        var qualifiedNameString = qualifiedNameConverter.toString(qualifiedName);
+                        throw new IllegalArgumentException("Ambiguous %s: %s"
+                                        .formatted(type.getName(), qualifiedNameString));
+                }
+                var eObject = EcoreUtil.resolve(eObjectDescription.getEObjectOrProxy(), getProblem());
+                if (!type.isInstance(eObject)) {
+                        var qualifiedNameString = qualifiedNameConverter.toString(qualifiedName);
+                        throw new IllegalArgumentException("Not a %s: %s"
+                                        .formatted(type.getName(), qualifiedNameString));
+                }
+                return type.cast(eObject);
+        }
+}
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/model/SemanticsUtils.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/SemanticsUtils.java
index 47c89e9b..b195a8e7 100644
--- a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/model/SemanticsUtils.java
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/SemanticsUtils.java
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.language.semantics.model;
+package tools.refinery.language.semantics;
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/model/TracedException.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/TracedException.java
index 38fd8a67..8636bdab 100644
--- a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/model/TracedException.java
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/TracedException.java
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.language.semantics.model;
+package tools.refinery.language.semantics;
 
 import org.eclipse.emf.ecore.EObject;
 
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/model/internal/DecisionTree.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/DecisionTree.java
index 32112e61..c732f784 100644
--- a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/model/internal/DecisionTree.java
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/DecisionTree.java
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.language.semantics.model.internal;
+package tools.refinery.language.semantics.internal;
 
 import org.eclipse.collections.api.factory.primitive.IntObjectMaps;
 import tools.refinery.store.map.Cursor;
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/model/internal/DecisionTreeCursor.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/DecisionTreeCursor.java
index a9fc644a..71b54cbd 100644
--- a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/model/internal/DecisionTreeCursor.java
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/DecisionTreeCursor.java
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.language.semantics.model.internal;
+package tools.refinery.language.semantics.internal;
 
 import tools.refinery.store.map.Cursor;
 import tools.refinery.store.representation.TruthValue;
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/model/internal/DecisionTreeNode.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/DecisionTreeNode.java
index 3c54e3c5..ebca2634 100644
--- a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/model/internal/DecisionTreeNode.java
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/DecisionTreeNode.java
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.language.semantics.model.internal;
+package tools.refinery.language.semantics.internal;
 
 import org.eclipse.collections.api.LazyIntIterable;
 import tools.refinery.store.tuple.Tuple;
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/model/internal/DecisionTreeValue.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/DecisionTreeValue.java
index 915ae2bf..5053e7ac 100644
--- a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/model/internal/DecisionTreeValue.java
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/DecisionTreeValue.java
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.language.semantics.model.internal;
+package tools.refinery.language.semantics.internal;
 
 import tools.refinery.store.representation.TruthValue;
 
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/model/internal/IntermediateNode.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/IntermediateNode.java
index e6f01d48..0e2f5d18 100644
--- a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/model/internal/IntermediateNode.java
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/IntermediateNode.java
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.language.semantics.model.internal;
+package tools.refinery.language.semantics.internal;
 
 import org.eclipse.collections.api.LazyIntIterable;
 import org.eclipse.collections.api.factory.primitive.IntObjectMaps;
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/model/internal/MutableSeed.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/MutableSeed.java
index 99019e2a..693b9e1f 100644
--- a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/model/internal/MutableSeed.java
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/MutableSeed.java
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.language.semantics.model.internal;
+package tools.refinery.language.semantics.internal;
 
 import tools.refinery.store.reasoning.seed.Seed;
 import tools.refinery.store.representation.TruthValue;
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/model/internal/NullaryMutableSeed.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/NullaryMutableSeed.java
index 80644b1f..7a72c656 100644
--- a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/model/internal/NullaryMutableSeed.java
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/NullaryMutableSeed.java
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.language.semantics.model.internal;
+package tools.refinery.language.semantics.internal;
 
 import tools.refinery.store.map.Cursor;
 import tools.refinery.store.map.Cursors;
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/model/internal/TerminalNode.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/TerminalNode.java
index ce49aa62..d3dd757c 100644
--- a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/model/internal/TerminalNode.java
+++ b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/internal/TerminalNode.java
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.language.semantics.model.internal;
+package tools.refinery.language.semantics.internal;
 
 import org.eclipse.collections.api.LazyIntIterable;
 import org.eclipse.collections.api.factory.primitive.IntObjectMaps;
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/BuiltInDetail.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/BuiltInDetail.java
deleted file mode 100644
index 6f706069..00000000
--- a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/BuiltInDetail.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.language.semantics.metadata;
-
-public record BuiltInDetail() implements RelationDetail {
-        public static final BuiltInDetail INSTANCE = new BuiltInDetail();
-}
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/ClassDetail.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/ClassDetail.java
deleted file mode 100644
index 1d3190f5..00000000
--- a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/ClassDetail.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.language.semantics.metadata;
-
-public record ClassDetail(boolean abstractClass) implements RelationDetail {
-        public static final ClassDetail CONCRETE_CLASS = new ClassDetail(false);
-
-        public static final ClassDetail ABSTRACT_CLASS = new ClassDetail(true);
-
-        public static ClassDetail ofAbstractClass(boolean abstractClass) {
-                return abstractClass ? ABSTRACT_CLASS : CONCRETE_CLASS;
-        }
-}
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/Metadata.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/Metadata.java
deleted file mode 100644
index d2dcb43a..00000000
--- a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/Metadata.java
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.language.semantics.metadata;
-
-public sealed interface Metadata permits NodeMetadata, RelationMetadata {
-        String name();
-
-        String simpleName();
-}
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/MetadataCreator.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/MetadataCreator.java
deleted file mode 100644
index 3694f5f4..00000000
--- a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/MetadataCreator.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.language.semantics.metadata;
-
-import com.google.inject.Inject;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.xtext.naming.IQualifiedNameConverter;
-import org.eclipse.xtext.naming.IQualifiedNameProvider;
-import org.eclipse.xtext.naming.QualifiedName;
-import org.eclipse.xtext.scoping.IScope;
-import org.eclipse.xtext.scoping.IScopeProvider;
-import tools.refinery.language.model.problem.*;
-import tools.refinery.language.semantics.model.ModelInitializer;
-import tools.refinery.language.semantics.model.TracedException;
-import tools.refinery.language.utils.ProblemUtil;
-import tools.refinery.store.reasoning.representation.PartialRelation;
-
-import java.util.*;
-
-public class MetadataCreator {
-        @Inject
-        private IScopeProvider scopeProvider;
-
-        @Inject
-        private IQualifiedNameProvider qualifiedNameProvider;
-
-        @Inject
-        private IQualifiedNameConverter qualifiedNameConverter;
-
-        private ModelInitializer initializer;
-
-        private IScope nodeScope;
-
-        private IScope relationScope;
-
-        public void setInitializer(ModelInitializer initializer) {
-                if (initializer == null) {
-                        throw new IllegalArgumentException("Initializer was already set");
-                }
-                this.initializer = initializer;
-                var problem = initializer.getProblem();
-                nodeScope = scopeProvider.getScope(problem, ProblemPackage.Literals.NODE_ASSERTION_ARGUMENT__NODE);
-                relationScope = scopeProvider.getScope(problem, ProblemPackage.Literals.ASSERTION__RELATION);
-        }
-
-        public static String unnamedNode(int nodeId) {
-                return "::" + nodeId;
-        }
-
-        public List<NodeMetadata> getNodesMetadata() {
-                return getNodesMetadata(initializer.getNodeCount(), true);
-        }
-
-        public List<NodeMetadata> getNodesMetadata(int nodeCount, boolean preserveNewNodes) {
-                var nodes = new NodeMetadata[Math.max(initializer.getNodeCount(), nodeCount)];
-                for (var entry : initializer.getNodeTrace().keyValuesView()) {
-                        var node = entry.getOne();
-                        var id = entry.getTwo();
-                        nodes[id] = getNodeMetadata(id, node, preserveNewNodes);
-                }
-                for (int i = 0; i < nodes.length; i++) {
-                        if (nodes[i] == null) {
-                                var nodeName = unnamedNode(i);
-                                nodes[i] = new NodeMetadata(nodeName, nodeName, NodeKind.IMPLICIT);
-                        }
-                }
-                return List.of(nodes);
-        }
-
-        private NodeMetadata getNodeMetadata(int nodeId, Node node, boolean preserveNewNodes) {
-                var kind = getNodeKind(node);
-                if (!preserveNewNodes && kind == NodeKind.NEW) {
-                        var nodeName = unnamedNode(nodeId);
-                        return new NodeMetadata(nodeName, nodeName, NodeKind.IMPLICIT);
-                }
-                var qualifiedName = getQualifiedName(node);
-                var simpleName = getSimpleName(node, qualifiedName, nodeScope);
-                return new NodeMetadata(qualifiedNameConverter.toString(qualifiedName),
-                                qualifiedNameConverter.toString(simpleName), getNodeKind(node));
-        }
-
-        private NodeKind getNodeKind(Node node) {
-                if (ProblemUtil.isImplicitNode(node)) {
-                        return NodeKind.IMPLICIT;
-                } else if (ProblemUtil.isIndividualNode(node)) {
-                        return NodeKind.INDIVIDUAL;
-                } else if (ProblemUtil.isNewNode(node)) {
-                        return NodeKind.NEW;
-                } else {
-                        throw new TracedException(node, "Unknown node type");
-                }
-        }
-
-        public List<RelationMetadata> getRelationsMetadata() {
-                var relationTrace = initializer.getRelationTrace();
-                var relations = new ArrayList<RelationMetadata>(relationTrace.size());
-                for (var entry : relationTrace.entrySet()) {
-                        var relation = entry.getKey();
-                        var partialRelation = entry.getValue();
-                        var metadata = getRelationMetadata(relation, partialRelation);
-                        relations.add(metadata);
-                }
-                return Collections.unmodifiableList(relations);
-        }
-
-        private RelationMetadata getRelationMetadata(Relation relation, PartialRelation partialRelation) {
-                var qualifiedName = getQualifiedName(relation);
-                var qualifiedNameString = qualifiedNameConverter.toString(qualifiedName);
-                var simpleName = getSimpleName(relation, qualifiedName, relationScope);
-                var simpleNameString = qualifiedNameConverter.toString(simpleName);
-                var arity = partialRelation.arity();
-                var detail = getRelationDetail(relation, partialRelation);
-                return new RelationMetadata(qualifiedNameString, simpleNameString, arity, detail);
-        }
-
-        private RelationDetail getRelationDetail(Relation relation, PartialRelation partialRelation) {
-                if (ProblemUtil.isBuiltIn(relation) && !ProblemUtil.isError(relation)) {
-                        return getBuiltInDetail();
-                }
-                if (relation instanceof ClassDeclaration classDeclaration) {
-                        return getClassDetail(classDeclaration);
-                } else if (relation instanceof ReferenceDeclaration) {
-                        return getReferenceDetail(partialRelation);
-                } else if (relation instanceof EnumDeclaration) {
-                        return getEnumDetail();
-                } else if (relation instanceof PredicateDefinition predicateDefinition) {
-                        return getPredicateDetail(predicateDefinition);
-                } else {
-                        throw new TracedException(relation, "Unknown relation");
-                }
-        }
-
-        private RelationDetail getBuiltInDetail() {
-                return BuiltInDetail.INSTANCE;
-        }
-
-        private RelationDetail getClassDetail(ClassDeclaration classDeclaration) {
-                return ClassDetail.ofAbstractClass(classDeclaration.isAbstract());
-        }
-
-        private RelationDetail getReferenceDetail(PartialRelation partialRelation) {
-                var metamodel = initializer.getMetamodel();
-                var opposite = metamodel.oppositeReferences().get(partialRelation);
-                if (opposite == null) {
-                        boolean isContainment = metamodel.containmentHierarchy().containsKey(partialRelation);
-                        return ReferenceDetail.ofContainment(isContainment);
-                } else {
-                        boolean isContainer = metamodel.containmentHierarchy().containsKey(opposite);
-                        return new OppositeReferenceDetail(isContainer, opposite.name());
-                }
-        }
-
-        private RelationDetail getEnumDetail() {
-                return ClassDetail.CONCRETE_CLASS;
-        }
-
-        private RelationDetail getPredicateDetail(PredicateDefinition predicate) {
-                return PredicateDetail.ofError(predicate.isError());
-        }
-
-        private QualifiedName getQualifiedName(EObject eObject) {
-                var qualifiedName = qualifiedNameProvider.getFullyQualifiedName(eObject);
-                if (qualifiedName == null) {
-                        throw new TracedException(eObject, "Unknown qualified name");
-                }
-                return qualifiedName;
-        }
-
-        private QualifiedName getSimpleName(EObject eObject, QualifiedName qualifiedName, IScope scope) {
-                var descriptions = scope.getElements(eObject);
-                var names = new ArrayList<QualifiedName>();
-                for (var description : descriptions) {
-                        // {@code getQualifiedName()} will refer to the full name for objects that are loaded from the global
-                        // scope, but {@code getName()} returns the qualified name that we set in
-                        // {@code ProblemResourceDescriptionStrategy}.
-                        names.add(description.getName());
-                }
-                names.sort(Comparator.comparingInt(QualifiedName::getSegmentCount));
-                for (var simpleName : names) {
-                        if (names.contains(simpleName) && isUnique(scope, simpleName)) {
-                                return simpleName;
-                        }
-                }
-                throw new TracedException(eObject, "Ambiguous qualified name: " +
-                                qualifiedNameConverter.toString(qualifiedName));
-        }
-
-        private boolean isUnique(IScope scope, QualifiedName name) {
-                var iterator = scope.getElements(name).iterator();
-                if (!iterator.hasNext()) {
-                        return false;
-                }
-                iterator.next();
-                return !iterator.hasNext();
-        }
-}
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/NodeKind.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/NodeKind.java
deleted file mode 100644
index 01f0cd09..00000000
--- a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/NodeKind.java
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.language.semantics.metadata;
-
-public enum NodeKind {
-        IMPLICIT,
-        INDIVIDUAL,
-        NEW
-}
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/NodeMetadata.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/NodeMetadata.java
deleted file mode 100644
index 812952c0..00000000
--- a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/NodeMetadata.java
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.language.semantics.metadata;
-
-public record NodeMetadata(String name, String simpleName, NodeKind kind) implements Metadata {
-}
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/OppositeReferenceDetail.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/OppositeReferenceDetail.java
deleted file mode 100644
index 26d7461c..00000000
--- a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/OppositeReferenceDetail.java
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.language.semantics.metadata;
-
-public record OppositeReferenceDetail(boolean container, String opposite) implements RelationDetail {
-}
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/PredicateDetail.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/PredicateDetail.java
deleted file mode 100644
index ca397eca..00000000
--- a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/PredicateDetail.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.language.semantics.metadata;
-
-public record PredicateDetail(boolean error) implements RelationDetail {
-        public static final PredicateDetail PREDICATE = new PredicateDetail(false);
-
-        public static final PredicateDetail ERROR_PREDICATE = new PredicateDetail(true);
-
-        public static PredicateDetail ofError(boolean error) {
-                return error ? ERROR_PREDICATE : PREDICATE;
-        }
-}
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/ReferenceDetail.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/ReferenceDetail.java
deleted file mode 100644
index 36771566..00000000
--- a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/ReferenceDetail.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.language.semantics.metadata;
-
-public record ReferenceDetail(boolean containment) implements RelationDetail {
-        public static final ReferenceDetail CROSS_REFERENCE = new ReferenceDetail(false);
-
-        public static final ReferenceDetail CONTAINMENT_REFERENCE = new ReferenceDetail(true);
-
-        public static ReferenceDetail ofContainment(boolean containment) {
-                return containment ? CONTAINMENT_REFERENCE : CROSS_REFERENCE;
-        }
-}
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/RelationDetail.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/RelationDetail.java
deleted file mode 100644
index 105179fd..00000000
--- a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/RelationDetail.java
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.language.semantics.metadata;
-
-public sealed interface RelationDetail permits ClassDetail, ReferenceDetail, PredicateDetail, OppositeReferenceDetail,
-                BuiltInDetail {
-}
diff --git a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/RelationMetadata.java b/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/RelationMetadata.java
deleted file mode 100644
index 5abcc253..00000000
--- a/subprojects/language-semantics/src/main/java/tools/refinery/language/semantics/metadata/RelationMetadata.java
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2023 The Refinery Authors <https://refinery.tools/>
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-package tools.refinery.language.semantics.metadata;
-
-public record RelationMetadata(String name, String simpleName, int arity, RelationDetail detail) implements Metadata {
-}
diff --git a/subprojects/language-semantics/src/test/java/tools/refinery/language/semantics/model/CountPropagationTest.java b/subprojects/language-semantics/src/test/java/tools/refinery/language/semantics/CountPropagationTest.java
index 6beae93a..b679c1ef 100644
--- a/subprojects/language-semantics/src/test/java/tools/refinery/language/semantics/model/CountPropagationTest.java
+++ b/subprojects/language-semantics/src/test/java/tools/refinery/language/semantics/CountPropagationTest.java
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.language.semantics.model;
+package tools.refinery.language.semantics;
 
 import org.junit.jupiter.api.Test;
 import tools.refinery.store.dse.propagation.PropagationAdapter;
diff --git a/subprojects/language-semantics/src/test/java/tools/refinery/language/semantics/model/ModelGenerationTest.java b/subprojects/language-semantics/src/test/java/tools/refinery/language/semantics/ModelGenerationTest.java
index c8a79c37..899e3cb3 100644
--- a/subprojects/language-semantics/src/test/java/tools/refinery/language/semantics/model/ModelGenerationTest.java
+++ b/subprojects/language-semantics/src/test/java/tools/refinery/language/semantics/ModelGenerationTest.java
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.language.semantics.model;
+package tools.refinery.language.semantics;
 
 import com.google.inject.Inject;
 import org.eclipse.xtext.testing.InjectWith;
diff --git a/subprojects/language-semantics/src/test/java/tools/refinery/language/semantics/model/internal/DecisionTreeTests.java b/subprojects/language-semantics/src/test/java/tools/refinery/language/semantics/internal/DecisionTreeTests.java
index 5d039308..2320de2c 100644
--- a/subprojects/language-semantics/src/test/java/tools/refinery/language/semantics/model/internal/DecisionTreeTests.java
+++ b/subprojects/language-semantics/src/test/java/tools/refinery/language/semantics/internal/DecisionTreeTests.java
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  */
-package tools.refinery.language.semantics.model.internal;
+package tools.refinery.language.semantics.internal;
 
 import org.junit.jupiter.api.Test;
 import tools.refinery.store.representation.TruthValue;