diff --git a/README.md b/README.md
index 697181b1..4a7f24fb 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ and set **___Shared VM options___** to `--enable-preview`.
 </details>
 
 <details>
-<summary>Cannot resolve symbol 'HorizonForbiddenWest'</summary>
+<summary>Cannot resolve symbol 'HFW'</summary>
 IntelliJ IDEA refuses to provide code analysis for generated RTTI classes due to the enormous size of the generated
 code, and all references will be highlighted in _red_. The project will still compile and launch just fine.
 
diff --git a/odradek-app/pom.xml b/odradek-app/pom.xml
index 619ed2a8..249cd941 100644
--- a/odradek-app/pom.xml
+++ b/odradek-app/pom.xml
@@ -21,7 +21,7 @@
         <!-- Internal dependencies -->
         <dependency>
             <groupId>sh.adelessfox</groupId>
-            <artifactId>odradek-game</artifactId>
+            <artifactId>odradek-game-decima</artifactId>
         </dependency>
         <dependency>
             <groupId>sh.adelessfox</groupId>
diff --git a/odradek-app/src/main/java/module-info.java b/odradek-app/src/main/java/module-info.java
index cf3e8304..58207fd5 100644
--- a/odradek-app/src/main/java/module-info.java
+++ b/odradek-app/src/main/java/module-info.java
@@ -11,9 +11,9 @@
     requires jakarta.inject;
     requires java.desktop;
     requires odradek.core;
-    requires odradek.game;
-    requires odradek.game.hfw;
+    requires odradek.game.decima;
     requires odradek.game.hfw.ui;
+    requires odradek.game.hfw;
     requires odradek.rtti;
     requires odradek.ui;
     requires org.slf4j;
diff --git a/odradek-app/src/main/java/sh/adelessfox/odradek/app/Main.java b/odradek-app/src/main/java/sh/adelessfox/odradek/app/Main.java
index 88f0bfd6..a79d3ea6 100644
--- a/odradek-app/src/main/java/sh/adelessfox/odradek/app/Main.java
+++ b/odradek-app/src/main/java/sh/adelessfox/odradek/app/Main.java
@@ -9,7 +9,7 @@
 import sh.adelessfox.odradek.app.cli.ExportAssetCommand;
 import sh.adelessfox.odradek.app.ui.Application;
 import sh.adelessfox.odradek.app.ui.ApplicationParameters;
-import sh.adelessfox.odradek.game.ObjectId;
+import sh.adelessfox.odradek.game.decima.ObjectId;
 import sh.adelessfox.odradek.util.system.OperatingSystem;
 
 import javax.swing.*;
diff --git a/odradek-app/src/main/java/sh/adelessfox/odradek/app/cli/AbstractCommand.java b/odradek-app/src/main/java/sh/adelessfox/odradek/app/cli/AbstractCommand.java
index f00265fe..0549d6bc 100644
--- a/odradek-app/src/main/java/sh/adelessfox/odradek/app/cli/AbstractCommand.java
+++ b/odradek-app/src/main/java/sh/adelessfox/odradek/app/cli/AbstractCommand.java
@@ -2,6 +2,7 @@
 
 import picocli.CommandLine.Option;
 import sh.adelessfox.odradek.game.Game;
+import sh.adelessfox.odradek.game.decima.DecimaGame;
 
 import java.io.IOException;
 import java.nio.file.Path;
@@ -13,15 +14,15 @@ abstract class AbstractCommand implements Callable<Void> {
 
     @Override
     public Void call() throws Exception {
-        try (Game game = createGame(source)) {
+        try (var game = createGame(source)) {
             execute(game);
             return null;
         }
     }
 
-    abstract void execute(Game game) throws IOException;
+    abstract void execute(DecimaGame game) throws IOException;
 
-    private Game createGame(Path path) throws IOException {
-        return Game.load(path);
+    private DecimaGame createGame(Path path) throws IOException {
+        return (DecimaGame) Game.load(path);
     }
 }
diff --git a/odradek-app/src/main/java/sh/adelessfox/odradek/app/cli/ExportAssetCommand.java b/odradek-app/src/main/java/sh/adelessfox/odradek/app/cli/ExportAssetCommand.java
index 3dbc1cc5..da132fe5 100644
--- a/odradek-app/src/main/java/sh/adelessfox/odradek/app/cli/ExportAssetCommand.java
+++ b/odradek-app/src/main/java/sh/adelessfox/odradek/app/cli/ExportAssetCommand.java
@@ -7,8 +7,8 @@
 import picocli.CommandLine.Parameters;
 import sh.adelessfox.odradek.game.Converter;
 import sh.adelessfox.odradek.game.Exporter;
-import sh.adelessfox.odradek.game.Game;
-import sh.adelessfox.odradek.game.ObjectId;
+import sh.adelessfox.odradek.game.decima.DecimaGame;
+import sh.adelessfox.odradek.game.decima.ObjectId;
 import sh.adelessfox.odradek.rtti.data.TypedObject;
 
 import java.io.IOException;
@@ -32,7 +32,7 @@ public class ExportAssetCommand extends AbstractCommand {
     private Path output;
 
     @Override
-    void execute(Game game) {
+    void execute(DecimaGame game) {
         if (format == null) {
             log.info("No format specified for export; supported formats are: {}", supportedFormats());
             return;
diff --git a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/Application.java b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/Application.java
index 5d2a8e07..3bbed733 100644
--- a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/Application.java
+++ b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/Application.java
@@ -12,7 +12,7 @@
 import sh.adelessfox.odradek.app.ui.settings.SettingsEvent;
 import sh.adelessfox.odradek.event.EventBus;
 import sh.adelessfox.odradek.game.Game;
-import sh.adelessfox.odradek.game.hfw.game.ForbiddenWestGame;
+import sh.adelessfox.odradek.game.decima.DecimaGame;
 import sh.adelessfox.odradek.ui.actions.Actions;
 import sh.adelessfox.odradek.ui.data.DataContext;
 import sh.adelessfox.odradek.ui.editors.EditorManager;
@@ -46,7 +46,7 @@ public static synchronized void start(ApplicationParameters params) throws IOExc
             throw new IllegalStateException("Application is already running");
         }
 
-        var game = (ForbiddenWestGame) Game.load(params.sourcePath());
+        var game = (DecimaGame) Game.load(params.sourcePath());
         var component = DaggerApplicationComponent.builder()
             .game(game)
             .config(params.configPath())
@@ -59,8 +59,10 @@ public static synchronized void start(ApplicationParameters params) throws IOExc
     }
 
     private static void run(ApplicationComponent component, ApplicationParameters params) {
-        Thread.setDefaultUncaughtExceptionHandler(
-            (_, e) -> Dialogs.showExceptionDialog(JOptionPane.getRootFrame(), e.toString(), e));
+        Thread.setDefaultUncaughtExceptionHandler((_, e) -> {
+            log.error("Uncaught exception in thread '{}'", Thread.currentThread().getName(), e);
+            Dialogs.showExceptionDialog(JOptionPane.getRootFrame(), e.toString(), e);
+        });
 
         if (OperatingSystem.name() == OperatingSystem.Name.LINUX) {
             // enable custom window decorations
@@ -127,7 +129,7 @@ private static void saveFrameSettings(Settings settings, JFrame frame) {
         ));
     }
 
-    public ForbiddenWestGame game() {
+    public DecimaGame game() {
         return component.game();
     }
 
diff --git a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/ApplicationComponent.java b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/ApplicationComponent.java
index 440c1d45..f9f4811d 100644
--- a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/ApplicationComponent.java
+++ b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/ApplicationComponent.java
@@ -9,7 +9,7 @@
 import sh.adelessfox.odradek.app.ui.settings.Settings;
 import sh.adelessfox.odradek.app.ui.settings.SettingsModule;
 import sh.adelessfox.odradek.event.EventBus;
-import sh.adelessfox.odradek.game.hfw.game.ForbiddenWestGame;
+import sh.adelessfox.odradek.game.decima.DecimaGame;
 import sh.adelessfox.odradek.ui.editors.EditorManager;
 
 import java.nio.file.Path;
@@ -27,12 +27,12 @@ interface ApplicationComponent {
 
     EventBus events();
 
-    ForbiddenWestGame game();
+    DecimaGame game();
 
     @Component.Builder
     interface Builder {
         @BindsInstance
-        Builder game(ForbiddenWestGame game);
+        Builder game(DecimaGame game);
 
         @BindsInstance
         Builder config(@Named("config") Path config);
diff --git a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/bookmarks/Bookmark.java b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/bookmarks/Bookmark.java
index 8423d0b9..16c11165 100644
--- a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/bookmarks/Bookmark.java
+++ b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/bookmarks/Bookmark.java
@@ -1,6 +1,6 @@
 package sh.adelessfox.odradek.app.ui.bookmarks;
 
-import sh.adelessfox.odradek.game.ObjectId;
+import sh.adelessfox.odradek.game.decima.ObjectId;
 
 public record Bookmark(ObjectId objectId, String name) {
 }
diff --git a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/bookmarks/Bookmarks.java b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/bookmarks/Bookmarks.java
index f5ed1f02..74b2c4f0 100644
--- a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/bookmarks/Bookmarks.java
+++ b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/bookmarks/Bookmarks.java
@@ -3,7 +3,7 @@
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
 import sh.adelessfox.odradek.event.EventBus;
-import sh.adelessfox.odradek.game.ObjectId;
+import sh.adelessfox.odradek.game.decima.ObjectId;
 
 import java.util.LinkedHashMap;
 import java.util.List;
diff --git a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/bookmarks/BookmarkStructure.java b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/bookmarks/BookmarkStructure.java
index 9f9a20cb..c6a494fc 100644
--- a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/bookmarks/BookmarkStructure.java
+++ b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/bookmarks/BookmarkStructure.java
@@ -1,8 +1,8 @@
 package sh.adelessfox.odradek.app.ui.component.bookmarks;
 
 import sh.adelessfox.odradek.app.ui.bookmarks.Bookmarks;
-import sh.adelessfox.odradek.game.ObjectId;
-import sh.adelessfox.odradek.game.ObjectIdHolder;
+import sh.adelessfox.odradek.game.decima.ObjectId;
+import sh.adelessfox.odradek.game.decima.ObjectIdHolder;
 import sh.adelessfox.odradek.ui.components.tree.TreeStructure;
 
 import java.util.Comparator;
diff --git a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/bookmarks/menu/AbstractBookmarkAction.java b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/bookmarks/menu/AbstractBookmarkAction.java
index 62f27062..435065c6 100644
--- a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/bookmarks/menu/AbstractBookmarkAction.java
+++ b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/bookmarks/menu/AbstractBookmarkAction.java
@@ -1,7 +1,7 @@
 package sh.adelessfox.odradek.app.ui.component.bookmarks.menu;
 
-import sh.adelessfox.odradek.game.ObjectId;
-import sh.adelessfox.odradek.game.ObjectIdHolder;
+import sh.adelessfox.odradek.game.decima.ObjectId;
+import sh.adelessfox.odradek.game.decima.ObjectIdHolder;
 import sh.adelessfox.odradek.ui.actions.Action;
 import sh.adelessfox.odradek.ui.actions.ActionContext;
 import sh.adelessfox.odradek.ui.data.DataKeys;
diff --git a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/graph/GraphStructure.java b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/graph/GraphStructure.java
index 168aa521..6b451b82 100644
--- a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/graph/GraphStructure.java
+++ b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/graph/GraphStructure.java
@@ -1,11 +1,6 @@
 package sh.adelessfox.odradek.app.ui.component.graph;
 
-import sh.adelessfox.odradek.game.Game;
-import sh.adelessfox.odradek.game.ObjectId;
-import sh.adelessfox.odradek.game.ObjectIdHolder;
-import sh.adelessfox.odradek.game.ObjectSupplier;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.StreamingGroupData;
-import sh.adelessfox.odradek.game.hfw.storage.StreamingGraphResource;
+import sh.adelessfox.odradek.game.decima.*;
 import sh.adelessfox.odradek.rtti.ClassTypeInfo;
 import sh.adelessfox.odradek.rtti.data.TypedObject;
 import sh.adelessfox.odradek.ui.components.tree.TreeStructure;
@@ -22,9 +17,9 @@ public sealed interface GraphStructure extends TreeStructure<GraphStructure> {
     @SuppressWarnings("unused")
     abstract sealed class Groupable<T extends Groupable<T, ?>, O extends Enum<O>> {
         final EnumSet<O> options;
-        final StreamingGraphResource graph;
+        final StreamingGraph graph;
 
-        Groupable(StreamingGraphResource graph, EnumSet<O> options) {
+        Groupable(StreamingGraph graph, EnumSet<O> options) {
             this.options = EnumSet.copyOf(options);
             this.graph = graph;
         }
@@ -35,8 +30,8 @@ public Set<O> options() {
     }
 
     abstract sealed class GroupableByGroup extends Groupable<GroupableByGroup, GroupableByGroup.Option> {
-        private static final Comparator<Map.Entry<StreamingGroupData, int[]>>
-            DEFAULT_COMPARATOR = Comparator.comparingInt(e -> e.getKey().groupID()),
+        private static final Comparator<Map.Entry<StreamingGraph.Group, int[]>>
+            DEFAULT_COMPARATOR = Comparator.comparingInt(e -> e.getKey().id()),
             COUNT_COMPARATOR = Comparator.comparingInt(e -> -e.getValue().length);
 
         public enum Option {
@@ -44,7 +39,7 @@ public enum Option {
             SORT_BY_COUNT
         }
 
-        GroupableByGroup(StreamingGraphResource graph) {
+        GroupableByGroup(StreamingGraph graph) {
             super(graph, EnumSet.of(Option.GROUP_BY_GROUP));
         }
 
@@ -66,7 +61,11 @@ List<? extends GraphStructure> getGroupedChildren() {
             }
         }
 
-        GroupObject toGroupObject(StreamingGroupData group, int index, boolean includeGroupId) {
+        GroupObject toGroupObject(
+            StreamingGraph.Group group,
+            int index,
+            boolean includeGroupId
+        ) {
             return new GroupObject(graph, group, index, includeGroupId);
         }
 
@@ -75,10 +74,10 @@ public Set<Option> options() {
         }
 
         /** Get the groups that belong to this grouping. */
-        protected abstract Stream<StreamingGroupData> groups();
+        protected abstract Stream<StreamingGraph.Group> groups();
 
         /** Get the indices of the objects in the given group. */
-        protected abstract int[] indices(StreamingGroupData group);
+        protected abstract int[] indices(StreamingGraph.Group group);
     }
 
     abstract sealed class GroupableByType extends Groupable<GroupableByType, GroupableByType.Option> {
@@ -91,7 +90,7 @@ public enum Option {
             SORT_BY_COUNT
         }
 
-        GroupableByType(StreamingGraphResource graph) {
+        GroupableByType(StreamingGraph graph) {
             super(graph, EnumSet.noneOf(Option.class));
         }
 
@@ -128,16 +127,17 @@ public Set<Option> options() {
 
         protected abstract IntStream keys();
 
-        protected abstract StreamingGroupData group(int key);
+        protected abstract StreamingGraph.Group group(int key);
 
         protected abstract int index(int key);
 
         private ClassTypeInfo type(int key) {
-            return graph.types().get(group(key).typeStart() + index(key));
+            return group(key).types().get(index(key));
         }
     }
 
-    record GroupedByGroup(GroupableByGroup parent, StreamingGroupData group, int[] indices) implements GraphStructure {
+    record GroupedByGroup(GroupableByGroup parent, StreamingGraph.Group group,
+                          int[] indices) implements GraphStructure {
         List<? extends GraphStructure> getGroupedChildren() {
             return IntStream.of(indices)
                 .mapToObj(index -> parent.toGroupObject(group, index, false))
@@ -148,17 +148,17 @@ List<? extends GraphStructure> getGroupedChildren() {
         public boolean equals(Object o) {
             return o instanceof GroupedByGroup that
                 && parent.equals(that.parent)
-                && group.groupID() == that.group.groupID();
+                && group.id() == that.group.id();
         }
 
         @Override
         public int hashCode() {
-            return Objects.hash(parent, group.groupID());
+            return Objects.hash(parent, group.id());
         }
 
         @Override
         public String toString() {
-            return "Group %d (%d)".formatted(group.groupID(), indices.length);
+            return "Group %d (%d)".formatted(group.id(), indices.length);
         }
     }
 
@@ -185,21 +185,21 @@ public String toString() {
         }
     }
 
-    record Graph(StreamingGraphResource graph) implements GraphStructure {
+    record Graph(StreamingGraph graph) implements GraphStructure {
         @Override
         public String toString() {
             return "Graph";
         }
     }
 
-    record GraphGroups(StreamingGraphResource graph) implements GraphStructure {
+    record GraphGroups(StreamingGraph graph) implements GraphStructure {
         @Override
         public String toString() {
             return "Groups (" + graph.groups().size() + ")";
         }
     }
 
-    record GraphObjects(StreamingGraphResource graph) implements GraphStructure {
+    record GraphObjects(StreamingGraph graph) implements GraphStructure {
         @Override
         public String toString() {
             return "Objects (" + graph.types().size() + ")";
@@ -207,8 +207,18 @@ public String toString() {
     }
 
     final class GraphRoots extends GroupableByType implements GraphStructure {
-        GraphRoots(StreamingGraphResource graph) {
+        private record Root(StreamingGraph.Group group, int index) {
+        }
+
+        private final List<Root> roots;
+
+        GraphRoots(StreamingGraph graph) {
             super(graph);
+
+            roots = graph.groups().stream()
+                .flatMap(group -> group.roots().stream()
+                    .map(root -> new Root(group, root)))
+                .toList();
         }
 
         @Override
@@ -218,17 +228,17 @@ GroupObject toGroupObject(int key) {
 
         @Override
         protected IntStream keys() {
-            return IntStream.range(0, graph.rootIndices().length);
+            return IntStream.range(0, roots.size());
         }
 
         @Override
-        protected StreamingGroupData group(int key) {
-            return graph.group(graph.rootUUIDs().get(key));
+        protected StreamingGraph.Group group(int key) {
+            return roots.get(key).group();
         }
 
         @Override
         protected int index(int key) {
-            return graph.rootIndices()[key];
+            return roots.get(key).index();
         }
 
         @Override
@@ -243,7 +253,7 @@ public int hashCode() {
 
         @Override
         public String toString() {
-            return "Roots (" + graph.rootIndices().length + ")";
+            return "Roots (" + roots.size() + ")";
         }
     }
 
@@ -251,7 +261,7 @@ final class GraphObjectSet extends GroupableByGroup implements GraphStructure {
         private final ClassTypeInfo info;
         private final int count;
 
-        GraphObjectSet(StreamingGraphResource graph, ClassTypeInfo info, int count) {
+        GraphObjectSet(StreamingGraph graph, ClassTypeInfo info, int count) {
             super(graph);
             this.info = info;
             this.count = count;
@@ -261,21 +271,18 @@ public ClassTypeInfo info() {
             return info;
         }
 
-        public int count() {
-            return count;
-        }
-
         @Override
-        protected Stream<StreamingGroupData> groups() {
+        protected Stream<StreamingGraph.Group> groups() {
             return graph.groups().stream()
-                .filter(group -> graph.types(group).anyMatch(type -> type == info))
-                .sorted(Comparator.comparingInt(StreamingGroupData::groupID));
+                .filter(group -> group.types().stream().anyMatch(type -> type == info))
+                .sorted(Comparator.comparingInt(StreamingGraph.Group::id))
+                .map(StreamingGraph.Group.class::cast);
         }
 
         @Override
-        protected int[] indices(StreamingGroupData group) {
-            return IntStream.range(0, group.typeCount())
-                .filter(index -> graph.types().get(group.typeStart() + index) == info)
+        protected int[] indices(StreamingGraph.Group group) {
+            return IntStream.range(0, group.types().size())
+                .filter(index -> group.types().get(index) == info)
                 .toArray();
         }
 
@@ -296,32 +303,33 @@ public String toString() {
     }
 
     record Group(
-        StreamingGraphResource graph,
-        StreamingGroupData group,
+        StreamingGraph graph,
+        StreamingGraph.Group group,
         boolean filterable
     ) implements GraphStructure, Comparable<Group> {
         @Override
         public int compareTo(Group o) {
-            return Integer.compare(group.groupID(), o.group.groupID());
+            return Integer.compare(group.id(), o.group.id());
         }
 
         @Override
         public boolean equals(Object object) {
-            return object instanceof Group that && group.groupID() == that.group.groupID();
+            return object instanceof Group that && group.id() == that.group.id();
         }
 
         @Override
         public int hashCode() {
-            return group.groupID();
+            return group.id();
         }
 
         @Override
         public String toString() {
-            return "Group " + group.groupID();
+            return "Group " + group.id();
         }
     }
 
-    record GroupDependencies(StreamingGraphResource graph, StreamingGroupData group) implements GraphStructure {
+    record GroupDependencies(StreamingGraph graph,
+                             StreamingGraph.Group group) implements GraphStructure {
         @Override
         public boolean equals(Object o) {
             return o instanceof GroupDependencies that && Objects.equals(group, that.group);
@@ -329,16 +337,16 @@ public boolean equals(Object o) {
 
         @Override
         public int hashCode() {
-            return group.groupID();
+            return group.id();
         }
 
         @Override
         public String toString() {
-            return "Dependencies (" + group.subGroupCount() + ")";
+            return "Dependencies (" + group.subGroups().size() + ")";
         }
     }
 
-    record GroupDependents(StreamingGraphResource graph, StreamingGroupData group) implements GraphStructure {
+    record GroupDependents(StreamingGraph graph, StreamingGraph.Group group) implements GraphStructure {
         @Override
         public boolean equals(Object o) {
             return o instanceof GroupDependents that && Objects.equals(group, that.group);
@@ -346,30 +354,30 @@ public boolean equals(Object o) {
 
         @Override
         public int hashCode() {
-            return group.groupID();
+            return group.id();
         }
 
         @Override
         public String toString() {
-            return "Dependents (" + graph.incomingGroups(group).size() + ")";
+            return "Dependents (" + group.superGroups().size() + ")";
         }
     }
 
     final class GroupObjects extends GroupableByType implements GraphStructure {
-        private final StreamingGroupData group;
+        private final StreamingGraph.Group group;
 
-        public GroupObjects(StreamingGraphResource graph, StreamingGroupData group) {
+        public GroupObjects(StreamingGraph graph, StreamingGraph.Group group) {
             super(graph);
             this.group = group;
         }
 
         @Override
         protected IntStream keys() {
-            return IntStream.range(0, group.typeCount());
+            return IntStream.range(0, group.types().size());
         }
 
         @Override
-        protected StreamingGroupData group(int key) {
+        protected StreamingGraph.Group group(int key) {
             return group;
         }
 
@@ -380,66 +388,75 @@ protected int index(int key) {
 
         @Override
         public boolean equals(Object object) {
-            return object instanceof GroupObjects that && group.groupID() == that.group.groupID();
+            return object instanceof GroupObjects that && group.id() == that.group.id();
         }
 
         @Override
         public int hashCode() {
-            return group.groupID();
+            return group.id();
         }
 
         @Override
         public String toString() {
-            return "Objects (" + group.numObjects() + ")";
+            return "Objects (" + group.types().size() + ")";
         }
     }
 
     final class GroupRoots extends GroupableByType implements GraphStructure {
-        private final StreamingGroupData group;
+        private final StreamingGraph.Group group;
 
-        public GroupRoots(StreamingGraphResource graph, StreamingGroupData group) {
+        public GroupRoots(
+            StreamingGraph graph,
+            StreamingGraph.Group group
+        ) {
             super(graph);
             this.group = group;
         }
 
         @Override
         protected IntStream keys() {
-            return IntStream.range(0, group.rootCount());
+            return IntStream.range(0, group.roots().size());
         }
 
         @Override
-        protected StreamingGroupData group(int key) {
+        protected StreamingGraph.Group group(int key) {
             return group;
         }
 
         @Override
         protected int index(int key) {
-            return graph.rootIndices()[group.rootStart() + key];
+            return group.roots().get(key);
         }
 
         @Override
         public boolean equals(Object object) {
-            return object instanceof GroupRoots that && group.groupID() == that.group.groupID();
+            return object instanceof GroupRoots that && group.id() == that.group.id();
         }
 
         @Override
         public int hashCode() {
-            return group.groupID();
+            return group.id();
         }
 
         @Override
         public String toString() {
-            return "Roots (" + group.rootCount() + ")";
+            return "Roots (" + group.roots().size() + ")";
         }
     }
 
     record GroupObject(
-        StreamingGraphResource graph,
-        StreamingGroupData group,
+        StreamingGraph graph,
+        StreamingGraph.Group group,
         int indexAndIncludeGroupId
-    ) implements GraphStructure, ObjectSupplier, ObjectIdHolder {
-        public GroupObject(StreamingGraphResource graph, StreamingGroupData group, int index, boolean includeGroupId) {
-            Objects.checkIndex(index, group.numObjects());
+    )
+        implements GraphStructure, ObjectSupplier, ObjectIdHolder {
+        public GroupObject(
+            StreamingGraph graph,
+            StreamingGraph.Group group,
+            int index,
+            boolean includeGroupId
+        ) {
+            Objects.checkIndex(index, group.types().size());
             this(graph, group, index | (includeGroupId ? 0x80000000 : 0));
         }
 
@@ -452,36 +469,36 @@ boolean includeGroupId() {
         }
 
         @Override
-        public TypedObject readObject(Game game) throws IOException {
-            return game.readObject(group.groupID(), index());
+        public TypedObject readObject(DecimaGame game) throws IOException {
+            return game.readObject(group.id(), index());
         }
 
         @Override
         public ClassTypeInfo objectType() {
-            return graph.types().get(group.typeStart() + index());
+            return group.types().get(index());
         }
 
         @Override
         public ObjectId objectId() {
-            return new ObjectId(group.groupID(), index());
+            return new ObjectId(group.id(), index());
         }
 
         @Override
         public boolean equals(Object object) {
             return object instanceof GroupObject that
-                && group.groupID() == that.group.groupID()
+                && group.id() == that.group.id()
                 && indexAndIncludeGroupId == that.indexAndIncludeGroupId;
         }
 
         @Override
         public int hashCode() {
-            return Objects.hash(group.groupID(), indexAndIncludeGroupId);
+            return Objects.hash(group.id(), indexAndIncludeGroupId);
         }
 
         @Override
         public String toString() {
             if (includeGroupId()) {
-                return "[%d:%d] %s".formatted(group.groupID(), index(), objectType());
+                return "[%d:%d] %s".formatted(group.id(), index(), objectType());
             } else {
                 return "[%d] %s".formatted(index(), objectType());
             }
@@ -511,14 +528,11 @@ case Group(var graph, var group, _) -> List.of(
                 new GroupDependencies(graph, group),
                 new GroupDependents(graph, group)
             );
-            case GroupDependencies(var graph, var group) ->
-                Arrays.stream(graph.subGroups(), group.subGroupStart(), group.subGroupStart() + group.subGroupCount())
-                    .mapToObj(graph::group)
-                    .map(Objects::requireNonNull)
-                    .map(subGroup -> new Group(graph, subGroup, false))
-                    .toList();
-            case GroupDependents(var graph, var group) -> graph.incomingGroups(group).stream()
-                .sorted(Comparator.comparingInt(StreamingGroupData::groupID))
+            case GroupDependencies(var graph, var group) -> group.subGroups().stream()
+                .map(subGroup -> new Group(graph, subGroup, false))
+                .toList();
+            case GroupDependents(var graph, var group) -> group.superGroups().stream()
+                .sorted(Comparator.comparingInt(StreamingGraph.Group::id))
                 .map(inGroup -> new Group(graph, inGroup, false))
                 .toList();
 
@@ -535,9 +549,9 @@ case GroupDependents(var graph, var group) -> graph.incomingGroups(group).stream
     @Override
     default boolean hasChildren() {
         return switch (this) {
-            case GroupDependencies(var _, var group) -> group.subGroupCount() > 0;
-            case GroupDependents(var graph, var group) -> !graph.incomingGroups(group).isEmpty();
-            case GroupRoots roots -> roots.group.rootCount() > 0;
+            case GroupDependencies(var _, var group) -> !group.subGroups().isEmpty();
+            case GroupDependents(_, var group) -> !group.superGroups().isEmpty();
+            case GroupRoots roots -> !roots.group.roots().isEmpty();
             case GroupObject _ -> false;
             default -> true;
         };
diff --git a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/graph/GraphView.java b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/graph/GraphView.java
index c144a695..9517967a 100644
--- a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/graph/GraphView.java
+++ b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/graph/GraphView.java
@@ -9,9 +9,9 @@
 import sh.adelessfox.odradek.app.ui.component.main.MainEvent;
 import sh.adelessfox.odradek.app.ui.menu.graph.GraphMenu;
 import sh.adelessfox.odradek.event.EventBus;
-import sh.adelessfox.odradek.game.ObjectId;
-import sh.adelessfox.odradek.game.ObjectSupplier;
-import sh.adelessfox.odradek.game.hfw.game.ForbiddenWestGame;
+import sh.adelessfox.odradek.game.decima.DecimaGame;
+import sh.adelessfox.odradek.game.decima.ObjectId;
+import sh.adelessfox.odradek.game.decima.ObjectSupplier;
 import sh.adelessfox.odradek.rtti.TypeInfo;
 import sh.adelessfox.odradek.rtti.data.TypedObject;
 import sh.adelessfox.odradek.ui.actions.Actions;
@@ -35,14 +35,14 @@ public class GraphView implements View<JComponent>, ToolPanel {
     private static final Logger log = LoggerFactory.getLogger(GraphView.class);
 
     private final EventBus eventBus;
-    private final ForbiddenWestGame game;
+    private final DecimaGame game;
 
     private final StructuredTree<GraphStructure> tree;
     private final JPanel panel;
     private final ValidationPopup filterValidationPopup;
 
     @Inject
-    GraphView(EventBus eventBus, ForbiddenWestGame game) {
+    GraphView(EventBus eventBus, DecimaGame game) {
         this.eventBus = eventBus;
         this.game = game;
 
@@ -157,7 +157,7 @@ private SearchTextField createFilterField() {
     }
 
     private StructuredTree<GraphStructure> createGraphTree() {
-        var tree = new StructuredTree<>(new GraphStructure.Graph(game.getStreamingGraph()));
+        var tree = new StructuredTree<>(new GraphStructure.Graph(game.streamingGraph()));
         tree.setRootVisible(false);
         tree.setShowsRootHandles(true);
         tree.setLabelProvider(new TreeLabelProvider<>() {
@@ -188,7 +188,7 @@ public Optional<Icon> getIcon(GraphStructure element) {
             var component = event.getLastPathComponent();
             if (component instanceof GraphStructure.GroupObject groupObject) {
                 eventBus.publish(new MainEvent.ShowObject(new ObjectId(
-                    groupObject.group().groupID(),
+                    groupObject.group().id(),
                     groupObject.index())
                 ));
             }
diff --git a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/graph/filter/Filter.java b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/graph/filter/Filter.java
index 29545886..5e663f7f 100644
--- a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/graph/filter/Filter.java
+++ b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/graph/filter/Filter.java
@@ -18,7 +18,7 @@ record GroupId(int id) implements Filter {
         public FilterResult test(GraphStructure structure, Set<FilterOption> options) {
             return switch (structure) {
                 case GraphStructure.Group group when group.filterable() ->
-                    FilterResult.of(group.group().groupID() == id);
+                    FilterResult.of(group.group().id() == id);
                 default -> FilterResult.NOT_APPLICABLE;
             };
         }
@@ -33,7 +33,7 @@ record GroupHasSubgroups() implements Filter {
         @Override
         public FilterResult test(GraphStructure structure, Set<FilterOption> options) {
             return switch (structure) {
-                case GraphStructure.Group group -> FilterResult.of(group.group().subGroupCount() > 0);
+                case GraphStructure.Group group -> FilterResult.of(!group.group().subGroups().isEmpty());
                 default -> FilterResult.NOT_APPLICABLE;
             };
         }
@@ -44,11 +44,26 @@ public String toString() {
         }
     }
 
+    record GroupHasSupergroups() implements Filter {
+        @Override
+        public FilterResult test(GraphStructure structure, Set<FilterOption> options) {
+            return switch (structure) {
+                case GraphStructure.Group group -> FilterResult.of(!group.group().superGroups().isEmpty());
+                default -> FilterResult.NOT_APPLICABLE;
+            };
+        }
+
+        @Override
+        public String toString() {
+            return "has:supergroups";
+        }
+    }
+
     record GroupHasRoots() implements Filter {
         @Override
         public FilterResult test(GraphStructure structure, Set<FilterOption> options) {
             return switch (structure) {
-                case GraphStructure.Group group -> FilterResult.of(group.group().rootCount() > 0);
+                case GraphStructure.Group group -> FilterResult.of(!group.group().roots().isEmpty());
                 default -> FilterResult.NOT_APPLICABLE;
             };
         }
@@ -64,8 +79,8 @@ record GroupType(String name) implements Filter {
         public FilterResult test(GraphStructure structure, Set<FilterOption> options) {
             return switch (structure) {
                 // @formatter:off
-                case GraphStructure.Group(var graph, var group, _) ->
-                    FilterResult.of(graph.types(group).anyMatch(info -> matches(info, options)));
+                case GraphStructure.Group(_, var group, _) ->
+                    FilterResult.of(group.types().stream().anyMatch(info -> matches(info, options)));
                 case GraphStructure.GraphObjectSet objectSet ->
                     FilterResult.of(matches(objectSet.info(), options));
                 case GraphStructure.GroupObject object ->
diff --git a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/graph/filter/FilterParser.java b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/graph/filter/FilterParser.java
index 257381c4..6d55dbad 100644
--- a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/graph/filter/FilterParser.java
+++ b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/graph/filter/FilterParser.java
@@ -146,6 +146,7 @@ private static Result<Filter, FilterError> parseKey(String key, int offset, Filt
                 }
                 yield switch (what) {
                     case "subgroups" -> Result.ok(new Filter.GroupHasSubgroups());
+                    case "supergroups" -> Result.ok(new Filter.GroupHasSupergroups());
                     case "roots" -> Result.ok(new Filter.GroupHasRoots());
                     default -> Result.error(new FilterError("Unknown 'has' criteria '" + what + "'", value.offset()));
                 };
diff --git a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/main/MainEvent.java b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/main/MainEvent.java
index f04317bf..0f2f457a 100644
--- a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/main/MainEvent.java
+++ b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/main/MainEvent.java
@@ -1,7 +1,7 @@
 package sh.adelessfox.odradek.app.ui.component.main;
 
 import sh.adelessfox.odradek.event.Event;
-import sh.adelessfox.odradek.game.ObjectId;
+import sh.adelessfox.odradek.game.decima.ObjectId;
 
 public sealed interface MainEvent extends Event {
     record ShowPanel(String id) implements MainEvent {
diff --git a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/main/MainPresenter.java b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/main/MainPresenter.java
index 22b25fa2..fd816f51 100644
--- a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/main/MainPresenter.java
+++ b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/main/MainPresenter.java
@@ -7,8 +7,8 @@
 import sh.adelessfox.odradek.app.ui.settings.Settings;
 import sh.adelessfox.odradek.app.ui.settings.SettingsEvent;
 import sh.adelessfox.odradek.event.EventBus;
-import sh.adelessfox.odradek.game.ObjectId;
-import sh.adelessfox.odradek.game.ObjectIdHolder;
+import sh.adelessfox.odradek.game.decima.ObjectId;
+import sh.adelessfox.odradek.game.decima.ObjectIdHolder;
 import sh.adelessfox.odradek.ui.editors.Editor;
 import sh.adelessfox.odradek.ui.editors.EditorManager;
 import sh.adelessfox.odradek.ui.editors.stack.EditorStackContainer;
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/game/LinkDatabase.java b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/usages/LinkDatabase.java
similarity index 77%
rename from odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/game/LinkDatabase.java
rename to odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/usages/LinkDatabase.java
index 52b4c413..a9b5b1fa 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/game/LinkDatabase.java
+++ b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/usages/LinkDatabase.java
@@ -1,15 +1,12 @@
-package sh.adelessfox.odradek.game.hfw.game;
+package sh.adelessfox.odradek.app.ui.component.usages;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import sh.adelessfox.odradek.game.LinkProvider;
-import sh.adelessfox.odradek.game.ObjectId;
-import sh.adelessfox.odradek.game.ObjectIdHolder;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.StreamingGroupData;
-import sh.adelessfox.odradek.game.hfw.storage.StreamingGraphResource;
-import sh.adelessfox.odradek.game.hfw.storage.StreamingObjectReader;
+import sh.adelessfox.odradek.game.decima.DecimaGame;
+import sh.adelessfox.odradek.game.decima.ObjectId;
+import sh.adelessfox.odradek.game.decima.ObjectIdHolder;
+import sh.adelessfox.odradek.game.decima.StreamingGraph;
 import sh.adelessfox.odradek.hashing.HashCode;
-import sh.adelessfox.odradek.hashing.HashFunction;
 import sh.adelessfox.odradek.io.BinaryReader;
 import sh.adelessfox.odradek.io.BinaryWriter;
 import sh.adelessfox.odradek.io.BytesBinaryWriter;
@@ -18,6 +15,7 @@
 import sh.adelessfox.odradek.rtti.data.TypeVisitor;
 import sh.adelessfox.odradek.rtti.data.TypedObject;
 
+import java.io.Closeable;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -25,23 +23,26 @@
 import java.util.function.BiConsumer;
 import java.util.stream.IntStream;
 
-public final class LinkDatabase implements LinkProvider {
+final class LinkDatabase implements Closeable {
+    record Link(int groupId, int objectIndex, TypePath path) {
+    }
+
     private static final Logger log = LoggerFactory.getLogger(LinkDatabase.class);
 
     private static final int FILE_MAGIC = 'G' | 'R' << 8 | 'P' << 16 | 'H' << 24;
     private static final int FILE_VERSION = 1;
 
-    private final ForbiddenWestGame game;
+    private final DecimaGame game;
     private final BinaryReader reader;
     private final int[] offsets;
 
-    private LinkDatabase(ForbiddenWestGame game, BinaryReader reader, int[] offsets) {
+    private LinkDatabase(DecimaGame game, BinaryReader reader, int[] offsets) {
         this.game = game;
         this.reader = reader;
         this.offsets = offsets;
     }
 
-    public static LinkDatabase open(ForbiddenWestGame game, Path path) throws IOException {
+    static LinkDatabase open(DecimaGame game, Path path) throws IOException {
         var reader = BinaryReader.open(path);
         try {
             int magic = reader.readInt();
@@ -59,7 +60,7 @@ public static LinkDatabase open(ForbiddenWestGame game, Path path) throws IOExce
                 throw new IllegalArgumentException("Link table checksum mismatch");
             }
 
-            int count = game.getStreamingGraph().types().size();
+            int count = game.streamingGraph().types().size();
             var offsets = reader.readInts(count);
             return new LinkDatabase(game, reader, offsets);
         } catch (Exception e) {
@@ -68,13 +69,12 @@ public static LinkDatabase open(ForbiddenWestGame game, Path path) throws IOExce
         }
     }
 
-    public static void build(
-        ForbiddenWestGame game,
+    static void build(
+        DecimaGame game,
         Path path,
         BiConsumer<Integer, Integer> progress
     ) throws IOException {
-        var graph = game.getStreamingGraph();
-        var reader = game.getStreamingReader();
+        var graph = game.streamingGraph();
 
         int objects = graph.types().size();
         var links = IntStream.range(0, objects)
@@ -86,13 +86,13 @@ public static void build(
             var group = graph.groups().get(i);
             progress.accept(i + 1, graph.groups().size());
 
-            var info = visitGroup(group, reader);
+            var info = visitGroup(group, game);
             for (int j = 0; j < info.objects().size(); j++) {
                 var object = info.objects().get(j);
-                for (LinkProvider.Link link : object.out()) {
+                for (Link link : object.out()) {
                     var targetGroup = graph.group(link.groupId());
                     int targetObject = targetGroup.typeStart() + link.objectIndex();
-                    links.get(targetObject).add(PackedLink.pack(group.groupID(), j, link.path()));
+                    links.get(targetObject).add(PackedLink.pack(group.id(), j, link.path()));
                 }
             }
         }
@@ -119,16 +119,12 @@ public static void build(
         }
     }
 
-    public static HashCode computeHash(ForbiddenWestGame game) throws IOException {
-        var graph = game.getStreamingGraph();
-        var system = game.getStreamingSystem();
-        var linkTable = system.getFileData(Math.toIntExact(graph.linkTableID()), 0, graph.linkTableSize());
-        return HashFunction.murmur3().hash(linkTable);
+    public static HashCode computeHash(DecimaGame game) {
+        return game.streamingGraph().checksum();
     }
 
-    @Override
-    public List<LinkProvider.Link> getIncomingLinks(ObjectId target) throws IOException {
-        var graph = game.getStreamingGraph();
+    public List<Link> getIncomingLinks(ObjectId target) throws IOException {
+        var graph = game.streamingGraph();
         var group = graph.group(target.groupId());
         int index = group.typeStart() + target.objectIndex();
 
@@ -139,24 +135,22 @@ public List<LinkProvider.Link> getIncomingLinks(ObjectId target) throws IOExcept
         }
     }
 
-    @Override
     public List<Link> getOutgoingLinks(ObjectId source) throws IOException {
         var object = game.readObject(source.groupId(), source.objectIndex());
         var info = visitObject(object);
         return info.out();
     }
 
-    @Override
     public void close() throws IOException {
         reader.close();
     }
 
-    private static GroupInfo visitGroup(StreamingGroupData group, StreamingObjectReader reader) throws IOException {
-        var result = reader.readGroup(group.groupID());
-        var objects = new ArrayList<ObjectInfo>(group.numObjects());
+    private static GroupInfo visitGroup(StreamingGraph.Group group, DecimaGame game) throws IOException {
+        var result = game.readGroup(group.id());
+        var objects = new ArrayList<ObjectInfo>(group.types().size());
 
-        for (int i = 0; i < group.numObjects(); i++) {
-            objects.add(visitObject(result.objects().get(i).object()));
+        for (int i = 0; i < group.types().size(); i++) {
+            objects.add(visitObject(result.get(i)));
         }
 
         return new GroupInfo(group, objects);
@@ -187,12 +181,12 @@ protected void visitPointer(PointerTypeInfo typeInfo, Object object, TypePath.Bu
         return new ObjectInfo(links);
     }
 
-    private static LinkProvider.Link readLink(StreamingGraphResource graph, BinaryReader reader) throws IOException {
+    private static Link readLink(StreamingGraph graph, BinaryReader reader) throws IOException {
         int groupId = readVarInt(reader);
         int objectIndex = readVarInt(reader);
-        var objectType = graph.types().get(graph.group(groupId).typeStart() + objectIndex);
+        var objectType = graph.group(groupId).types().get(objectIndex);
         var path = readPath(objectType, reader);
-        return new LinkProvider.Link(groupId, objectIndex, path);
+        return new Link(groupId, objectIndex, path);
     }
 
     private static void writeLink(PackedLink link, BinaryWriter writer) throws IOException {
@@ -262,7 +256,7 @@ private static void writeVarInt(BinaryWriter writer, int value) throws IOExcepti
         writer.writeByte((byte) value);
     }
 
-    private record ObjectInfo(List<LinkProvider.Link> out) {
+    private record ObjectInfo(List<Link> out) {
         private ObjectInfo {
             out = List.copyOf(out);
         }
@@ -273,7 +267,7 @@ public String toString() {
         }
     }
 
-    private record GroupInfo(StreamingGroupData data, List<ObjectInfo> objects) {
+    private record GroupInfo(StreamingGraph.Group group, List<ObjectInfo> objects) {
         private GroupInfo {
             objects = List.copyOf(objects);
         }
diff --git a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/usages/UsagesLabelProvider.java b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/usages/UsagesLabelProvider.java
index 033c2556..b22c1714 100644
--- a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/usages/UsagesLabelProvider.java
+++ b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/usages/UsagesLabelProvider.java
@@ -1,6 +1,6 @@
 package sh.adelessfox.odradek.app.ui.component.usages;
 
-import sh.adelessfox.odradek.game.hfw.game.ForbiddenWestGame;
+import sh.adelessfox.odradek.game.decima.DecimaGame;
 import sh.adelessfox.odradek.rtti.ClassTypeInfo;
 import sh.adelessfox.odradek.ui.components.StyledFragment;
 import sh.adelessfox.odradek.ui.components.StyledText;
@@ -11,9 +11,9 @@
 import java.util.Optional;
 
 final class UsagesLabelProvider implements StyledTreeLabelProvider<UsagesStructure> {
-    private final ForbiddenWestGame game;
+    private final DecimaGame game;
 
-    UsagesLabelProvider(ForbiddenWestGame game) {
+    UsagesLabelProvider(DecimaGame game) {
         this.game = game;
     }
 
@@ -64,8 +64,8 @@ private static Icon getIcon(UsagesStructure.Type type) {
     }
 
     private ClassTypeInfo getType(int groupId, int objectIndex) {
-        var graph = game.getStreamingGraph();
+        var graph = game.streamingGraph();
         var group = graph.group(groupId);
-        return graph.types().get(group.typeStart() + objectIndex);
+        return group.types().get(objectIndex);
     }
 }
diff --git a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/usages/UsagesStructure.java b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/usages/UsagesStructure.java
index 788ebdd2..d4c313e6 100644
--- a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/usages/UsagesStructure.java
+++ b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/usages/UsagesStructure.java
@@ -2,9 +2,8 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import sh.adelessfox.odradek.game.LinkProvider;
-import sh.adelessfox.odradek.game.ObjectId;
-import sh.adelessfox.odradek.game.ObjectIdHolder;
+import sh.adelessfox.odradek.game.decima.ObjectId;
+import sh.adelessfox.odradek.game.decima.ObjectIdHolder;
 import sh.adelessfox.odradek.ui.components.tree.TreeStructure;
 
 import java.io.IOException;
@@ -57,7 +56,7 @@ enum Type {
         OUTGOING
     }
 
-    record Root(LinkProvider provider, ObjectId object) implements UsagesStructure {
+    record Root(LinkDatabase provider, ObjectId object) implements UsagesStructure {
     }
 
     record Objects(ObjectId object) implements UsagesStructure {
@@ -66,7 +65,7 @@ record Objects(ObjectId object) implements UsagesStructure {
     record Object(ObjectId objectId) implements UsagesStructure, ObjectIdHolder {
     }
 
-    record Links(Type type, List<LinkProvider.Link> links) implements UsagesStructure {
+    record Links(Type type, List<LinkDatabase.Link> links) implements UsagesStructure {
         @Override
         public boolean equals(java.lang.Object obj) {
             return obj instanceof Links(var type1, _) && type == type1;
@@ -78,7 +77,7 @@ public int hashCode() {
         }
     }
 
-    record Link(Type type, LinkProvider.Link link) implements UsagesStructure, ObjectIdHolder {
+    record Link(Type type, LinkDatabase.Link link) implements UsagesStructure, ObjectIdHolder {
         @Override
         public ObjectId objectId() {
             return new ObjectId(link.groupId(), link.objectIndex());
@@ -86,7 +85,7 @@ public ObjectId objectId() {
 
         @Override
         public boolean equals(java.lang.Object obj) {
-            return obj instanceof Link(Type type1, LinkProvider.Link link1) && type == type1 && link.equals(link1);
+            return obj instanceof Link(Type type1, LinkDatabase.Link link1) && type == type1 && link.equals(link1);
         }
 
         @Override
diff --git a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/usages/UsagesToolPanel.java b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/usages/UsagesToolPanel.java
index 56a8c54b..e5570663 100644
--- a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/usages/UsagesToolPanel.java
+++ b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/usages/UsagesToolPanel.java
@@ -14,10 +14,9 @@
 import sh.adelessfox.odradek.event.DefaultEventBus;
 import sh.adelessfox.odradek.event.Event;
 import sh.adelessfox.odradek.event.EventBus;
-import sh.adelessfox.odradek.game.ObjectId;
-import sh.adelessfox.odradek.game.ObjectIdHolder;
-import sh.adelessfox.odradek.game.hfw.game.ForbiddenWestGame;
-import sh.adelessfox.odradek.game.hfw.game.LinkDatabase;
+import sh.adelessfox.odradek.game.decima.DecimaGame;
+import sh.adelessfox.odradek.game.decima.ObjectId;
+import sh.adelessfox.odradek.game.decima.ObjectIdHolder;
 import sh.adelessfox.odradek.ui.actions.Actions;
 import sh.adelessfox.odradek.ui.components.tool.ToolPanel;
 import sh.adelessfox.odradek.ui.components.tree.StructuredTree;
@@ -30,7 +29,6 @@
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
-import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -47,7 +45,7 @@ public final class UsagesToolPanel implements ToolPanel {
     private static final String CARD_SCANNING = "scanning";
     private static final String CARD_MAIN = "main";
 
-    private final ForbiddenWestGame game;
+    private final DecimaGame game;
     private final EventBus appEventBus;
     private final Path config;
 
@@ -58,7 +56,7 @@ public final class UsagesToolPanel implements ToolPanel {
     private ObjectId pendingObjectId;
 
     @Inject
-    UsagesToolPanel(ForbiddenWestGame game, EventBus appEventBus, @Named("config") Path config) {
+    UsagesToolPanel(DecimaGame game, EventBus appEventBus, @Named("config") Path config) {
         this.game = game;
         this.appEventBus = appEventBus;
         this.config = config;
@@ -169,7 +167,7 @@ private static JComponent createProgressView(EventBus eventBus) {
         return panel;
     }
 
-    private JComponent createTreeView(EventBus eventBus, ForbiddenWestGame game) {
+    private JComponent createTreeView(EventBus eventBus, DecimaGame game) {
         var tree = new StructuredTree<UsagesStructure>();
         tree.setLabelProvider(new UsagesLabelProvider(game));
         tree.setShowsRootHandles(true);
@@ -261,13 +259,8 @@ private void addToQueue(ObjectId objectId) {
         queueIndex = queue.size();
     }
 
-    private Path determineDatabasePath(ForbiddenWestGame game, Path config) {
-        try {
-            return config.resolve("links-" + LinkDatabase.computeHash(game) + ".db");
-        } catch (IOException e) {
-            log.error("Failed to compute link database hash, using fallback path", e);
-            return config.resolve("links.db");
-        }
+    private Path determineDatabasePath(DecimaGame game, Path config) {
+        return config.resolve("links-" + LinkDatabase.computeHash(game) + ".db");
     }
 
     record Progress(int cur, int max) {
@@ -299,10 +292,10 @@ record ShowObject(ObjectId objectId, boolean record) implements Events {
 
     private static class LoadDatabaseWorker extends SwingWorker<LinkDatabase, Void> {
         private final EventBus eventBus;
-        private final ForbiddenWestGame game;
+        private final DecimaGame game;
         private final Path path;
 
-        LoadDatabaseWorker(EventBus eventBus, ForbiddenWestGame game, Path path) {
+        LoadDatabaseWorker(EventBus eventBus, DecimaGame game, Path path) {
             this.eventBus = eventBus;
             this.game = game;
             this.path = path;
@@ -330,10 +323,10 @@ protected void done() {
 
     private static class BuildDatabaseWorker extends SwingWorker<Void, Progress> {
         private final EventBus eventBus;
-        private final ForbiddenWestGame game;
+        private final DecimaGame game;
         private final Path path;
 
-        BuildDatabaseWorker(EventBus eventBus, ForbiddenWestGame game, Path path) {
+        BuildDatabaseWorker(EventBus eventBus, DecimaGame game, Path path) {
             this.eventBus = eventBus;
             this.game = game;
             this.path = path;
diff --git a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/usages/menu/ShowUsagesAction.java b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/usages/menu/ShowUsagesAction.java
index 1f9c244a..66c2b349 100644
--- a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/usages/menu/ShowUsagesAction.java
+++ b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/component/usages/menu/ShowUsagesAction.java
@@ -6,7 +6,7 @@
 import sh.adelessfox.odradek.app.ui.component.main.MainView;
 import sh.adelessfox.odradek.app.ui.menu.MenuIds;
 import sh.adelessfox.odradek.app.ui.menu.graph.GraphMenu;
-import sh.adelessfox.odradek.game.ObjectIdHolder;
+import sh.adelessfox.odradek.game.decima.ObjectIdHolder;
 import sh.adelessfox.odradek.ui.actions.Action;
 import sh.adelessfox.odradek.ui.actions.ActionContext;
 import sh.adelessfox.odradek.ui.actions.ActionContribution;
diff --git a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/editors/ObjectEditor.java b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/editors/ObjectEditor.java
index 90e3c5c1..871567d9 100644
--- a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/editors/ObjectEditor.java
+++ b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/editors/ObjectEditor.java
@@ -1,7 +1,9 @@
 package sh.adelessfox.odradek.app.ui.editors;
 
 import com.formdev.flatlaf.extras.components.FlatTabbedPane;
-import sh.adelessfox.odradek.game.*;
+import sh.adelessfox.odradek.game.Converter;
+import sh.adelessfox.odradek.game.Game;
+import sh.adelessfox.odradek.game.decima.DecimaGame;
 import sh.adelessfox.odradek.rtti.ClassTypeInfo;
 import sh.adelessfox.odradek.rtti.data.TypedObject;
 import sh.adelessfox.odradek.ui.Viewer;
@@ -18,7 +20,7 @@
 import java.util.List;
 import java.util.Optional;
 
-public final class ObjectEditor implements Editor, ObjectIdHolder, ObjectSupplier, DataContext {
+public final class ObjectEditor implements Editor, sh.adelessfox.odradek.game.decima.ObjectIdHolder, sh.adelessfox.odradek.game.decima.ObjectSupplier, DataContext {
     public static final class Provider implements Editor.Provider {
         @Override
         public Editor createEditor(EditorInput input, EditorSite site) {
@@ -89,7 +91,7 @@ public void dispose() {
     }
 
     @Override
-    public TypedObject readObject(Game game) {
+    public TypedObject readObject(DecimaGame game) {
         if (input.game() != game) {
             throw new IllegalStateException("Unexpected game type");
         }
@@ -97,7 +99,7 @@ public TypedObject readObject(Game game) {
     }
 
     @Override
-    public ObjectId objectId() {
+    public sh.adelessfox.odradek.game.decima.ObjectId objectId() {
         return input.objectId();
     }
 
diff --git a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/editors/ObjectEditorInput.java b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/editors/ObjectEditorInput.java
index 0c6a1f96..82369697 100644
--- a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/editors/ObjectEditorInput.java
+++ b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/editors/ObjectEditorInput.java
@@ -1,8 +1,8 @@
 package sh.adelessfox.odradek.app.ui.editors;
 
 import sh.adelessfox.odradek.game.Game;
-import sh.adelessfox.odradek.game.ObjectId;
-import sh.adelessfox.odradek.game.ObjectIdHolder;
+import sh.adelessfox.odradek.game.decima.ObjectId;
+import sh.adelessfox.odradek.game.decima.ObjectIdHolder;
 import sh.adelessfox.odradek.rtti.data.TypedObject;
 import sh.adelessfox.odradek.ui.editors.EditorInput;
 
diff --git a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/editors/ObjectEditorInputLazy.java b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/editors/ObjectEditorInputLazy.java
index 8896f574..31ebe120 100644
--- a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/editors/ObjectEditorInputLazy.java
+++ b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/editors/ObjectEditorInputLazy.java
@@ -1,8 +1,8 @@
 package sh.adelessfox.odradek.app.ui.editors;
 
 import sh.adelessfox.odradek.app.ui.Application;
-import sh.adelessfox.odradek.game.ObjectId;
-import sh.adelessfox.odradek.game.ObjectIdHolder;
+import sh.adelessfox.odradek.game.decima.ObjectId;
+import sh.adelessfox.odradek.game.decima.ObjectIdHolder;
 import sh.adelessfox.odradek.ui.editors.EditorInput;
 import sh.adelessfox.odradek.ui.editors.lazy.LazyEditorInput;
 
diff --git a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/editors/ObjectViewer.java b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/editors/ObjectViewer.java
index 39afb7af..e164dad7 100644
--- a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/editors/ObjectViewer.java
+++ b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/editors/ObjectViewer.java
@@ -5,7 +5,7 @@
 import sh.adelessfox.odradek.app.ui.menu.object.ObjectMenu;
 import sh.adelessfox.odradek.game.Game;
 import sh.adelessfox.odradek.game.ObjectHolder;
-import sh.adelessfox.odradek.game.ObjectIdHolder;
+import sh.adelessfox.odradek.game.decima.ObjectWithIdHolder;
 import sh.adelessfox.odradek.rtti.*;
 import sh.adelessfox.odradek.rtti.data.TypedObject;
 import sh.adelessfox.odradek.rtti.data.Value;
@@ -68,11 +68,11 @@ private StructuredTree<?> createObjectTree(Game game, TypedObject object) {
                 return;
             }
             switch (structure.value()) {
-                case ObjectHolder<?> holder when holder.object() instanceof TypedObject typedObject -> {
+                case ObjectWithIdHolder<?> holder when holder.object() instanceof TypedObject typedObject -> {
                     var input = new ObjectEditorInput(game, typedObject, holder.objectId());
                     Application.getInstance().editors().openEditor(input);
                 }
-                case ObjectIdHolder holder -> {
+                case sh.adelessfox.odradek.game.decima.ObjectIdHolder holder -> {
                     var input = new ObjectEditorInputLazy(holder.objectId());
                     Application.getInstance().editors().openEditor(input);
                 }
diff --git a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/menu/graph/CopyIdToClipboardAction.java b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/menu/graph/CopyIdToClipboardAction.java
index c6b56920..f52eb153 100644
--- a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/menu/graph/CopyIdToClipboardAction.java
+++ b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/menu/graph/CopyIdToClipboardAction.java
@@ -2,8 +2,8 @@
 
 import sh.adelessfox.odradek.app.ui.component.bookmarks.menu.BookmarkMenu;
 import sh.adelessfox.odradek.app.ui.menu.MenuIds;
-import sh.adelessfox.odradek.game.ObjectId;
-import sh.adelessfox.odradek.game.ObjectIdHolder;
+import sh.adelessfox.odradek.game.decima.ObjectId;
+import sh.adelessfox.odradek.game.decima.ObjectIdHolder;
 import sh.adelessfox.odradek.ui.actions.Action;
 import sh.adelessfox.odradek.ui.actions.ActionContext;
 import sh.adelessfox.odradek.ui.actions.ActionContribution;
diff --git a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/menu/graph/ExportObjectAction.java b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/menu/graph/ExportObjectAction.java
index 5e0140ad..06ecf7e1 100644
--- a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/menu/graph/ExportObjectAction.java
+++ b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/menu/graph/ExportObjectAction.java
@@ -9,7 +9,7 @@
 import sh.adelessfox.odradek.game.Exporter;
 import sh.adelessfox.odradek.game.Exporter.OfMultipleOutputs.DefaultOutputProvider;
 import sh.adelessfox.odradek.game.Game;
-import sh.adelessfox.odradek.game.ObjectSupplier;
+import sh.adelessfox.odradek.game.decima.DecimaGame;
 import sh.adelessfox.odradek.ui.actions.*;
 import sh.adelessfox.odradek.ui.actions.Action;
 import sh.adelessfox.odradek.ui.data.DataKeys;
@@ -45,7 +45,7 @@ public class ExportObjectAction extends Action {
     public static class Placeholder extends Action implements ActionProvider {
         @Override
         public List<Action> create(ActionContext context) {
-            var game = context.get(DataKeys.GAME).orElseThrow();
+            var game = context.get(DataKeys.GAME, DecimaGame.class).orElseThrow();
             return exporters(context)
                 .gather(Gatherers.groupingBy(x -> x.exporter().namespace().orElse("")))
                 .sorted(Map.Entry.comparingByKey())
@@ -70,7 +70,7 @@ public boolean isVisible(ActionContext context) {
     private static Stream<? extends Batch<?>> exporters(ActionContext context) {
         var selection = context.get(DataKeys.SELECTION_LIST).stream()
             .flatMap(Collection::stream)
-            .gather(Gatherers.instanceOf(ObjectSupplier.class))
+            .gather(Gatherers.instanceOf(sh.adelessfox.odradek.game.decima.ObjectSupplier.class))
             .toList();
 
         if (selection.isEmpty()) {
@@ -78,7 +78,7 @@ private static Stream<? extends Batch<?>> exporters(ActionContext context) {
         }
 
         var types = selection.stream()
-            .map(ObjectSupplier::objectType)
+            .map(sh.adelessfox.odradek.game.decima.ObjectSupplier::objectType)
             .distinct()
             .toList();
 
@@ -95,7 +95,7 @@ private static Stream<? extends Batch<?>> exporters(ActionContext context) {
             .sorted(Comparator.comparing(pipeline -> pipeline.exporter().name()));
     }
 
-    private static Action action(Batch<?> batch, Game game) {
+    private static Action action(Batch<?> batch, DecimaGame game) {
         return Action.builder()
             .perform(_ -> exportBatch(batch, game))
             .text(_ -> Optional.of(batch.exporter().name()))
@@ -103,7 +103,7 @@ private static Action action(Batch<?> batch, Game game) {
             .build();
     }
 
-    private static <T> void exportBatch(Batch<T> batch, Game game) {
+    private static <T> void exportBatch(Batch<T> batch, DecimaGame game) {
         var singleFile = batch.objects().size() == 1 && batch.exporter() instanceof Exporter.OfSingleOutput<?>;
         var exporter = batch.exporter();
         var chooser = new JFileChooser();
@@ -136,7 +136,7 @@ private static <T> void exportBatch(Batch<T> batch, Game game) {
 
         lastPath = singleFile ? output.getParent() : output;
 
-        for (ObjectSupplier selection : batch.objects()) {
+        for (sh.adelessfox.odradek.game.decima.ObjectSupplier selection : batch.objects()) {
             try {
                 var object = selection.readObject(game);
                 var type = object.getType();
@@ -193,18 +193,18 @@ private static <T> void exportBatch(Batch<T> batch, Game game) {
         }
     }
 
-    private static String makeObjectName(ObjectSupplier object) {
+    private static String makeObjectName(sh.adelessfox.odradek.game.decima.ObjectSupplier object) {
         return "%s_%s_%s".formatted(
             object.objectType(),
             object.objectId().groupId(),
             object.objectId().objectIndex());
     }
 
-    private static String makeObjectName(ObjectSupplier object, Exporter.OfSingleOutput<?> exporter) {
+    private static String makeObjectName(sh.adelessfox.odradek.game.decima.ObjectSupplier object, Exporter.OfSingleOutput<?> exporter) {
         return makeObjectName(object) + '.' + exporter.extension();
     }
 
-    private record Batch<R>(List<ObjectSupplier> objects, Converter<Object, R, Game> converter, Exporter<R> exporter) {
+    private record Batch<R>(List<sh.adelessfox.odradek.game.decima.ObjectSupplier> objects, Converter<Object, R, Game> converter, Exporter<R> exporter) {
     }
 
     private static final class GroupAction extends Action implements ActionProvider {
diff --git a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/menu/main/file/OpenGraphAction.java b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/menu/main/file/OpenGraphAction.java
index 40078ce7..bf78669a 100644
--- a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/menu/main/file/OpenGraphAction.java
+++ b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/menu/main/file/OpenGraphAction.java
@@ -3,7 +3,7 @@
 import sh.adelessfox.odradek.app.ui.Application;
 import sh.adelessfox.odradek.app.ui.editors.ObjectEditorInput;
 import sh.adelessfox.odradek.app.ui.menu.main.MainMenu;
-import sh.adelessfox.odradek.game.ObjectId;
+import sh.adelessfox.odradek.game.decima.ObjectId;
 import sh.adelessfox.odradek.ui.actions.Action;
 import sh.adelessfox.odradek.ui.actions.ActionContext;
 import sh.adelessfox.odradek.ui.actions.ActionContribution;
@@ -18,7 +18,7 @@ public void perform(ActionContext context) {
         var game = application.game();
         application.editors().openEditor(new ObjectEditorInput(
             game,
-            game.getStreamingGraph().resource(),
+            game.streamingGraph().resource(),
             new ObjectId(0, 0)));
     }
 }
diff --git a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/menu/main/file/OpenObjectAction.java b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/menu/main/file/OpenObjectAction.java
index 332dac1d..b51ed14d 100644
--- a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/menu/main/file/OpenObjectAction.java
+++ b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/menu/main/file/OpenObjectAction.java
@@ -3,7 +3,7 @@
 import sh.adelessfox.odradek.app.ui.Application;
 import sh.adelessfox.odradek.app.ui.editors.ObjectEditorInputLazy;
 import sh.adelessfox.odradek.app.ui.menu.main.MainMenu;
-import sh.adelessfox.odradek.game.ObjectId;
+import sh.adelessfox.odradek.game.decima.ObjectId;
 import sh.adelessfox.odradek.ui.actions.Action;
 import sh.adelessfox.odradek.ui.actions.ActionContext;
 import sh.adelessfox.odradek.ui.actions.ActionContribution;
diff --git a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/settings/Settings.java b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/settings/Settings.java
index db30d675..780904be 100644
--- a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/settings/Settings.java
+++ b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/settings/Settings.java
@@ -3,7 +3,7 @@
 import com.google.gson.annotations.JsonAdapter;
 import sh.adelessfox.odradek.app.ui.bookmarks.Bookmark;
 import sh.adelessfox.odradek.app.ui.settings.gson.EditorStateAdapter;
-import sh.adelessfox.odradek.game.ObjectId;
+import sh.adelessfox.odradek.game.decima.ObjectId;
 import sh.adelessfox.odradek.ui.editors.stack.EditorStackContainer.Orientation;
 
 import java.util.List;
diff --git a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/settings/SettingsManager.java b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/settings/SettingsManager.java
index 6f2a101f..c7898001 100644
--- a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/settings/SettingsManager.java
+++ b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/settings/SettingsManager.java
@@ -8,7 +8,7 @@
 import sh.adelessfox.odradek.app.ui.settings.gson.PathTypeAdapter;
 import sh.adelessfox.odradek.app.ui.settings.gson.SettingAdapterFactory;
 import sh.adelessfox.odradek.event.EventBus;
-import sh.adelessfox.odradek.game.ObjectId;
+import sh.adelessfox.odradek.game.decima.ObjectId;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
diff --git a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/settings/gson/EditorStateAdapter.java b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/settings/gson/EditorStateAdapter.java
index cad384b8..830abcce 100644
--- a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/settings/gson/EditorStateAdapter.java
+++ b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/settings/gson/EditorStateAdapter.java
@@ -3,7 +3,7 @@
 import com.google.gson.*;
 import com.google.gson.reflect.TypeToken;
 import sh.adelessfox.odradek.app.ui.settings.Settings;
-import sh.adelessfox.odradek.game.ObjectId;
+import sh.adelessfox.odradek.game.decima.ObjectId;
 import sh.adelessfox.odradek.ui.editors.stack.EditorStackContainer;
 
 import java.lang.reflect.Type;
diff --git a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/settings/gson/ObjectIdTypeAdapter.java b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/settings/gson/ObjectIdTypeAdapter.java
index 26e182de..8877779d 100644
--- a/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/settings/gson/ObjectIdTypeAdapter.java
+++ b/odradek-app/src/main/java/sh/adelessfox/odradek/app/ui/settings/gson/ObjectIdTypeAdapter.java
@@ -3,7 +3,7 @@
 import com.google.gson.TypeAdapter;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
-import sh.adelessfox.odradek.game.ObjectId;
+import sh.adelessfox.odradek.game.decima.ObjectId;
 
 import java.io.IOException;
 
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/storage/LruWeakCache.java b/odradek-core/src/main/java/sh/adelessfox/odradek/util/LruWeakCache.java
similarity index 94%
rename from odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/storage/LruWeakCache.java
rename to odradek-core/src/main/java/sh/adelessfox/odradek/util/LruWeakCache.java
index 6d97e754..2df1b6e6 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/storage/LruWeakCache.java
+++ b/odradek-core/src/main/java/sh/adelessfox/odradek/util/LruWeakCache.java
@@ -1,11 +1,11 @@
-package sh.adelessfox.odradek.game.hfw.storage;
+package sh.adelessfox.odradek.util;
 
 import java.lang.ref.ReferenceQueue;
 import java.lang.ref.WeakReference;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-final class LruWeakCache<K, V> {
+public final class LruWeakCache<K, V> {
     private final ReferenceQueue<V> queue = new ReferenceQueue<>();
     private final LinkedHashMap<K, WeakValue<K, V>> map;
 
diff --git a/odradek-game-decima/pom.xml b/odradek-game-decima/pom.xml
new file mode 100644
index 00000000..e4e9932f
--- /dev/null
+++ b/odradek-game-decima/pom.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>sh.adelessfox</groupId>
+        <artifactId>odradek</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>odradek-game-decima</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>sh.adelessfox</groupId>
+            <artifactId>odradek-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>sh.adelessfox</groupId>
+            <artifactId>odradek-game</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>sh.adelessfox</groupId>
+            <artifactId>odradek-rtti</artifactId>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/odradek-game-decima/src/main/java/module-info.java b/odradek-game-decima/src/main/java/module-info.java
new file mode 100644
index 00000000..4e11e877
--- /dev/null
+++ b/odradek-game-decima/src/main/java/module-info.java
@@ -0,0 +1,7 @@
+module odradek.game.decima {
+    requires odradek.core;
+    requires odradek.rtti;
+    requires transitive odradek.game;
+
+    exports sh.adelessfox.odradek.game.decima;
+}
diff --git a/odradek-game-decima/src/main/java/sh/adelessfox/odradek/game/decima/DecimaGame.java b/odradek-game-decima/src/main/java/sh/adelessfox/odradek/game/decima/DecimaGame.java
new file mode 100644
index 00000000..bc3be00e
--- /dev/null
+++ b/odradek-game-decima/src/main/java/sh/adelessfox/odradek/game/decima/DecimaGame.java
@@ -0,0 +1,63 @@
+package sh.adelessfox.odradek.game.decima;
+
+import sh.adelessfox.odradek.game.Game;
+import sh.adelessfox.odradek.rtti.data.TypedObject;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.List;
+
+public interface DecimaGame extends Game {
+    /**
+     * Reads a group from the streaming graph by its group ID.
+     *
+     * @param groupId id of the group
+     * @return a list of objects in the group
+     * @throws IOException if an I/O error occurs during reading
+     */
+    default List<TypedObject> readGroup(int groupId) throws IOException {
+        return readGroup(groupId, true);
+    }
+
+    /**
+     * Reads a group from the streaming graph by its group ID.
+     *
+     * @param groupId       id of the group
+     * @param readSubgroups whether to read subgroups of the group
+     * @return a list of objects in the group
+     * @throws IOException if an I/O error occurs during reading
+     */
+    List<TypedObject> readGroup(int groupId, boolean readSubgroups) throws IOException;
+
+    /**
+     * Reads an object from the streaming graph by its group ID and object index.
+     *
+     * @param groupId     id of the group that contains the object
+     * @param objectIndex index of the object within the group
+     * @return the typed object
+     * @throws IOException if an I/O error occurs during reading
+     */
+    default TypedObject readObject(int groupId, int objectIndex) throws IOException {
+        return readGroup(groupId).get(objectIndex);
+    }
+
+    byte[] readFile(String file, long offset, long length) throws IOException;
+
+    /**
+     * Resolve game-specific path to actual filesystem path.
+     * The path should be in a form of {@code <device>:<path>}.
+     * <p>
+     * Supported devices:
+     * <ul>
+     *     <li>{@code source} - points to the game root directory</li>
+     *     <li>{@code cache} - alias for {@code source:LocalCache<platform>}</li>
+     *     <li>{@code tools} - alias for {@code source:tools}</li>
+     * </ul>
+     *
+     * @param path device-specific path
+     * @return resolved filesystem path
+     */
+    Path resolvePath(String path);
+
+    StreamingGraph streamingGraph();
+}
diff --git a/odradek-game/src/main/java/sh/adelessfox/odradek/game/ObjectId.java b/odradek-game-decima/src/main/java/sh/adelessfox/odradek/game/decima/ObjectId.java
similarity index 92%
rename from odradek-game/src/main/java/sh/adelessfox/odradek/game/ObjectId.java
rename to odradek-game-decima/src/main/java/sh/adelessfox/odradek/game/decima/ObjectId.java
index 0e793bc9..b778ae4f 100644
--- a/odradek-game/src/main/java/sh/adelessfox/odradek/game/ObjectId.java
+++ b/odradek-game-decima/src/main/java/sh/adelessfox/odradek/game/decima/ObjectId.java
@@ -1,4 +1,4 @@
-package sh.adelessfox.odradek.game;
+package sh.adelessfox.odradek.game.decima;
 
 public record ObjectId(int groupId, int objectIndex) {
     public static ObjectId valueOf(String value) {
diff --git a/odradek-game/src/main/java/sh/adelessfox/odradek/game/ObjectIdHolder.java b/odradek-game-decima/src/main/java/sh/adelessfox/odradek/game/decima/ObjectIdHolder.java
similarity index 59%
rename from odradek-game/src/main/java/sh/adelessfox/odradek/game/ObjectIdHolder.java
rename to odradek-game-decima/src/main/java/sh/adelessfox/odradek/game/decima/ObjectIdHolder.java
index 92cb2b0c..b06ed8b6 100644
--- a/odradek-game/src/main/java/sh/adelessfox/odradek/game/ObjectIdHolder.java
+++ b/odradek-game-decima/src/main/java/sh/adelessfox/odradek/game/decima/ObjectIdHolder.java
@@ -1,4 +1,4 @@
-package sh.adelessfox.odradek.game;
+package sh.adelessfox.odradek.game.decima;
 
 public interface ObjectIdHolder {
     ObjectId objectId();
diff --git a/odradek-game/src/main/java/sh/adelessfox/odradek/game/ObjectSupplier.java b/odradek-game-decima/src/main/java/sh/adelessfox/odradek/game/decima/ObjectSupplier.java
similarity index 67%
rename from odradek-game/src/main/java/sh/adelessfox/odradek/game/ObjectSupplier.java
rename to odradek-game-decima/src/main/java/sh/adelessfox/odradek/game/decima/ObjectSupplier.java
index e6577650..65bdb690 100644
--- a/odradek-game/src/main/java/sh/adelessfox/odradek/game/ObjectSupplier.java
+++ b/odradek-game-decima/src/main/java/sh/adelessfox/odradek/game/decima/ObjectSupplier.java
@@ -1,4 +1,4 @@
-package sh.adelessfox.odradek.game;
+package sh.adelessfox.odradek.game.decima;
 
 import sh.adelessfox.odradek.rtti.ClassTypeInfo;
 import sh.adelessfox.odradek.rtti.data.TypedObject;
@@ -6,7 +6,7 @@
 import java.io.IOException;
 
 public interface ObjectSupplier extends ObjectIdHolder {
-    TypedObject readObject(Game game) throws IOException;
+    TypedObject readObject(DecimaGame game) throws IOException;
 
     ClassTypeInfo objectType();
 }
diff --git a/odradek-game-decima/src/main/java/sh/adelessfox/odradek/game/decima/ObjectWithIdHolder.java b/odradek-game-decima/src/main/java/sh/adelessfox/odradek/game/decima/ObjectWithIdHolder.java
new file mode 100644
index 00000000..50ef463e
--- /dev/null
+++ b/odradek-game-decima/src/main/java/sh/adelessfox/odradek/game/decima/ObjectWithIdHolder.java
@@ -0,0 +1,10 @@
+package sh.adelessfox.odradek.game.decima;
+
+import sh.adelessfox.odradek.game.ObjectHolder;
+
+public interface ObjectWithIdHolder<T> extends ObjectIdHolder, ObjectHolder<T> {
+    @Override
+    default T get() {
+        return object();
+    }
+}
diff --git a/odradek-game-decima/src/main/java/sh/adelessfox/odradek/game/decima/StreamingGraph.java b/odradek-game-decima/src/main/java/sh/adelessfox/odradek/game/decima/StreamingGraph.java
new file mode 100644
index 00000000..df8b03b9
--- /dev/null
+++ b/odradek-game-decima/src/main/java/sh/adelessfox/odradek/game/decima/StreamingGraph.java
@@ -0,0 +1,58 @@
+package sh.adelessfox.odradek.game.decima;
+
+import sh.adelessfox.odradek.hashing.HashCode;
+import sh.adelessfox.odradek.rtti.ClassTypeInfo;
+import sh.adelessfox.odradek.rtti.data.TypedObject;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.OptionalInt;
+
+public interface StreamingGraph {
+    record Span(int fileIndex, int offset, int length) {
+    }
+
+    record Locator(int fileIndex, long offset) {
+    }
+
+    record Link(OptionalInt group, int index) {
+    }
+
+    interface Group {
+        /** Unique identifier of the group. */
+        int id();
+
+        int typeStart();
+
+        List<? extends Group> subGroups();
+
+        List<? extends Group> superGroups();
+
+        /** Indices of the root objects in this group. */
+        List<Integer> roots();
+
+        List<ClassTypeInfo> types();
+
+        List<Span> spans();
+
+        List<Locator> locators();
+
+        Iterator<StreamingGraph.Link> links();
+    }
+
+    List<ClassTypeInfo> types();
+
+    List<? extends Group> groups();
+
+    List<String> files();
+
+    /** Retrieves the group with the specified ID. */
+    Group group(int id);
+
+    Iterator<StreamingGraph.Link> links(int position);
+
+    HashCode checksum();
+
+    /** Returns the game-specific resource object that represents this streaming graph. */
+    TypedObject resource();
+}
diff --git a/odradek-game-hfw-ui/pom.xml b/odradek-game-hfw-ui/pom.xml
index 860def62..31ef3be0 100644
--- a/odradek-game-hfw-ui/pom.xml
+++ b/odradek-game-hfw-ui/pom.xml
@@ -14,7 +14,7 @@
     <dependencies>
         <dependency>
             <groupId>sh.adelessfox</groupId>
-            <artifactId>odradek-game</artifactId>
+            <artifactId>odradek-game-decima</artifactId>
         </dependency>
         <dependency>
             <groupId>sh.adelessfox</groupId>
diff --git a/odradek-game-hfw-ui/src/main/java/module-info.java b/odradek-game-hfw-ui/src/main/java/module-info.java
index ac41a549..c291da02 100644
--- a/odradek-game-hfw-ui/src/main/java/module-info.java
+++ b/odradek-game-hfw-ui/src/main/java/module-info.java
@@ -1,9 +1,9 @@
 module odradek.game.hfw.ui {
-    requires odradek.game.hfw;
-    requires odradek.ui;
     requires odradek.core;
-    requires odradek.game;
+    requires odradek.game.decima;
+    requires odradek.game.hfw;
     requires odradek.rtti;
+    requires odradek.ui;
 
     provides sh.adelessfox.odradek.ui.Renderer with
         sh.adelessfox.odradek.game.hfw.ui.renderers.EnumFactEntryRenderer,
diff --git a/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/EnumFactEntryRenderer.java b/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/EnumFactEntryRenderer.java
index 13ae76a9..548c5631 100644
--- a/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/EnumFactEntryRenderer.java
+++ b/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/EnumFactEntryRenderer.java
@@ -1,15 +1,15 @@
 package sh.adelessfox.odradek.game.hfw.ui.renderers;
 
-import sh.adelessfox.odradek.game.hfw.game.ForbiddenWestGame;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.EnumFactEntry;
+import sh.adelessfox.odradek.game.hfw.game.HFWGame;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.rtti.TypeInfo;
 import sh.adelessfox.odradek.ui.Renderer;
 
 import java.util.Optional;
 
-public class EnumFactEntryRenderer implements Renderer.OfObject<EnumFactEntry, ForbiddenWestGame> {
+public class EnumFactEntryRenderer implements Renderer.OfObject<HFW.EnumFactEntry, HFWGame> {
     @Override
-    public Optional<String> text(TypeInfo info, EnumFactEntry object, ForbiddenWestGame game) {
+    public Optional<String> text(TypeInfo info, HFW.EnumFactEntry object, HFWGame game) {
         return Optional.of(object.general().name());
     }
 }
diff --git a/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/GGUUIDRenderer.java b/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/GGUUIDRenderer.java
index a9110c2f..5f524e26 100644
--- a/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/GGUUIDRenderer.java
+++ b/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/GGUUIDRenderer.java
@@ -1,15 +1,15 @@
 package sh.adelessfox.odradek.game.hfw.ui.renderers;
 
-import sh.adelessfox.odradek.game.hfw.game.ForbiddenWestGame;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.GGUUID;
+import sh.adelessfox.odradek.game.hfw.game.HFWGame;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.rtti.TypeInfo;
 import sh.adelessfox.odradek.ui.Renderer;
 
 import java.util.Optional;
 
-public class GGUUIDRenderer implements Renderer.OfObject<GGUUID, ForbiddenWestGame> {
+public class GGUUIDRenderer implements Renderer.OfObject<HFW.GGUUID, HFWGame> {
     @Override
-    public Optional<String> text(TypeInfo info, GGUUID object, ForbiddenWestGame game) {
+    public Optional<String> text(TypeInfo info, HFW.GGUUID object, HFWGame game) {
         return Optional.of(object.toDisplayString());
     }
 }
diff --git a/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/GeometryRenderer.java b/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/GeometryRenderer.java
index 3c93339c..d4057024 100644
--- a/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/GeometryRenderer.java
+++ b/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/GeometryRenderer.java
@@ -1,7 +1,7 @@
 package sh.adelessfox.odradek.game.hfw.ui.renderers;
 
-import sh.adelessfox.odradek.game.hfw.game.ForbiddenWestGame;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.*;
+import sh.adelessfox.odradek.game.hfw.game.HFWGame;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.rtti.TypeInfo;
 import sh.adelessfox.odradek.rtti.data.TypedObject;
 import sh.adelessfox.odradek.ui.Renderer;
@@ -11,34 +11,34 @@
 import java.util.Optional;
 import java.util.Set;
 
-public final class GeometryRenderer implements Renderer.OfObject<TypedObject, ForbiddenWestGame> {
+public final class GeometryRenderer implements Renderer.OfObject<TypedObject, HFWGame> {
     private static final Set<Class<?>> TYPES = Set.of(
-        IVec2.class, Vec2.class, Vec2Pack.class,
-        IVec3.class, Vec3.class, Vec3Pack.class,
-        IVec4.class, Vec4.class, Vec4Pack.class,
-        ISize.class, FSize.class,
-        IRect.class, FRect.class,
-        IRange.class, FRange.class
+        HFW.IVec2.class, HFW.Vec2.class, HFW.Vec2Pack.class,
+        HFW.IVec3.class, HFW.Vec3.class, HFW.Vec3Pack.class,
+        HFW.IVec4.class, HFW.Vec4.class, HFW.Vec4Pack.class,
+        HFW.ISize.class, HFW.FSize.class,
+        HFW.IRect.class, HFW.FRect.class,
+        HFW.IRange.class, HFW.FRange.class
     );
 
     @Override
-    public Optional<StyledText> styledText(TypeInfo info, TypedObject object, ForbiddenWestGame game) {
+    public Optional<StyledText> styledText(TypeInfo info, TypedObject object, HFWGame game) {
         return switch (object) {
-            case IVec2 vec -> vec(vec.x(), vec.y());
-            case IVec3 vec -> vec(vec.x(), vec.y(), vec.z());
-            case IVec4 vec -> vec(vec.x(), vec.y(), vec.z(), vec.w());
-            case Vec2 vec -> vec(vec.x(), vec.y());
-            case Vec3 vec -> vec(vec.x(), vec.y(), vec.z());
-            case Vec4 vec -> vec(vec.x(), vec.y(), vec.z(), vec.w());
-            case Vec2Pack vec -> vec(vec.x(), vec.y());
-            case Vec3Pack vec -> vec(vec.x(), vec.y(), vec.z());
-            case Vec4Pack vec -> vec(vec.x(), vec.y(), vec.z(), vec.w());
-            case ISize size -> size(size.width(), size.height());
-            case FSize size -> size(size.width(), size.height());
-            case IRect rect -> rect(rect.left(), rect.top(), rect.right(), rect.bottom());
-            case FRect rect -> rect(rect.left(), rect.top(), rect.right(), rect.bottom());
-            case IRange range -> range(range.min(), range.max());
-            case FRange range -> range(range.min(), range.max());
+            case HFW.IVec2 vec -> vec(vec.x(), vec.y());
+            case HFW.IVec3 vec -> vec(vec.x(), vec.y(), vec.z());
+            case HFW.IVec4 vec -> vec(vec.x(), vec.y(), vec.z(), vec.w());
+            case HFW.Vec2 vec -> vec(vec.x(), vec.y());
+            case HFW.Vec3 vec -> vec(vec.x(), vec.y(), vec.z());
+            case HFW.Vec4 vec -> vec(vec.x(), vec.y(), vec.z(), vec.w());
+            case HFW.Vec2Pack vec -> vec(vec.x(), vec.y());
+            case HFW.Vec3Pack vec -> vec(vec.x(), vec.y(), vec.z());
+            case HFW.Vec4Pack vec -> vec(vec.x(), vec.y(), vec.z(), vec.w());
+            case HFW.ISize size -> size(size.width(), size.height());
+            case HFW.FSize size -> size(size.width(), size.height());
+            case HFW.IRect rect -> rect(rect.left(), rect.top(), rect.right(), rect.bottom());
+            case HFW.FRect rect -> rect(rect.left(), rect.top(), rect.right(), rect.bottom());
+            case HFW.IRange range -> range(range.min(), range.max());
+            case HFW.FRange range -> range(range.min(), range.max());
             default -> Optional.empty();
         };
     }
diff --git a/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/JointRenderer.java b/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/JointRenderer.java
index 7fa2c773..31ad6d77 100644
--- a/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/JointRenderer.java
+++ b/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/JointRenderer.java
@@ -1,7 +1,7 @@
 package sh.adelessfox.odradek.game.hfw.ui.renderers;
 
-import sh.adelessfox.odradek.game.hfw.game.ForbiddenWestGame;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.Joint;
+import sh.adelessfox.odradek.game.hfw.game.HFWGame;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.rtti.TypeInfo;
 import sh.adelessfox.odradek.ui.Renderer;
 import sh.adelessfox.odradek.ui.components.StyledFragment;
@@ -9,9 +9,9 @@
 
 import java.util.Optional;
 
-public final class JointRenderer implements Renderer.OfObject<Joint, ForbiddenWestGame> {
+public final class JointRenderer implements Renderer.OfObject<HFW.Joint, HFWGame> {
     @Override
-    public Optional<StyledText> styledText(TypeInfo info, Joint object, ForbiddenWestGame game) {
+    public Optional<StyledText> styledText(TypeInfo info, HFW.Joint object, HFWGame game) {
         var builder = StyledText.builder();
         if (object.parentIndex() != -1) {
             builder
diff --git a/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/LocalizedTextResourceRenderer.java b/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/LocalizedTextResourceRenderer.java
index 8f0ba2a0..76babc19 100644
--- a/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/LocalizedTextResourceRenderer.java
+++ b/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/LocalizedTextResourceRenderer.java
@@ -1,15 +1,15 @@
 package sh.adelessfox.odradek.game.hfw.ui.renderers;
 
-import sh.adelessfox.odradek.game.hfw.game.ForbiddenWestGame;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.LocalizedTextResource;
+import sh.adelessfox.odradek.game.hfw.game.HFWGame;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.rtti.TypeInfo;
 import sh.adelessfox.odradek.ui.Renderer;
 
 import java.util.Optional;
 
-public final class LocalizedTextResourceRenderer implements Renderer.OfObject<LocalizedTextResource, ForbiddenWestGame> {
+public final class LocalizedTextResourceRenderer implements Renderer.OfObject<HFW.LocalizedTextResource, HFWGame> {
     @Override
-    public Optional<String> text(TypeInfo info, LocalizedTextResource object, ForbiddenWestGame game) {
+    public Optional<String> text(TypeInfo info, HFW.LocalizedTextResource object, HFWGame game) {
         return Optional.of(object.text(game.getWrittenLanguage()));
     }
 }
diff --git a/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/MurmurHashValueRenderer.java b/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/MurmurHashValueRenderer.java
index e2fc70c4..4f39a8fe 100644
--- a/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/MurmurHashValueRenderer.java
+++ b/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/MurmurHashValueRenderer.java
@@ -1,15 +1,15 @@
 package sh.adelessfox.odradek.game.hfw.ui.renderers;
 
-import sh.adelessfox.odradek.game.hfw.game.ForbiddenWestGame;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.MurmurHashValue;
+import sh.adelessfox.odradek.game.hfw.game.HFWGame;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.rtti.TypeInfo;
 import sh.adelessfox.odradek.ui.Renderer;
 
 import java.util.Optional;
 
-public class MurmurHashValueRenderer implements Renderer.OfObject<MurmurHashValue, ForbiddenWestGame> {
+public class MurmurHashValueRenderer implements Renderer.OfObject<HFW.MurmurHashValue, HFWGame> {
     @Override
-    public Optional<String> text(TypeInfo info, MurmurHashValue object, ForbiddenWestGame game) {
+    public Optional<String> text(TypeInfo info, HFW.MurmurHashValue object, HFWGame game) {
         return Optional.of(object.toDisplayString());
     }
 }
diff --git a/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/ProgramParameterRenderer.java b/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/ProgramParameterRenderer.java
index 1825c521..3f9c2ebd 100644
--- a/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/ProgramParameterRenderer.java
+++ b/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/ProgramParameterRenderer.java
@@ -1,7 +1,7 @@
 package sh.adelessfox.odradek.game.hfw.ui.renderers;
 
-import sh.adelessfox.odradek.game.hfw.game.ForbiddenWestGame;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.ProgramParameter;
+import sh.adelessfox.odradek.game.hfw.game.HFWGame;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.rtti.TypeInfo;
 import sh.adelessfox.odradek.ui.Renderer;
 import sh.adelessfox.odradek.ui.components.StyledFragment;
@@ -9,9 +9,9 @@
 
 import java.util.Optional;
 
-public final class ProgramParameterRenderer implements Renderer.OfObject<ProgramParameter, ForbiddenWestGame> {
+public final class ProgramParameterRenderer implements Renderer.OfObject<HFW.ProgramParameter, HFWGame> {
     @Override
-    public Optional<StyledText> styledText(TypeInfo info, ProgramParameter object, ForbiddenWestGame game) {
+    public Optional<StyledText> styledText(TypeInfo info, HFW.ProgramParameter object, HFWGame game) {
         return StyledText.builder()
             .add(object.name(), StyledFragment.NAME)
             .add(": " + object.type().staticTypeName(), StyledFragment.GRAYED)
diff --git a/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/ProgramResourceEntryPointRenderer.java b/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/ProgramResourceEntryPointRenderer.java
index 9fe17c14..68c05da9 100644
--- a/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/ProgramResourceEntryPointRenderer.java
+++ b/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/ProgramResourceEntryPointRenderer.java
@@ -1,17 +1,17 @@
 package sh.adelessfox.odradek.game.hfw.ui.renderers;
 
-import sh.adelessfox.odradek.game.hfw.game.ForbiddenWestGame;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.ProgramResourceEntryPoint;
+import sh.adelessfox.odradek.game.hfw.game.HFWGame;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.rtti.TypeInfo;
 import sh.adelessfox.odradek.ui.Renderer;
 
 import java.util.Optional;
 
 public final class ProgramResourceEntryPointRenderer
-    implements Renderer.OfObject<ProgramResourceEntryPoint, ForbiddenWestGame> {
+    implements Renderer.OfObject<HFW.ProgramResourceEntryPoint, HFWGame> {
 
     @Override
-    public Optional<String> text(TypeInfo info, ProgramResourceEntryPoint object, ForbiddenWestGame game) {
+    public Optional<String> text(TypeInfo info, HFW.ProgramResourceEntryPoint object, HFWGame game) {
         return Optional.of(object.entryPoint());
     }
 }
diff --git a/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/RTTIHandleRenderer.java b/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/RTTIHandleRenderer.java
index 86a39482..fb3701d5 100644
--- a/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/RTTIHandleRenderer.java
+++ b/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/RTTIHandleRenderer.java
@@ -1,15 +1,15 @@
 package sh.adelessfox.odradek.game.hfw.ui.renderers;
 
-import sh.adelessfox.odradek.game.hfw.game.ForbiddenWestGame;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.RTTIHandle;
+import sh.adelessfox.odradek.game.hfw.game.HFWGame;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.rtti.TypeInfo;
 import sh.adelessfox.odradek.ui.Renderer;
 
 import java.util.Optional;
 
-public final class RTTIHandleRenderer implements Renderer.OfObject<RTTIHandle, ForbiddenWestGame> {
+public final class RTTIHandleRenderer implements Renderer.OfObject<HFW.RTTIHandle, HFWGame> {
     @Override
-    public Optional<String> text(TypeInfo info, RTTIHandle object, ForbiddenWestGame game) {
+    public Optional<String> text(TypeInfo info, HFW.RTTIHandle object, HFWGame game) {
         return Optional.of(object.staticTypeName());
     }
 }
diff --git a/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/SentenceResourceRenderer.java b/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/SentenceResourceRenderer.java
index 47d5be45..3ce438fc 100644
--- a/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/SentenceResourceRenderer.java
+++ b/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/SentenceResourceRenderer.java
@@ -1,7 +1,7 @@
 package sh.adelessfox.odradek.game.hfw.ui.renderers;
 
-import sh.adelessfox.odradek.game.hfw.game.ForbiddenWestGame;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.SentenceResource;
+import sh.adelessfox.odradek.game.hfw.game.HFWGame;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.rtti.TypeInfo;
 import sh.adelessfox.odradek.ui.Renderer;
 import sh.adelessfox.odradek.ui.components.StyledFragment;
@@ -9,9 +9,9 @@
 
 import java.util.Optional;
 
-public final class SentenceResourceRenderer implements Renderer.OfObject<SentenceResource, ForbiddenWestGame> {
+public final class SentenceResourceRenderer implements Renderer.OfObject<HFW.SentenceResource, HFWGame> {
     @Override
-    public Optional<StyledText> styledText(TypeInfo info, SentenceResource object, ForbiddenWestGame game) {
+    public Optional<StyledText> styledText(TypeInfo info, HFW.SentenceResource object, HFWGame game) {
         var textRef = object.general().text();
         var voiceRef = object.general().voice();
         if (textRef == null || voiceRef == null) {
diff --git a/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/ShaderTextureBindingRenderer.java b/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/ShaderTextureBindingRenderer.java
index 21031e94..74f98921 100644
--- a/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/ShaderTextureBindingRenderer.java
+++ b/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/ShaderTextureBindingRenderer.java
@@ -1,7 +1,7 @@
 package sh.adelessfox.odradek.game.hfw.ui.renderers;
 
-import sh.adelessfox.odradek.game.hfw.game.ForbiddenWestGame;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.ShaderTextureBinding;
+import sh.adelessfox.odradek.game.hfw.game.HFWGame;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.game.hfw.rtti.data.TextureBindingPacking;
 import sh.adelessfox.odradek.rtti.TypeInfo;
 import sh.adelessfox.odradek.ui.Renderer;
@@ -10,9 +10,9 @@
 
 import java.util.Optional;
 
-public class ShaderTextureBindingRenderer implements Renderer.OfObject<ShaderTextureBinding, ForbiddenWestGame> {
+public class ShaderTextureBindingRenderer implements Renderer.OfObject<HFW.ShaderTextureBinding, HFWGame> {
     @Override
-    public Optional<StyledText> styledText(TypeInfo info, ShaderTextureBinding object, ForbiddenWestGame game) {
+    public Optional<StyledText> styledText(TypeInfo info, HFW.ShaderTextureBinding object, HFWGame game) {
         var builder = StyledText.builder();
 
         switch (TextureBindingPacking.of(object.packedData())) {
diff --git a/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/StreamingDataSourceRenderer.java b/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/StreamingDataSourceRenderer.java
index e0fd710e..ba70f5c5 100644
--- a/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/StreamingDataSourceRenderer.java
+++ b/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/StreamingDataSourceRenderer.java
@@ -1,24 +1,22 @@
 package sh.adelessfox.odradek.game.hfw.ui.renderers;
 
-import sh.adelessfox.odradek.game.hfw.game.ForbiddenWestGame;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.EStreamingDataChannel;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.StreamingDataSource;
+import sh.adelessfox.odradek.game.hfw.game.HFWGame;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.rtti.TypeInfo;
 import sh.adelessfox.odradek.ui.Renderer;
 
 import java.util.Optional;
 
-public class StreamingDataSourceRenderer implements Renderer.OfObject<StreamingDataSource, ForbiddenWestGame> {
+public class StreamingDataSourceRenderer implements Renderer.OfObject<HFW.StreamingDataSource, HFWGame> {
     @Override
-    public Optional<String> text(TypeInfo info, StreamingDataSource object, ForbiddenWestGame game) {
+    public Optional<String> text(TypeInfo info, HFW.StreamingDataSource object, HFWGame game) {
         if (!object.isPresent()) {
             return Optional.of("<empty>");
         }
-        var graph = game.getStreamingGraph();
         var text = "%s (%d bytes, %s)".formatted(
-            graph.files().get(object.fileId()),
+            game.streamingGraph().files().get(object.fileId()),
             object.length(),
-            EStreamingDataChannel.valueOf(object.channel())
+            HFW.EStreamingDataChannel.valueOf(object.channel())
         );
         return Optional.of(text);
     }
diff --git a/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/TextureSetTextureDescRenderer.java b/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/TextureSetTextureDescRenderer.java
index e27e4aa6..2bee6d58 100644
--- a/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/TextureSetTextureDescRenderer.java
+++ b/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/TextureSetTextureDescRenderer.java
@@ -1,15 +1,15 @@
 package sh.adelessfox.odradek.game.hfw.ui.renderers;
 
-import sh.adelessfox.odradek.game.hfw.game.ForbiddenWestGame;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.TextureSetTextureDesc;
+import sh.adelessfox.odradek.game.hfw.game.HFWGame;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.rtti.TypeInfo;
 import sh.adelessfox.odradek.ui.Renderer;
 
 import java.util.Optional;
 
-public class TextureSetTextureDescRenderer implements Renderer.OfObject<TextureSetTextureDesc, ForbiddenWestGame> {
+public class TextureSetTextureDescRenderer implements Renderer.OfObject<HFW.TextureSetTextureDesc, HFWGame> {
     @Override
-    public Optional<String> text(TypeInfo info, TextureSetTextureDesc object, ForbiddenWestGame game) {
+    public Optional<String> text(TypeInfo info, HFW.TextureSetTextureDesc object, HFWGame game) {
         if (object.path().isEmpty()) {
             return Optional.empty();
         } else {
diff --git a/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/attr/EnumFact$DefaultValueUUIDRenderer.java b/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/attr/EnumFact$DefaultValueUUIDRenderer.java
index 355244dc..076649f8 100644
--- a/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/attr/EnumFact$DefaultValueUUIDRenderer.java
+++ b/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/attr/EnumFact$DefaultValueUUIDRenderer.java
@@ -1,8 +1,7 @@
 package sh.adelessfox.odradek.game.hfw.ui.renderers.attr;
 
-import sh.adelessfox.odradek.game.hfw.game.ForbiddenWestGame;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.EnumFact;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.EnumFactEntry;
+import sh.adelessfox.odradek.game.hfw.game.HFWGame;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.game.hfw.rtti.data.ref.Ref;
 import sh.adelessfox.odradek.rtti.ClassAttrInfo;
 import sh.adelessfox.odradek.rtti.ClassTypeInfo;
@@ -13,12 +12,12 @@
 
 import java.util.Optional;
 
-public class EnumFact$DefaultValueUUIDRenderer implements Renderer.OfAttribute<EnumFact, ForbiddenWestGame> {
+public class EnumFact$DefaultValueUUIDRenderer implements Renderer.OfAttribute<HFW.EnumFact, HFWGame> {
     @Override
-    public Optional<StyledText> styledText(TypeInfo info, EnumFact object, ForbiddenWestGame game) {
+    public Optional<StyledText> styledText(TypeInfo info, HFW.EnumFact object, HFWGame game) {
         var uuid = object.logic().defaultValueUUID();
         var definition = object.logic().enumDefinition().get();
-        for (EnumFactEntry entry : Ref.unwrap(definition.enumValues())) {
+        for (HFW.EnumFactEntry entry : Ref.unwrap(definition.enumValues())) {
             if (entry.general().objectUUID().equals(uuid)) {
                 return StyledText.builder()
                     .add(entry.general().name())
diff --git a/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/attr/RenderTechniqueSet$AvailableTechniquesMaskRenderer.java b/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/attr/RenderTechniqueSet$AvailableTechniquesMaskRenderer.java
index a8607f91..c6abf6b1 100644
--- a/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/attr/RenderTechniqueSet$AvailableTechniquesMaskRenderer.java
+++ b/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/attr/RenderTechniqueSet$AvailableTechniquesMaskRenderer.java
@@ -1,8 +1,7 @@
 package sh.adelessfox.odradek.game.hfw.ui.renderers.attr;
 
-import sh.adelessfox.odradek.game.hfw.game.ForbiddenWestGame;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.ERenderTechniqueType;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.RenderTechniqueSet;
+import sh.adelessfox.odradek.game.hfw.game.HFWGame;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.rtti.ClassAttrInfo;
 import sh.adelessfox.odradek.rtti.ClassTypeInfo;
 import sh.adelessfox.odradek.rtti.TypeInfo;
@@ -11,14 +10,14 @@
 import java.util.Optional;
 import java.util.StringJoiner;
 
-public class RenderTechniqueSet$AvailableTechniquesMaskRenderer implements Renderer.OfAttribute<RenderTechniqueSet, ForbiddenWestGame> {
+public class RenderTechniqueSet$AvailableTechniquesMaskRenderer implements Renderer.OfAttribute<HFW.RenderTechniqueSet, HFWGame> {
     @Override
-    public Optional<String> text(TypeInfo info, RenderTechniqueSet object, ForbiddenWestGame game) {
+    public Optional<String> text(TypeInfo info, HFW.RenderTechniqueSet object, HFWGame game) {
         var mask = object.general().availableTechniquesMask();
         var buffer = new StringJoiner(", ");
         for (int i = 0; i < 32; i++) {
             if ((mask & (1 << i)) != 0) {
-                buffer.add(ERenderTechniqueType.valueOf(i).name());
+                buffer.add(HFW.ERenderTechniqueType.valueOf(i).name());
             }
         }
         return Optional.of(buffer.toString());
diff --git a/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/attr/RenderTechniqueSet$InitiallyEnabledTechniquesMaskRenderer.java b/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/attr/RenderTechniqueSet$InitiallyEnabledTechniquesMaskRenderer.java
index 44512036..98503096 100644
--- a/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/attr/RenderTechniqueSet$InitiallyEnabledTechniquesMaskRenderer.java
+++ b/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/attr/RenderTechniqueSet$InitiallyEnabledTechniquesMaskRenderer.java
@@ -1,7 +1,7 @@
 package sh.adelessfox.odradek.game.hfw.ui.renderers.attr;
 
-import sh.adelessfox.odradek.game.hfw.game.ForbiddenWestGame;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.RenderTechniqueSet;
+import sh.adelessfox.odradek.game.hfw.game.HFWGame;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.rtti.ClassAttrInfo;
 import sh.adelessfox.odradek.rtti.ClassTypeInfo;
 import sh.adelessfox.odradek.rtti.TypeInfo;
@@ -10,9 +10,9 @@
 import java.util.Optional;
 import java.util.StringJoiner;
 
-public class RenderTechniqueSet$InitiallyEnabledTechniquesMaskRenderer implements Renderer.OfAttribute<RenderTechniqueSet, ForbiddenWestGame> {
+public class RenderTechniqueSet$InitiallyEnabledTechniquesMaskRenderer implements Renderer.OfAttribute<HFW.RenderTechniqueSet, HFWGame> {
     @Override
-    public Optional<String> text(TypeInfo info, RenderTechniqueSet object, ForbiddenWestGame game) {
+    public Optional<String> text(TypeInfo info, HFW.RenderTechniqueSet object, HFWGame game) {
         var mask = object.general().initiallyEnabledTechniquesMask();
         var buffer = new StringJoiner(", ");
         for (int i = 0; i < 64; i++) {
diff --git a/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/attr/TextureSetEntry$PackingInfoRenderer.java b/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/attr/TextureSetEntry$PackingInfoRenderer.java
index 2cf6855f..a2ec4292 100644
--- a/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/attr/TextureSetEntry$PackingInfoRenderer.java
+++ b/odradek-game-hfw-ui/src/main/java/sh/adelessfox/odradek/game/hfw/ui/renderers/attr/TextureSetEntry$PackingInfoRenderer.java
@@ -1,7 +1,7 @@
 package sh.adelessfox.odradek.game.hfw.ui.renderers.attr;
 
-import sh.adelessfox.odradek.game.hfw.game.ForbiddenWestGame;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.TextureSetEntry;
+import sh.adelessfox.odradek.game.hfw.game.HFWGame;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.game.hfw.rtti.data.TextureSetPacking;
 import sh.adelessfox.odradek.game.hfw.rtti.data.TextureSetPackingChannel;
 import sh.adelessfox.odradek.rtti.ClassAttrInfo;
@@ -13,14 +13,14 @@
 
 import java.util.Optional;
 
-public class TextureSetEntry$PackingInfoRenderer implements Renderer.OfAttribute<TextureSetEntry, ForbiddenWestGame> {
+public class TextureSetEntry$PackingInfoRenderer implements Renderer.OfAttribute<HFW.TextureSetEntry, HFWGame> {
     @Override
-    public Optional<String> text(TypeInfo info, TextureSetEntry object, ForbiddenWestGame game) {
+    public Optional<String> text(TypeInfo info, HFW.TextureSetEntry object, HFWGame game) {
         return Optional.of(String.valueOf(object.packingInfo()));
     }
 
     @Override
-    public Optional<StyledText> styledText(TypeInfo info, TextureSetEntry object, ForbiddenWestGame game) {
+    public Optional<StyledText> styledText(TypeInfo info, HFW.TextureSetEntry object, HFWGame game) {
         var packingInfo = TextureSetPacking.of(object.packingInfo());
         var builder = StyledText.builder();
         appendChannel(packingInfo.red(), "R", builder);
diff --git a/odradek-game-hfw/pom.xml b/odradek-game-hfw/pom.xml
index 4eac5fb0..27d37f22 100644
--- a/odradek-game-hfw/pom.xml
+++ b/odradek-game-hfw/pom.xml
@@ -17,7 +17,7 @@
         </dependency>
         <dependency>
             <groupId>sh.adelessfox</groupId>
-            <artifactId>odradek-game</artifactId>
+            <artifactId>odradek-game-decima</artifactId>
         </dependency>
         <dependency>
             <groupId>sh.adelessfox</groupId>
diff --git a/odradek-game-hfw/src/main/java/module-info.java b/odradek-game-hfw/src/main/java/module-info.java
index b76e5999..4f51b91a 100644
--- a/odradek-game-hfw/src/main/java/module-info.java
+++ b/odradek-game-hfw/src/main/java/module-info.java
@@ -1,3 +1,4 @@
+import sh.adelessfox.odradek.game.Game;
 import sh.adelessfox.odradek.game.hfw.rtti.callbacks.*;
 import sh.adelessfox.odradek.game.hfw.rtti.data.ref.*;
 import sh.adelessfox.odradek.game.hfw.rtti.extensions.*;
@@ -13,7 +14,7 @@
         types = "types.json",
         extensions = "extensions.json"
     ),
-    target = "sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest",
+    target = "sh.adelessfox.odradek.game.hfw.rtti.HFW",
     builtins = {
         // atoms
         @Builtin(type = "bool", repr = boolean.class),
@@ -83,10 +84,10 @@
     requires static odradek.rtti.generator;
 
     requires odradek.core;
+    requires odradek.game.decima;
     requires odradek.middleware.edgeanim;
     requires odradek.middleware.jolt;
     requires odradek.middleware.riglogic;
-    requires odradek.game;
     requires odradek.rtti;
     requires org.slf4j;
 
@@ -113,6 +114,6 @@
         sh.adelessfox.odradek.game.hfw.converters.StreamingDataSourceToBytesConverter,
         sh.adelessfox.odradek.game.hfw.converters.TextureSetToTextureSetConverter;
 
-    provides sh.adelessfox.odradek.game.Game.Provider with
-        sh.adelessfox.odradek.game.hfw.game.ForbiddenWestGame.Provider;
+    provides Game.Provider with
+        sh.adelessfox.odradek.game.hfw.game.HFWGame.Provider;
 }
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/GraphWalker.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/GraphWalker.java
index fb71ed6d..2335319e 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/GraphWalker.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/GraphWalker.java
@@ -2,16 +2,15 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import sh.adelessfox.odradek.game.ObjectId;
-import sh.adelessfox.odradek.game.hfw.game.ForbiddenWestGame;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.StreamingGroupData;
-import sh.adelessfox.odradek.game.hfw.storage.StreamingGraphResource;
-import sh.adelessfox.odradek.game.hfw.storage.StreamingObjectReader;
+import sh.adelessfox.odradek.game.decima.DecimaGame;
+import sh.adelessfox.odradek.game.decima.ObjectId;
+import sh.adelessfox.odradek.game.decima.StreamingGraph;
 import sh.adelessfox.odradek.rtti.data.TypedObject;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.util.Comparator;
+import java.util.List;
 import java.util.Spliterator;
 import java.util.function.Consumer;
 import java.util.stream.Stream;
@@ -28,33 +27,32 @@ private GraphWalker() {
 
     public static <T extends TypedObject> Iterable<SearchResult<T>> iterate(
         Class<T> type,
-        ForbiddenWestGame game,
+        DecimaGame game,
         boolean readSubgroups
     ) {
-        return stream(type, game.getStreamingReader(), game.getStreamingGraph(), readSubgroups)::iterator;
+        return stream(type, game, readSubgroups)::iterator;
     }
 
     public static <T extends TypedObject> Stream<SearchResult<T>> stream(
         Class<T> type,
-        StreamingObjectReader reader,
-        StreamingGraphResource graph,
+        DecimaGame game,
         boolean readSubgroups
     ) {
-        return StreamSupport.stream(spliterator(type, reader, graph, readSubgroups), false);
+        return StreamSupport.stream(spliterator(type, game, readSubgroups), false);
     }
 
     private static <T extends TypedObject> Spliterator<SearchResult<T>> spliterator(
         Class<T> ofType,
-        StreamingObjectReader reader,
-        StreamingGraphResource graph,
+        DecimaGame game,
         boolean readSubgroups
     ) {
-        var groups = graph.groups().stream()
-            .sorted(Comparator.comparingInt(StreamingGroupData::groupID))
+        var groups = game.streamingGraph().groups().stream()
+            .sorted(Comparator.comparingInt(StreamingGraph.Group::id))
             .toList();
 
         return new Spliterator<>() {
-            private StreamingObjectReader.GroupResult result;
+            private StreamingGraph.Group currentGroup;
+            private List<TypedObject> currentObjects;
             private int nextGroupIndex;
             private int nextObjectIndex;
 
@@ -86,10 +84,12 @@ public int characteristics() {
             private boolean tryAdvanceGroup() {
                 for (int i = nextGroupIndex; i < groups.size(); i++) {
                     var group = groups.get(i);
-                    if (graph.types(group).anyMatch(t -> ofType.isAssignableFrom(t.type()))) {
-                        log.debug("[{}/{}] Reading group {}", i + 1, groups.size(), group.groupID());
+                    var matches = group.types().stream().anyMatch(t -> ofType.isAssignableFrom(t.type()));
+                    if (matches) {
+                        log.debug("[{}/{}] Reading group {}", i + 1, groups.size(), group.id());
                         try {
-                            result = reader.readGroup(group.groupID(), readSubgroups);
+                            currentGroup = group;
+                            currentObjects = game.readGroup(group.id(), readSubgroups);
                             nextGroupIndex = i + 1;
                             nextObjectIndex = 0;
                             return true;
@@ -102,15 +102,15 @@ private boolean tryAdvanceGroup() {
             }
 
             private boolean tryAdvanceObject(Consumer<? super SearchResult<T>> action) {
-                if (result != null) {
-                    var objects = result.objects();
-                    for (int i = nextObjectIndex; i < objects.size(); i++) {
-                        var object = objects.get(i).object();
-                        if (ofType.isInstance(object)) {
-                            action.accept(new SearchResult<>(new ObjectId(result.group().groupID(), i), ofType.cast(object)));
-                            nextObjectIndex = i + 1;
-                            return true;
-                        }
+                if (currentGroup == null) {
+                    return false;
+                }
+                for (int i = nextObjectIndex; i < currentObjects.size(); i++) {
+                    var object = currentObjects.get(i);
+                    if (ofType.isInstance(object)) {
+                        action.accept(new SearchResult<>(new ObjectId(currentGroup.id(), i), ofType.cast(object)));
+                        nextObjectIndex = i + 1;
+                        return true;
                     }
                 }
                 return false;
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/ShaderResourceToShaderConverter.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/ShaderResourceToShaderConverter.java
index c2dbd969..efb80af5 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/ShaderResourceToShaderConverter.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/ShaderResourceToShaderConverter.java
@@ -1,9 +1,8 @@
 package sh.adelessfox.odradek.game.hfw.converters;
 
 import sh.adelessfox.odradek.game.Converter;
-import sh.adelessfox.odradek.game.hfw.game.ForbiddenWestGame;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.EProgramType;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.ShaderResource;
+import sh.adelessfox.odradek.game.hfw.game.HFWGame;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.game.hfw.rtti.data.HwShader;
 import sh.adelessfox.odradek.game.hfw.rtti.data.HwShaderProgram;
 import sh.adelessfox.odradek.graphics.Program;
@@ -16,9 +15,9 @@
 import java.io.UncheckedIOException;
 import java.util.Optional;
 
-public class ShaderResourceToShaderConverter implements Converter<ShaderResource, Shader, ForbiddenWestGame> {
+public class ShaderResourceToShaderConverter implements Converter<HFW.ShaderResource, Shader, HFWGame> {
     @Override
-    public Optional<Shader> convert(ShaderResource object, ForbiddenWestGame game) {
+    public Optional<Shader> convert(HFW.ShaderResource object, HFWGame game) {
         HwShader shader;
 
         try {
@@ -42,7 +41,7 @@ private static Program mapProgram(HwShaderProgram program) {
         );
     }
 
-    private static ProgramType mapProgramType(EProgramType type) {
+    private static ProgramType mapProgramType(HFW.EProgramType type) {
         return switch (type) {
             case VertexProgram -> ProgramType.VERTEX_PROGRAM;
             case GeometryProgram -> ProgramType.GEOMETRY_PROGRAM;
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/StreamingDataSourceToBytesConverter.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/StreamingDataSourceToBytesConverter.java
index 608445fb..e50f4b00 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/StreamingDataSourceToBytesConverter.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/StreamingDataSourceToBytesConverter.java
@@ -1,18 +1,18 @@
 package sh.adelessfox.odradek.game.hfw.converters;
 
 import sh.adelessfox.odradek.game.Converter;
-import sh.adelessfox.odradek.game.hfw.game.ForbiddenWestGame;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.StreamingDataSource;
+import sh.adelessfox.odradek.game.hfw.game.HFWGame;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.util.Optional;
 
-public class StreamingDataSourceToBytesConverter implements Converter<StreamingDataSource, byte[], ForbiddenWestGame> {
+public class StreamingDataSourceToBytesConverter implements Converter<HFW.StreamingDataSource, byte[], HFWGame> {
     @Override
-    public Optional<byte[]> convert(StreamingDataSource object, ForbiddenWestGame game) {
+    public Optional<byte[]> convert(HFW.StreamingDataSource object, HFWGame game) {
         try {
-            return Optional.of(game.getStreamingSystem().getDataSourceData(object));
+            return Optional.of(game.getDataSourceData(object));
         } catch (IOException e) {
             throw new UncheckedIOException(e);
         }
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/TextureSetToTextureSetConverter.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/TextureSetToTextureSetConverter.java
index e573745d..34ef3efe 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/TextureSetToTextureSetConverter.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/TextureSetToTextureSetConverter.java
@@ -1,12 +1,8 @@
 package sh.adelessfox.odradek.game.hfw.converters;
 
 import sh.adelessfox.odradek.game.Converter;
-import sh.adelessfox.odradek.game.hfw.game.ForbiddenWestGame;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.ETextureSetChannel;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.ETextureSetType;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.TextureSetEntry;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.TextureSetTextureDesc;
+import sh.adelessfox.odradek.game.hfw.game.HFWGame;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.game.hfw.rtti.data.TextureSetPacking;
 import sh.adelessfox.odradek.game.hfw.rtti.data.TextureSetPackingChannel;
 import sh.adelessfox.odradek.texture.Channel;
@@ -17,10 +13,10 @@
 import java.util.Optional;
 
 public class TextureSetToTextureSetConverter
-    implements Converter<HorizonForbiddenWest.TextureSet, TextureSet, ForbiddenWestGame> {
+    implements Converter<HFW.TextureSet, TextureSet, HFWGame> {
 
     @Override
-    public Optional<TextureSet> convert(HorizonForbiddenWest.TextureSet object, ForbiddenWestGame game) {
+    public Optional<TextureSet> convert(HFW.TextureSet object, HFWGame game) {
         var sourceTextures = object.textureDesc().stream()
             .map(TextureSetToTextureSetConverter::mapSourceTexture)
             .flatMap(Optional::stream)
@@ -37,14 +33,14 @@ public Optional<TextureSet> convert(HorizonForbiddenWest.TextureSet object, Forb
         ));
     }
 
-    private static Optional<TextureSet.SourceTexture> mapSourceTexture(TextureSetTextureDesc desc) {
+    private static Optional<TextureSet.SourceTexture> mapSourceTexture(HFW.TextureSetTextureDesc desc) {
         var name = desc.path().isEmpty() ? desc.textureType().toString() : desc.path().substring("work:".length());
         var type = mapTextureSetType(desc.textureType().unwrap());
         var colorSpace = desc.gammaSpace() ? TextureColorSpace.SRGB : TextureColorSpace.LINEAR;
         return Optional.of(new TextureSet.SourceTexture(name, type, colorSpace));
     }
 
-    private static Optional<TextureSet.PackedTexture> mapPackedTexture(TextureSetEntry entry, ForbiddenWestGame game) {
+    private static Optional<TextureSet.PackedTexture> mapPackedTexture(HFW.TextureSetEntry entry, HFWGame game) {
         var texture = Converter.convert(entry.texture().get(), Texture.class, game).orElse(null);
         if (texture == null) {
             return Optional.empty();
@@ -70,7 +66,7 @@ private static TextureSet.PackingChannel mapPackingChannel(TextureSetPackingChan
         );
     }
 
-    private static Channel mapTextureSetChannel(ETextureSetChannel channel) {
+    private static Channel mapTextureSetChannel(HFW.ETextureSetChannel channel) {
         return switch (channel) {
             case R -> Channel.R;
             case G -> Channel.G;
@@ -79,7 +75,7 @@ private static Channel mapTextureSetChannel(ETextureSetChannel channel) {
         };
     }
 
-    private static String mapTextureSetType(ETextureSetType type) {
+    private static String mapTextureSetType(HFW.ETextureSetType type) {
         return type.toString();
     }
 }
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/audio/BaseAudioConverter.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/audio/BaseAudioConverter.java
index 8b4d2078..f5fd077f 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/audio/BaseAudioConverter.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/audio/BaseAudioConverter.java
@@ -9,14 +9,14 @@
 import sh.adelessfox.odradek.audio.container.riff.RiffParser;
 import sh.adelessfox.odradek.audio.container.wave.WaveDataChunk;
 import sh.adelessfox.odradek.game.Converter;
-import sh.adelessfox.odradek.game.hfw.game.ForbiddenWestGame;
+import sh.adelessfox.odradek.game.hfw.game.HFWGame;
 import sh.adelessfox.odradek.io.BinaryReader;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.util.Optional;
 
-abstract class BaseAudioConverter<T> implements Converter<T, Audio, ForbiddenWestGame> {
+abstract class BaseAudioConverter<T> implements Converter<T, Audio, HFWGame> {
     private static final RiffParser RIFF_PARSER = new RiffParser()
         .type("WAVE")
         .reader(Atrac9FmtChunk.ID, Atrac9FmtChunk.reader())
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/audio/SimpleSoundResourceToAudioConverter.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/audio/SimpleSoundResourceToAudioConverter.java
index d2674232..f8153c4e 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/audio/SimpleSoundResourceToAudioConverter.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/audio/SimpleSoundResourceToAudioConverter.java
@@ -4,30 +4,27 @@
 import org.slf4j.LoggerFactory;
 import sh.adelessfox.odradek.audio.Audio;
 import sh.adelessfox.odradek.game.Converter;
-import sh.adelessfox.odradek.game.hfw.game.ForbiddenWestGame;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.LocalizedSimpleSoundResource;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.RandomSimpleSoundResource;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.SimpleSoundResource;
+import sh.adelessfox.odradek.game.hfw.game.HFWGame;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 
 import java.util.Optional;
 
 public class SimpleSoundResourceToAudioConverter
-    extends BaseAudioConverter<SimpleSoundResource>
-    implements Converter<SimpleSoundResource, Audio, ForbiddenWestGame> {
+    extends BaseAudioConverter<HFW.SimpleSoundResource>
+    implements Converter<HFW.SimpleSoundResource, Audio, HFWGame> {
 
     private static final Logger log = LoggerFactory.getLogger(SimpleSoundResourceToAudioConverter.class);
 
     @Override
-    public Optional<Audio> convert(SimpleSoundResource object, ForbiddenWestGame game) {
+    public Optional<Audio> convert(HFW.SimpleSoundResource object, HFWGame game) {
         return switch (object) {
-            case LocalizedSimpleSoundResource o -> convertLocalizedSimpleSoundResource(o, game);
-            case RandomSimpleSoundResource o -> convertRandomSimpleSoundResource(o, game);
+            case HFW.LocalizedSimpleSoundResource o -> convertLocalizedSimpleSoundResource(o, game);
+            case HFW.RandomSimpleSoundResource o -> convertRandomSimpleSoundResource(o, game);
             default -> convertSimpleSoundResource(object, game);
         };
     }
 
-    private static Optional<Audio> convertSimpleSoundResource(SimpleSoundResource object, ForbiddenWestGame game) {
+    private static Optional<Audio> convertSimpleSoundResource(HFW.SimpleSoundResource object, HFWGame game) {
         var resource = object.sound().wave();
         if (resource != null) {
             return Converter.convert(resource.get(), Audio.class, game);
@@ -35,13 +32,13 @@ private static Optional<Audio> convertSimpleSoundResource(SimpleSoundResource ob
         return Optional.empty();
     }
 
-    private static Optional<Audio> convertLocalizedSimpleSoundResource(LocalizedSimpleSoundResource object, ForbiddenWestGame game) {
+    private static Optional<Audio> convertLocalizedSimpleSoundResource(HFW.LocalizedSimpleSoundResource object, HFWGame game) {
         var properties = object.streaming().sharedWaveProperties();
         var localizedDataSource = object.localizedDataSource(game.getSpokenLanguage());
 
         assert properties.soundSettings().isStreaming();
 
-        var encoding = HorizonForbiddenWest.EWaveDataEncoding.valueOf(properties.waveFormat().encoding());
+        var encoding = HFW.EWaveDataEncoding.valueOf(properties.waveFormat().encoding());
         var data = game.readDataSource(localizedDataSource.streamingDataSource());
 
         return switch (encoding) {
@@ -60,7 +57,7 @@ private static Optional<Audio> convertLocalizedSimpleSoundResource(LocalizedSimp
         };
     }
 
-    private static Optional<Audio> convertRandomSimpleSoundResource(RandomSimpleSoundResource object, ForbiddenWestGame game) {
+    private static Optional<Audio> convertRandomSimpleSoundResource(HFW.RandomSimpleSoundResource object, HFWGame game) {
         // TODO: Return all variants once Audio can contain multiple tracks
         return Optional.empty();
     }
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/audio/WaveResourceToAudioConverter.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/audio/WaveResourceToAudioConverter.java
index 575cd260..60d168fc 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/audio/WaveResourceToAudioConverter.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/audio/WaveResourceToAudioConverter.java
@@ -4,19 +4,19 @@
 import org.slf4j.LoggerFactory;
 import sh.adelessfox.odradek.audio.Audio;
 import sh.adelessfox.odradek.game.Converter;
-import sh.adelessfox.odradek.game.hfw.game.ForbiddenWestGame;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.WaveResource;
+import sh.adelessfox.odradek.game.hfw.game.HFWGame;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 
 import java.util.Optional;
 
 public class WaveResourceToAudioConverter
-    extends BaseAudioConverter<WaveResource>
-    implements Converter<WaveResource, Audio, ForbiddenWestGame> {
+    extends BaseAudioConverter<HFW.WaveResource>
+    implements Converter<HFW.WaveResource, Audio, HFWGame> {
 
     private static final Logger log = LoggerFactory.getLogger(WaveResourceToAudioConverter.class);
 
     @Override
-    public Optional<Audio> convert(WaveResource object, ForbiddenWestGame game) {
+    public Optional<Audio> convert(HFW.WaveResource object, HFWGame game) {
         var encoding = object.format().encoding().unwrap();
         var data = object.format().isStreaming()
             ? game.readDataSource(object.data().streamingDataSource())
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/scene/BaseSceneConverter.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/scene/BaseSceneConverter.java
index 7efaf3d0..abc56730 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/scene/BaseSceneConverter.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/scene/BaseSceneConverter.java
@@ -3,8 +3,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import sh.adelessfox.odradek.game.Converter;
-import sh.adelessfox.odradek.game.hfw.game.ForbiddenWestGame;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest;
+import sh.adelessfox.odradek.game.hfw.game.HFWGame;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.game.hfw.rtti.data.ref.Ref;
 import sh.adelessfox.odradek.geometry.*;
 import sh.adelessfox.odradek.math.Matrix4f;
@@ -15,14 +15,14 @@
 import java.nio.ByteOrder;
 import java.util.*;
 
-abstract class BaseSceneConverter<T> implements Converter<T, Scene, ForbiddenWestGame> {
+abstract class BaseSceneConverter<T> implements Converter<T, Scene, HFWGame> {
     private static final Logger log = LoggerFactory.getLogger(BaseSceneConverter.class);
 
     static Mesh convertMesh(
-        List<Ref<HorizonForbiddenWest.ShadingGroup>> shadingGroups,
-        List<Ref<HorizonForbiddenWest.PrimitiveResource>> primitiveResources,
-        HorizonForbiddenWest.StreamingDataSource dataSource,
-        ForbiddenWestGame game
+        List<Ref<HFW.ShadingGroup>> shadingGroups,
+        List<Ref<HFW.PrimitiveResource>> primitiveResources,
+        HFW.StreamingDataSource dataSource,
+        HFWGame game
     ) {
         var buffer = ByteBuffer.wrap(game.readDataSource(dataSource)).order(ByteOrder.LITTLE_ENDIAN);
         var primitives = new ArrayList<Primitive>(primitiveResources.size());
@@ -55,7 +55,7 @@ static Mesh convertMesh(
         return Mesh.of(primitives);
     }
 
-    static Mesh convertHairMesh(HorizonForbiddenWest.HairSkinnedMesh mesh, ForbiddenWestGame game) {
+    static Mesh convertHairMesh(HFW.HairSkinnedMesh mesh, HFWGame game) {
         var vertexArray = mesh.skinnedVertexArray().get();
         var vertexAccessors = buildVertexAccessors(vertexArray, null);
 
@@ -79,7 +79,7 @@ static Mesh convertHairMesh(HorizonForbiddenWest.HairSkinnedMesh mesh, Forbidden
         ));
     }
 
-    private static Accessor buildHairJointsAccessor(HorizonForbiddenWest.DataBufferResource buffer) {
+    private static Accessor buildHairJointsAccessor(HFW.DataBufferResource buffer) {
         var accessor = buildBufferAccessor(buffer);
         var view = accessor.asShortView();
 
@@ -99,7 +99,7 @@ private static Accessor buildHairJointsAccessor(HorizonForbiddenWest.DataBufferR
         return Accessor.of(output.flip(), new Type.I16(4, true, false), accessor.count());
     }
 
-    private static Accessor buildBufferAccessor(HorizonForbiddenWest.DataBufferResource buffer) {
+    private static Accessor buildBufferAccessor(HFW.DataBufferResource buffer) {
         if (buffer.isStreaming()) {
             throw new UnsupportedOperationException("Streaming buffers are not supported");
         }
@@ -118,7 +118,7 @@ private static Accessor buildBufferAccessor(HorizonForbiddenWest.DataBufferResou
         };
     }
 
-    static Matrix4f toMat4(HorizonForbiddenWest.Mat34 matrix) {
+    static Matrix4f toMat4(HFW.Mat34 matrix) {
         return new Matrix4f(
             matrix.row0().x(), matrix.row1().x(), matrix.row2().x(), 0.f,
             matrix.row0().y(), matrix.row1().y(), matrix.row2().y(), 0.f,
@@ -127,7 +127,7 @@ static Matrix4f toMat4(HorizonForbiddenWest.Mat34 matrix) {
         );
     }
 
-    static Matrix4f toMat4(HorizonForbiddenWest.WorldTransform transform) {
+    static Matrix4f toMat4(HFW.WorldTransform transform) {
         var rot = transform.orientation();
         var pos = transform.position();
         return new Matrix4f(
@@ -139,7 +139,7 @@ static Matrix4f toMat4(HorizonForbiddenWest.WorldTransform transform) {
     }
 
     private static Map<Semantic, Accessor> buildVertexAccessors(
-        HorizonForbiddenWest.VertexArrayResource object,
+        HFW.VertexArrayResource object,
         ByteBuffer buffer
     ) {
         var accessors = new HashMap<Semantic, Accessor>();
@@ -252,7 +252,7 @@ private static Map<Semantic, Accessor> buildVertexAccessors(
     }
 
     private static Accessor buildIndexAccessor(
-        HorizonForbiddenWest.IndexArrayResource object,
+        HFW.IndexArrayResource object,
         ByteBuffer buffer,
         int startIndex,
         int endIndex
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/scene/MeshToSceneConverter.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/scene/MeshToSceneConverter.java
index 1e574c80..ee89cf3d 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/scene/MeshToSceneConverter.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/scene/MeshToSceneConverter.java
@@ -3,7 +3,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import sh.adelessfox.odradek.game.Converter;
-import sh.adelessfox.odradek.game.hfw.game.ForbiddenWestGame;
+import sh.adelessfox.odradek.game.hfw.game.HFWGame;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.game.hfw.rtti.data.ref.Ref;
 import sh.adelessfox.odradek.io.BinaryReader;
 import sh.adelessfox.odradek.math.Matrix4f;
@@ -19,40 +20,38 @@
 import java.util.*;
 import java.util.stream.IntStream;
 
-import static sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.*;
-
 public final class MeshToSceneConverter
     extends BaseSceneConverter<Object>
-    implements Converter<Object, Scene, ForbiddenWestGame> {
+    implements Converter<Object, Scene, HFWGame> {
 
     private static final Logger log = LoggerFactory.getLogger(MeshToSceneConverter.class);
 
     @Override
-    public Optional<Scene> convert(Object object, ForbiddenWestGame game) {
+    public Optional<Scene> convert(Object object, HFWGame game) {
         var context = new Context();
-        var node = convertNodeIfAbsent(context, (RTTIRefObject) object, game);
+        var node = convertNodeIfAbsent(context, (HFW.RTTIRefObject) object, game);
         return node.map(Scene::of);
     }
 
     @Override
     public boolean supports(TypeInfo info) {
         Class<?> cls = info.type();
-        return StaticMeshResource.class.isAssignableFrom(cls)
-            || StaticMeshInstance.class.isAssignableFrom(cls)
-            || RegularSkinnedMeshResource.class.isAssignableFrom(cls)
-            || LodMeshResource.class.isAssignableFrom(cls)
-            || MultiMeshResource.class.isAssignableFrom(cls)
-            || BodyVariant.class.isAssignableFrom(cls)
-            || SkinnedModelResource.class.isAssignableFrom(cls)
-            || DestructibilityPart.class.isAssignableFrom(cls)
-            || ControlledEntityResource.class.isAssignableFrom(cls)
-            || PrefabResource.class.isAssignableFrom(cls)
-            || PrefabInstance.class.isAssignableFrom(cls)
-            || MockupGeometry.class.isAssignableFrom(cls)
-            || HairResource.class.isAssignableFrom(cls);
+        return HFW.StaticMeshResource.class.isAssignableFrom(cls)
+            || HFW.StaticMeshInstance.class.isAssignableFrom(cls)
+            || HFW.RegularSkinnedMeshResource.class.isAssignableFrom(cls)
+            || HFW.LodMeshResource.class.isAssignableFrom(cls)
+            || HFW.MultiMeshResource.class.isAssignableFrom(cls)
+            || HFW.BodyVariant.class.isAssignableFrom(cls)
+            || HFW.SkinnedModelResource.class.isAssignableFrom(cls)
+            || HFW.DestructibilityPart.class.isAssignableFrom(cls)
+            || HFW.ControlledEntityResource.class.isAssignableFrom(cls)
+            || HFW.PrefabResource.class.isAssignableFrom(cls)
+            || HFW.PrefabInstance.class.isAssignableFrom(cls)
+            || HFW.MockupGeometry.class.isAssignableFrom(cls)
+            || HFW.HairResource.class.isAssignableFrom(cls);
     }
 
-    private static Optional<Node> convertNodeIfAbsent(Context context, RTTIRefObject object, ForbiddenWestGame game) {
+    private static Optional<Node> convertNodeIfAbsent(Context context, HFW.RTTIRefObject object, HFWGame game) {
         var key = object.general().objectUUID();
         var node = Optional.ofNullable(context.resources.get(key));
         if (node.isEmpty()) {
@@ -62,21 +61,21 @@ private static Optional<Node> convertNodeIfAbsent(Context context, RTTIRefObject
         return node;
     }
 
-    private static Optional<Node> convertNode(Context context, RTTIRefObject object, ForbiddenWestGame game) {
+    private static Optional<Node> convertNode(Context context, HFW.RTTIRefObject object, HFWGame game) {
         return switch (object) {
-            case StaticMeshResource r -> convertStaticMeshResource(context, r, game);
-            case StaticMeshInstance r -> convertStaticMeshInstance(context, r, game);
-            case RegularSkinnedMeshResource r -> convertRegularSkinnedMeshResource(context, r, game);
-            case LodMeshResource r -> convertLodMeshResource(context, r, game);
-            case MultiMeshResource r -> convertMultiMeshResource(context, r, game);
-            case BodyVariant r -> convertBodyVariant(context, r, game);
-            case SkinnedModelResource r -> convertSkinnedModelResource(context, r, game);
-            case DestructibilityPart r -> convertDestructibilityPart(context, r, game);
-            case ControlledEntityResource r -> convertControlledEntityResource(context, r, game);
-            case PrefabResource r -> convertPrefabResource(context, r, game);
-            case PrefabInstance r -> convertPrefabInstance(context, r, game);
-            case MockupGeometry r -> convertMockupGeometry(context, r, game);
-            case HairResource r -> convertHairResource(context, r, game);
+            case HFW.StaticMeshResource r -> convertStaticMeshResource(context, r, game);
+            case HFW.StaticMeshInstance r -> convertStaticMeshInstance(context, r, game);
+            case HFW.RegularSkinnedMeshResource r -> convertRegularSkinnedMeshResource(context, r, game);
+            case HFW.LodMeshResource r -> convertLodMeshResource(context, r, game);
+            case HFW.MultiMeshResource r -> convertMultiMeshResource(context, r, game);
+            case HFW.BodyVariant r -> convertBodyVariant(context, r, game);
+            case HFW.SkinnedModelResource r -> convertSkinnedModelResource(context, r, game);
+            case HFW.DestructibilityPart r -> convertDestructibilityPart(context, r, game);
+            case HFW.ControlledEntityResource r -> convertControlledEntityResource(context, r, game);
+            case HFW.PrefabResource r -> convertPrefabResource(context, r, game);
+            case HFW.PrefabInstance r -> convertPrefabInstance(context, r, game);
+            case HFW.MockupGeometry r -> convertMockupGeometry(context, r, game);
+            case HFW.HairResource r -> convertHairResource(context, r, game);
             default -> {
                 log.debug("Unsupported resource type: {}", object.getType());
                 yield Optional.empty();
@@ -85,7 +84,7 @@ private static Optional<Node> convertNode(Context context, RTTIRefObject object,
     }
 
     @SuppressWarnings("unused")
-    private static Optional<Node> convertHairResource(Context context, HairResource resource, ForbiddenWestGame game) {
+    private static Optional<Node> convertHairResource(Context context, HFW.HairResource resource, HFWGame game) {
         var pose = resource.geometry().poses().getFirst();
         var skin = convertHairPose(pose);
 
@@ -100,7 +99,7 @@ private static Optional<Node> convertHairResource(Context context, HairResource
         return Node.of(nodes);
     }
 
-    private static Skin convertHairPose(HairPose pose) {
+    private static Skin convertHairPose(HFW.HairPose pose) {
         var joints = new ArrayList<Joint>();
         for (int i = 0; i < pose.bundles().size(); i++) {
             var bundle = pose.bundles().get(i);
@@ -130,8 +129,8 @@ private static Skin convertHairPose(HairPose pose) {
 
     private static Optional<Node> convertMockupGeometry(
         Context context,
-        MockupGeometry geometry,
-        ForbiddenWestGame game
+        HFW.MockupGeometry geometry,
+        HFWGame game
     ) {
         var node = convertNodeIfAbsent(context, geometry.staticMeshInstance().get(), game);
         var transform = geometry.general().orientation();
@@ -140,8 +139,8 @@ private static Optional<Node> convertMockupGeometry(
 
     private static Optional<Node> convertPrefabResource(
         Context context,
-        PrefabResource resource,
-        ForbiddenWestGame game
+        HFW.PrefabResource resource,
+        HFWGame game
     ) {
         var collection = resource.general().objectCollection().get();
         var children = new ArrayList<Node>();
@@ -159,10 +158,10 @@ private static Optional<Node> convertPrefabResource(
 
     private static Optional<Node> convertPrefabInstance(
         Context context,
-        PrefabInstance instance,
-        ForbiddenWestGame game
+        HFW.PrefabInstance instance,
+        HFWGame game
     ) {
-        for (PrefabObjectOverrides override : instance.general().overrides()) {
+        for (HFW.PrefabObjectOverrides override : instance.general().overrides()) {
             assert !override.isRemoved();
             assert !override.isTransformOverridden();
         }
@@ -173,20 +172,20 @@ private static Optional<Node> convertPrefabInstance(
 
     private static Optional<Node> convertControlledEntityResource(
         Context context,
-        ControlledEntityResource resource,
-        ForbiddenWestGame game
+        HFW.ControlledEntityResource resource,
+        HFWGame game
     ) {
         List<Node> children = new ArrayList<>();
 
-        for (EntityComponentResource component : Ref.unwrap(resource.logic().entityComponentResources())) {
+        for (HFW.EntityComponentResource component : Ref.unwrap(resource.logic().entityComponentResources())) {
             switch (component) {
-                case DestructibilityResource destructibility -> {
-                    for (DestructibilityPart part : Ref.unwrap(destructibility.logic().convertedParts())) {
+                case HFW.DestructibilityResource destructibility -> {
+                    for (HFW.DestructibilityPart part : Ref.unwrap(destructibility.logic().convertedParts())) {
                         convertDestructibilityPart(context, part, game).ifPresent(children::add);
                         // TODO: Handle attachment joints
                     }
                 }
-                case SkinnedModelResource model -> {
+                case HFW.SkinnedModelResource model -> {
                     convertSkinnedModelResource(context, model, game).ifPresent(children::add);
                 }
                 default -> log.debug("Skipping unsupported component: {}", component.getType());
@@ -198,8 +197,8 @@ private static Optional<Node> convertControlledEntityResource(
 
     private static Optional<Node> convertSkinnedModelResource(
         Context context,
-        SkinnedModelResource resource,
-        ForbiddenWestGame game
+        HFW.SkinnedModelResource resource,
+        HFWGame game
     ) {
         var skin = convertSkeleton(resource.general().skeleton().get()).orElse(null);
         var parts = resource.general().modelPartResources().stream()
@@ -216,8 +215,8 @@ private static Optional<Node> convertSkinnedModelResource(
 
     private static Optional<Node> convertDestructibilityPart(
         Context context,
-        DestructibilityPart part,
-        ForbiddenWestGame game
+        HFW.DestructibilityPart part,
+        HFWGame game
     ) {
         var initialState = part.initialState().get();
         var modelPartResource = initialState.state().modelPartResource();
@@ -229,8 +228,8 @@ private static Optional<Node> convertDestructibilityPart(
 
     private static Optional<Node> convertModelPartResource(
         Context context,
-        ModelPartResource resource,
-        ForbiddenWestGame game
+        HFW.ModelPartResource resource,
+        HFWGame game
     ) {
         if (resource.general().meshResource() == null) {
             return Optional.empty();
@@ -240,8 +239,8 @@ private static Optional<Node> convertModelPartResource(
 
     private static Optional<Node> convertStaticMeshInstance(
         Context context,
-        StaticMeshInstance instance,
-        ForbiddenWestGame game
+        HFW.StaticMeshInstance instance,
+        HFWGame game
     ) {
         var node = convertNodeIfAbsent(context, instance.general().resource().get(), game);
         var transform = instance.general().orientation();
@@ -251,10 +250,10 @@ private static Optional<Node> convertStaticMeshInstance(
     @SuppressWarnings("unused")
     private static Optional<Node> convertStaticMeshResource(
         Context context,
-        StaticMeshResource resource,
-        ForbiddenWestGame game
+        HFW.StaticMeshResource resource,
+        HFWGame game
     ) {
-        if (resource.lighting().drawFlags().renderType() == EDrawPartType.ShadowCasterOnly) {
+        if (resource.lighting().drawFlags().renderType() == HFW.EDrawPartType.ShadowCasterOnly) {
             log.debug("Skipping shadow caster mesh {}", resource.general().objectUUID().toDisplayString());
             return Optional.empty();
         }
@@ -270,10 +269,10 @@ private static Optional<Node> convertStaticMeshResource(
     @SuppressWarnings("unused")
     private static Optional<Node> convertRegularSkinnedMeshResource(
         Context context,
-        RegularSkinnedMeshResource resource,
-        ForbiddenWestGame game
+        HFW.RegularSkinnedMeshResource resource,
+        HFWGame game
     ) {
-        if (resource.lighting().drawFlags().renderType() == EDrawPartType.ShadowCasterOnly) {
+        if (resource.lighting().drawFlags().renderType() == HFW.EDrawPartType.ShadowCasterOnly) {
             log.debug("Skipping shadow caster mesh {}", resource.general().objectUUID().toDisplayString());
             return Optional.empty();
         }
@@ -291,7 +290,7 @@ private static Optional<Node> convertRegularSkinnedMeshResource(
         return Optional.of(node);
     }
 
-    private static Optional<Skin> convertSkeleton(Skeleton skeleton) {
+    private static Optional<Skin> convertSkeleton(HFW.Skeleton skeleton) {
         if (!skeleton.general().hasBindPose()) {
             log.warn("Skipping skeleton {} without a bind pose", skeleton.general().objectUUID().toDisplayString());
             return Optional.empty();
@@ -322,8 +321,8 @@ private static Optional<Skin> convertSkeleton(Skeleton skeleton) {
 
     private static Optional<Node> convertLodMeshResource(
         Context context,
-        LodMeshResource resource,
-        ForbiddenWestGame game
+        HFW.LodMeshResource resource,
+        HFWGame game
     ) {
         var part = resource.runtimeMeshes().getFirst();
         return convertNodeIfAbsent(context, part.mesh().get(), game);
@@ -331,8 +330,8 @@ private static Optional<Node> convertLodMeshResource(
 
     private static Optional<Node> convertMultiMeshResource(
         Context context,
-        MultiMeshResource resource,
-        ForbiddenWestGame game
+        HFW.MultiMeshResource resource,
+        HFWGame game
     ) {
         var meshes = resource.meshes();
         var transforms = resource.transforms();
@@ -349,9 +348,9 @@ private static Optional<Node> convertMultiMeshResource(
 
     private static Optional<Node> convertMultiMeshResourcePart(
         Context context,
-        MeshResourceBase resource,
-        Mat34 transform,
-        ForbiddenWestGame game
+        HFW.MeshResourceBase resource,
+        HFW.Mat34 transform,
+        HFWGame game
     ) {
         var child = convertNodeIfAbsent(context, resource, game);
         var matrix = transform != null ? toMat4(transform) : Matrix4f.identity();
@@ -361,8 +360,8 @@ private static Optional<Node> convertMultiMeshResourcePart(
 
     private static Optional<Node> convertBodyVariant(
         Context context,
-        BodyVariant resource,
-        ForbiddenWestGame game
+        HFW.BodyVariant resource,
+        HFWGame game
     ) {
         List<Node> children = resource.logic().modelPartResources().stream()
             .map(part -> convertNodeIfAbsent(context, part.get().general().meshResource().get(), game))
@@ -373,6 +372,6 @@ private static Optional<Node> convertBodyVariant(
     }
 
     private static final class Context {
-        private final Map<GGUUID, Node> resources = new HashMap<>();
+        private final Map<HFW.GGUUID, Node> resources = new HashMap<>();
     }
 }
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/texture/BaseTextureConverter.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/texture/BaseTextureConverter.java
index 0d6037f3..c74d2ae6 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/texture/BaseTextureConverter.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/texture/BaseTextureConverter.java
@@ -3,10 +3,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import sh.adelessfox.odradek.game.Converter;
-import sh.adelessfox.odradek.game.hfw.game.ForbiddenWestGame;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.EPixelFormat;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.ETexColorSpace;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.ETextureType;
+import sh.adelessfox.odradek.game.hfw.game.HFWGame;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.texture.Texture;
 import sh.adelessfox.odradek.texture.TextureColorSpace;
 import sh.adelessfox.odradek.texture.TextureFormat;
@@ -14,10 +12,10 @@
 
 import java.util.Optional;
 
-abstract class BaseTextureConverter<T> implements Converter<T, Texture, ForbiddenWestGame> {
+abstract class BaseTextureConverter<T> implements Converter<T, Texture, HFWGame> {
     private static final Logger log = LoggerFactory.getLogger(BaseTextureConverter.class);
 
-    protected static Optional<TextureFormat> mapFormat(EPixelFormat format) {
+    protected static Optional<TextureFormat> mapFormat(HFW.EPixelFormat format) {
         return Optional.ofNullable(switch (format) {
             case R_UNORM_16 -> TextureFormat.R16_UNORM;
             case RGBA_8888 -> TextureFormat.R8G8B8A8_UNORM;
@@ -41,7 +39,7 @@ protected static Optional<TextureFormat> mapFormat(EPixelFormat format) {
         });
     }
 
-    protected static Optional<TextureType> mapType(ETextureType type) {
+    protected static Optional<TextureType> mapType(HFW.ETextureType type) {
         return Optional.ofNullable(switch (type) {
             case _2D -> TextureType.SURFACE;
             case _2DArray -> TextureType.ARRAY;
@@ -54,7 +52,7 @@ protected static Optional<TextureType> mapType(ETextureType type) {
         });
     }
 
-    protected static TextureColorSpace mapColorSpace(ETexColorSpace colorSpace) {
+    protected static TextureColorSpace mapColorSpace(HFW.ETexColorSpace colorSpace) {
         return switch (colorSpace) {
             case Linear -> TextureColorSpace.LINEAR;
             case sRGB -> TextureColorSpace.SRGB;
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/texture/TextureBindingWithHandleToTextureConverter.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/texture/TextureBindingWithHandleToTextureConverter.java
index a8b7c443..c03f83bf 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/texture/TextureBindingWithHandleToTextureConverter.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/texture/TextureBindingWithHandleToTextureConverter.java
@@ -1,18 +1,18 @@
 package sh.adelessfox.odradek.game.hfw.converters.texture;
 
 import sh.adelessfox.odradek.game.Converter;
-import sh.adelessfox.odradek.game.hfw.game.ForbiddenWestGame;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest;
+import sh.adelessfox.odradek.game.hfw.game.HFWGame;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.texture.Texture;
 
 import java.util.Optional;
 
 public final class TextureBindingWithHandleToTextureConverter
-    extends BaseTextureConverter<HorizonForbiddenWest.TextureBindingWithHandle>
-    implements Converter<HorizonForbiddenWest.TextureBindingWithHandle, Texture, ForbiddenWestGame> {
+    extends BaseTextureConverter<HFW.TextureBindingWithHandle>
+    implements Converter<HFW.TextureBindingWithHandle, Texture, HFWGame> {
 
     @Override
-    public Optional<Texture> convert(HorizonForbiddenWest.TextureBindingWithHandle object, ForbiddenWestGame game) {
+    public Optional<Texture> convert(HFW.TextureBindingWithHandle object, HFWGame game) {
         var resource = object.textureResource().get();
         if (resource != null) {
             return Converter.convert(resource, Texture.class, game);
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/texture/TextureToTextureConverter.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/texture/TextureToTextureConverter.java
index c0647d2d..b518b320 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/texture/TextureToTextureConverter.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/texture/TextureToTextureConverter.java
@@ -1,8 +1,8 @@
 package sh.adelessfox.odradek.game.hfw.converters.texture;
 
 import sh.adelessfox.odradek.game.Converter;
-import sh.adelessfox.odradek.game.hfw.game.ForbiddenWestGame;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest;
+import sh.adelessfox.odradek.game.hfw.game.HFWGame;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.texture.Surface;
 import sh.adelessfox.odradek.texture.Texture;
 import sh.adelessfox.odradek.texture.TextureType;
@@ -13,11 +13,11 @@
 import java.util.OptionalInt;
 
 public final class TextureToTextureConverter
-    extends BaseTextureConverter<HorizonForbiddenWest.Texture>
-    implements Converter<HorizonForbiddenWest.Texture, Texture, ForbiddenWestGame> {
+    extends BaseTextureConverter<HFW.Texture>
+    implements Converter<HFW.Texture, Texture, HFWGame> {
 
     @Override
-    public Optional<Texture> convert(HorizonForbiddenWest.Texture object, ForbiddenWestGame game) {
+    public Optional<Texture> convert(HFW.Texture object, HFWGame game) {
         var format = mapFormat(object.header().pixelFormat().unwrap()).orElse(null);
         var type = mapType(object.header().type().unwrap()).orElse(null);
         if (format == null || type == null) {
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/texture/UITextureToTextureConverter.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/texture/UITextureToTextureConverter.java
index 444a0c80..1a46272f 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/texture/UITextureToTextureConverter.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/converters/texture/UITextureToTextureConverter.java
@@ -2,8 +2,8 @@
 
 import sh.adelessfox.odradek.compression.Decompressor;
 import sh.adelessfox.odradek.game.Converter;
-import sh.adelessfox.odradek.game.hfw.game.ForbiddenWestGame;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest;
+import sh.adelessfox.odradek.game.hfw.game.HFWGame;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.texture.Surface;
 import sh.adelessfox.odradek.texture.Texture;
 import sh.adelessfox.odradek.texture.TextureColorSpace;
@@ -13,11 +13,11 @@
 import java.util.Optional;
 
 public final class UITextureToTextureConverter
-    extends BaseTextureConverter<HorizonForbiddenWest.UITexture>
-    implements Converter<HorizonForbiddenWest.UITexture, Texture, ForbiddenWestGame> {
+    extends BaseTextureConverter<HFW.UITexture>
+    implements Converter<HFW.UITexture, Texture, HFWGame> {
 
     @Override
-    public Optional<Texture> convert(HorizonForbiddenWest.UITexture object, ForbiddenWestGame game) {
+    public Optional<Texture> convert(HFW.UITexture object, HFWGame game) {
         if (object.animated()) {
             return convertTextureFrames(object.largeTextureFrames());
         } else {
@@ -25,7 +25,7 @@ public Optional<Texture> convert(HorizonForbiddenWest.UITexture object, Forbidde
         }
     }
 
-    private static Optional<Texture> convertTextureFrames(HorizonForbiddenWest.UITextureFramesInfo object) {
+    private static Optional<Texture> convertTextureFrames(HFW.UITextureFramesInfo object) {
         var format = mapFormat(object.pixelFormat().unwrap()).orElse(null);
         if (format == null) {
             return Optional.empty();
@@ -53,13 +53,13 @@ private static Optional<Texture> convertTextureFrames(HorizonForbiddenWest.UITex
         ));
     }
 
-    private static Optional<Texture> convertTexture(HorizonForbiddenWest.TextureInfo object) {
+    private static Optional<Texture> convertTexture(HFW.TextureInfo object) {
         var format = mapFormat(object.header().pixelFormat().unwrap()).orElse(null);
         if (format == null) {
             return Optional.empty();
         }
 
-        assert object.header().type() == HorizonForbiddenWest.ETextureType._2D;
+        assert object.header().type() == HFW.ETextureType._2D;
         assert object.header().numMips() == 1;
         assert object.header().numSurfaces() == 0;
         assert object.data().streamedMips() == 0;
@@ -75,7 +75,7 @@ private static Optional<Texture> convertTexture(HorizonForbiddenWest.TextureInfo
         ));
     }
 
-    private static Duration mapFrequency(HorizonForbiddenWest.EUpdateFrequency frequency) {
+    private static Duration mapFrequency(HFW.EUpdateFrequency frequency) {
         double hz = switch (frequency) {
             case _0 -> 7.49;
             case _1 -> 14.99;
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/game/ForbiddenWestFileSystem.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/game/ForbiddenWestFileSystem.java
deleted file mode 100644
index 22414c5b..00000000
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/game/ForbiddenWestFileSystem.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package sh.adelessfox.odradek.game.hfw.game;
-
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.EPlatform;
-
-import java.nio.file.Path;
-
-public record ForbiddenWestFileSystem(Path source, EPlatform platform) {
-    public Path resolve(String path) {
-        String[] parts = path.split(":", 2);
-        return switch (parts[0]) {
-            case "source" -> source.resolve(parts[1]);
-            case "cache" -> resolve("source:LocalCache" + platform).resolve(parts[1]);
-            case "tools" -> resolve("source:tools").resolve(parts[1]);
-            default -> throw new IllegalArgumentException("Unknown device path: " + path);
-        };
-    }
-}
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/game/ForbiddenWestGame.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/game/ForbiddenWestGame.java
deleted file mode 100644
index 4baf4fd0..00000000
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/game/ForbiddenWestGame.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package sh.adelessfox.odradek.game.hfw.game;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import sh.adelessfox.odradek.game.Game;
-import sh.adelessfox.odradek.game.hfw.rtti.HFWTypeFactory;
-import sh.adelessfox.odradek.game.hfw.rtti.HFWTypeReader;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.ELanguage;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.EPlatform;
-import sh.adelessfox.odradek.game.hfw.storage.ObjectStreamingSystem;
-import sh.adelessfox.odradek.game.hfw.storage.StorageReadDevice;
-import sh.adelessfox.odradek.game.hfw.storage.StreamingGraphResource;
-import sh.adelessfox.odradek.game.hfw.storage.StreamingObjectReader;
-import sh.adelessfox.odradek.io.BinaryReader;
-import sh.adelessfox.odradek.rtti.data.TypedObject;
-import sh.adelessfox.odradek.rtti.factory.TypeFactory;
-import sh.adelessfox.odradek.util.system.ProductVersion;
-
-import java.io.IOException;
-import java.io.UncheckedIOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Optional;
-
-public final class ForbiddenWestGame implements Game {
-    public static final class Provider implements Game.Provider {
-        @Override
-        public boolean supports(Path path) {
-            return Files.exists(path.resolve("HorizonForbiddenWest.exe"));
-        }
-
-        @Override
-        public Game load(Path path) throws IOException {
-            return new ForbiddenWestGame(path, EPlatform.WinGame);
-        }
-    }
-
-    private static final Logger log = LoggerFactory.getLogger(ForbiddenWestGame.class);
-
-    private final StreamingGraphResource streamingGraph;
-    private final StorageReadDevice storageDevice;
-    private final ObjectStreamingSystem streamingSystem;
-    private final StreamingObjectReader streamingReader;
-    private final ForbiddenWestFileSystem fileSystem;
-
-    // NOTE: Add customization later
-    private final ELanguage writtenLanguage = ELanguage.English;
-    private final ELanguage spokenLanguage = ELanguage.English;
-
-    public ForbiddenWestGame(Path source, EPlatform platform) throws IOException {
-        var version = Optional.of(source.resolve("HorizonForbiddenWest.exe"))
-            .filter(Files::exists)
-            .flatMap(ProductVersion::probe)
-            .map(ProductVersion::toString)
-            .orElse("Unknown");
-
-        log.debug("[GAME] Source:   {}", source);
-        log.debug("[GAME] Platform: {}", platform);
-        log.debug("[GAME] Version:  {}", version);
-
-        fileSystem = new ForbiddenWestFileSystem(source, platform);
-
-        log.debug("Loading type factory");
-        var typeFactory = new HFWTypeFactory();
-
-        log.debug("Loading streaming graph");
-        streamingGraph = readStreamingGraph(fileSystem, typeFactory);
-
-        log.debug("Loading storage files");
-        storageDevice = new StorageReadDevice(fileSystem);
-
-        for (String file : streamingGraph.files()) {
-            storageDevice.mount(file);
-        }
-
-        streamingSystem = new ObjectStreamingSystem(storageDevice, streamingGraph);
-        streamingReader = new StreamingObjectReader(streamingSystem, typeFactory);
-    }
-
-    public byte[] readDataSource(HorizonForbiddenWest.StreamingDataSource dataSource) {
-        try {
-            return getStreamingSystem().getDataSourceData(dataSource);
-        } catch (IOException e) {
-            // FIXME: Throwing unchecked exceptions is not ideal. Think about proper exception handling
-            throw new UncheckedIOException(e);
-        }
-    }
-
-    @Override
-    public TypedObject readObject(int groupId, int objectIndex) throws IOException {
-        synchronized (streamingReader) {
-            return streamingReader.readGroup(groupId).objects().get(objectIndex).object();
-        }
-    }
-
-    @Override
-    public Path resolvePath(String path) {
-        return fileSystem.resolve(path);
-    }
-
-    public StreamingGraphResource getStreamingGraph() {
-        return streamingGraph;
-    }
-
-    public ObjectStreamingSystem getStreamingSystem() {
-        return streamingSystem;
-    }
-
-    public StreamingObjectReader getStreamingReader() {
-        return streamingReader;
-    }
-
-    public ELanguage getWrittenLanguage() {
-        return writtenLanguage;
-    }
-
-    public ELanguage getSpokenLanguage() {
-        return spokenLanguage;
-    }
-
-    @Override
-    public void close() throws IOException {
-        storageDevice.close();
-    }
-
-    private static StreamingGraphResource readStreamingGraph(ForbiddenWestFileSystem fileSystem, TypeFactory typeFactory) throws IOException {
-        try (var reader = BinaryReader.open(fileSystem.resolve("cache:package/streaming_graph.core"))) {
-            var result = new HFWTypeReader().readObject(reader, typeFactory);
-            var graph = (HorizonForbiddenWest.StreamingGraphResource) result.object();
-            return new StreamingGraphResource(graph, typeFactory);
-        }
-    }
-}
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/game/HFWGame.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/game/HFWGame.java
new file mode 100644
index 00000000..6f818194
--- /dev/null
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/game/HFWGame.java
@@ -0,0 +1,161 @@
+package sh.adelessfox.odradek.game.hfw.game;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import sh.adelessfox.odradek.game.Game;
+import sh.adelessfox.odradek.game.decima.DecimaGame;
+import sh.adelessfox.odradek.game.decima.StreamingGraph;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
+import sh.adelessfox.odradek.game.hfw.rtti.HFWTypeFactory;
+import sh.adelessfox.odradek.game.hfw.rtti.HFWTypeReader;
+import sh.adelessfox.odradek.game.hfw.storage.StreamingGraphImpl;
+import sh.adelessfox.odradek.game.hfw.storage.StreamingGraphStorage;
+import sh.adelessfox.odradek.game.hfw.storage.StreamingObjectReader;
+import sh.adelessfox.odradek.io.BinaryReader;
+import sh.adelessfox.odradek.rtti.data.TypedObject;
+import sh.adelessfox.odradek.rtti.factory.TypeFactory;
+import sh.adelessfox.odradek.util.system.ProductVersion;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Optional;
+
+public final class HFWGame implements DecimaGame {
+    public static final class Provider implements Game.Provider {
+        @Override
+        public boolean supports(Path path) {
+            return Files.exists(path.resolve("HorizonForbiddenWest.exe"));
+        }
+
+        @Override
+        public Game load(Path path) throws IOException {
+            return new HFWGame(path, HFW.EPlatform.WinGame);
+        }
+    }
+
+    private static final Logger log = LoggerFactory.getLogger(HFWGame.class);
+
+    private final StreamingGraph streamingGraph;
+    private final StreamingGraphStorage storage;
+    private final StreamingObjectReader streamingReader;
+    private final FileSystem fileSystem;
+
+    // NOTE: Add customization later
+    private final HFW.ELanguage writtenLanguage = HFW.ELanguage.English;
+    private final HFW.ELanguage spokenLanguage = HFW.ELanguage.English;
+
+    public HFWGame(Path source, HFW.EPlatform platform) throws IOException {
+        var version = Optional.of(source.resolve("HorizonForbiddenWest.exe"))
+            .filter(Files::exists)
+            .flatMap(ProductVersion::probe)
+            .map(ProductVersion::toString)
+            .orElse("Unknown");
+
+        log.debug("[GAME] Source:   {}", source);
+        log.debug("[GAME] Platform: {}", platform);
+        log.debug("[GAME] Version:  {}", version);
+
+        fileSystem = new FileSystem(source, platform);
+
+        log.debug("Loading type factory");
+        var typeFactory = new HFWTypeFactory();
+
+        log.debug("Loading streaming graph");
+        var graph = readStreamingGraph(fileSystem, typeFactory);
+
+        log.debug("Loading storage files");
+        storage = new StreamingGraphStorage(this);
+
+        for (String file : graph.files()) {
+            storage.mount(file);
+        }
+
+        streamingGraph = new StreamingGraphImpl(graph, storage, typeFactory);
+        streamingReader = new StreamingObjectReader(this, typeFactory);
+    }
+
+    public byte[] readDataSource(HFW.StreamingDataSource dataSource) {
+        try {
+            return getDataSourceData(dataSource);
+        } catch (IOException e) {
+            // FIXME: Throwing unchecked exceptions is not ideal. Think about proper exception handling
+            throw new UncheckedIOException(e);
+        }
+    }
+
+    public byte[] getDataSourceData(HFW.StreamingDataSource dataSource) throws IOException {
+        return getDataSourceData(dataSource, dataSource.offset(), dataSource.length());
+    }
+
+    public byte[] getDataSourceData(
+        HFW.StreamingDataSource dataSource,
+        int offset,
+        int length
+    ) throws IOException {
+        return getFileData(dataSource.fileId(), (long) dataSource.fileOffset() + offset, length);
+    }
+
+    private byte[] getFileData(int fileId, long offset, long length) throws IOException {
+        return readFile(streamingGraph.files().get(fileId), offset, length);
+    }
+
+    @Override
+    public List<TypedObject> readGroup(int groupId, boolean readSubgroups) throws IOException {
+        synchronized (streamingReader) {
+            return streamingReader.readGroup(groupId, readSubgroups).objects();
+        }
+    }
+
+    @Override
+    public byte[] readFile(String file, long offset, long length) throws IOException {
+        return storage.read(file, offset, length);
+    }
+
+    @Override
+    public Path resolvePath(String path) {
+        return fileSystem.resolve(path);
+    }
+
+    @Override
+    public StreamingGraph streamingGraph() {
+        return streamingGraph;
+    }
+
+    public HFW.ELanguage getWrittenLanguage() {
+        return writtenLanguage;
+    }
+
+    public HFW.ELanguage getSpokenLanguage() {
+        return spokenLanguage;
+    }
+
+    @Override
+    public void close() throws IOException {
+        storage.close();
+    }
+
+    private static HFW.StreamingGraphResource readStreamingGraph(
+        FileSystem fileSystem,
+        TypeFactory typeFactory
+    ) throws IOException {
+        try (var reader = BinaryReader.open(fileSystem.resolve("cache:package/streaming_graph.core"))) {
+            var result = new HFWTypeReader().readObject(reader, typeFactory);
+            return (HFW.StreamingGraphResource) result;
+        }
+    }
+
+    private record FileSystem(Path source, HFW.EPlatform platform) {
+        public Path resolve(String path) {
+            String[] parts = path.split(":", 2);
+            return switch (parts[0]) {
+                case "source" -> source.resolve(parts[1]);
+                case "cache" -> resolve("source:LocalCache" + platform).resolve(parts[1]);
+                case "tools" -> resolve("source:tools").resolve(parts[1]);
+                default -> throw new IllegalArgumentException("Unknown device path: " + path);
+            };
+        }
+    }
+}
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/HFWTypeFactory.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/HFWTypeFactory.java
index 9438ab5c..4a18211b 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/HFWTypeFactory.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/HFWTypeFactory.java
@@ -12,7 +12,7 @@
 
 public class HFWTypeFactory extends AbstractTypeFactory {
     public HFWTypeFactory() {
-        super(HorizonForbiddenWest.class, MethodHandles.lookup());
+        super(HFW.class, MethodHandles.lookup());
     }
 
     @Override
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/HFWTypeReader.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/HFWTypeReader.java
index c1c5e80a..de02fba2 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/HFWTypeReader.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/HFWTypeReader.java
@@ -3,6 +3,7 @@
 import sh.adelessfox.odradek.hashing.HashFunction;
 import sh.adelessfox.odradek.io.BinaryReader;
 import sh.adelessfox.odradek.rtti.*;
+import sh.adelessfox.odradek.rtti.data.TypedObject;
 import sh.adelessfox.odradek.rtti.data.Value;
 import sh.adelessfox.odradek.rtti.factory.TypeFactory;
 import sh.adelessfox.odradek.rtti.io.AbstractTypeReader;
@@ -11,18 +12,13 @@
 import java.lang.invoke.VarHandle;
 import java.nio.charset.StandardCharsets;
 
-import static sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.RTTIRefObject;
-
 public class HFWTypeReader extends AbstractTypeReader {
-    public record ObjectInfo(ClassTypeInfo type, RTTIRefObject object) {
-    }
-
     public static <T> T readCompound(Class<T> cls, BinaryReader reader, TypeFactory factory) throws IOException {
         var type = factory.get(cls.getSimpleName()).asClass();
         return cls.cast(new HFWTypeReader().readCompound(type, reader, factory));
     }
 
-    public ObjectInfo readObject(BinaryReader reader, TypeFactory factory) throws IOException {
+    public TypedObject readObject(BinaryReader reader, TypeFactory factory) throws IOException {
         var hash = reader.readLong();
         var size = reader.readInt();
         var type = factory.get(HFWTypeId.of(hash)).asClass();
@@ -35,11 +31,12 @@ public ObjectInfo readObject(BinaryReader reader, TypeFactory factory) throws IO
             throw new IllegalStateException("Size mismatch for %s: %d (actual) != %d (expected)".formatted(type.name(), end - start, size));
         }
 
-        if (!(object instanceof RTTIRefObject refObject)) {
-            throw new IllegalStateException("Expected RTTIRefObject, got " + type.name());
+        int numLinks = reader.readInt();
+        if (numLinks != 0) {
+            throw new IllegalStateException("Expected 0 links, got " + numLinks);
         }
 
-        return new ObjectInfo(type, refObject);
+        return object;
     }
 
     @Override
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/DataBufferResourceCallback.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/DataBufferResourceCallback.java
index d030ebcb..4f9c2bf4 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/DataBufferResourceCallback.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/DataBufferResourceCallback.java
@@ -1,7 +1,6 @@
 package sh.adelessfox.odradek.game.hfw.rtti.callbacks;
 
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.DataBufferResource;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.EDataBufferFormat;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.io.BinaryReader;
 import sh.adelessfox.odradek.rtti.data.ExtraBinaryDataCallback;
 import sh.adelessfox.odradek.rtti.data.Value;
@@ -9,9 +8,9 @@
 
 import java.io.IOException;
 
-public class DataBufferResourceCallback implements ExtraBinaryDataCallback<DataBufferResource> {
+public class DataBufferResourceCallback implements ExtraBinaryDataCallback<HFW.DataBufferResource> {
     @Override
-    public void deserialize(BinaryReader reader, TypeFactory factory, DataBufferResource object) throws IOException {
+    public void deserialize(BinaryReader reader, TypeFactory factory, HFW.DataBufferResource object) throws IOException {
         var count = reader.readInt();
         if (count == 0) {
             return;
@@ -19,7 +18,7 @@ public void deserialize(BinaryReader reader, TypeFactory factory, DataBufferReso
 
         var streaming = reader.readIntBoolean();
         var flags = reader.readInt();
-        var format = Value.valueOf(EDataBufferFormat.class, reader.readInt());
+        var format = Value.valueOf(HFW.EDataBufferFormat.class, reader.readInt());
         var stride = reader.readInt();
         var data = streaming ? null : reader.readBytes(stride * count);
 
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/DebugMouseCursorPS4Callback.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/DebugMouseCursorPS4Callback.java
index 0b0a36b9..3af6832c 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/DebugMouseCursorPS4Callback.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/DebugMouseCursorPS4Callback.java
@@ -1,15 +1,15 @@
 package sh.adelessfox.odradek.game.hfw.rtti.callbacks;
 
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.DebugMouseCursorPS4;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.io.BinaryReader;
 import sh.adelessfox.odradek.rtti.data.ExtraBinaryDataCallback;
 import sh.adelessfox.odradek.rtti.factory.TypeFactory;
 
 import java.io.IOException;
 
-public class DebugMouseCursorPS4Callback implements ExtraBinaryDataCallback<DebugMouseCursorPS4> {
+public class DebugMouseCursorPS4Callback implements ExtraBinaryDataCallback<HFW.DebugMouseCursorPS4> {
     @Override
-    public void deserialize(BinaryReader reader, TypeFactory factory, DebugMouseCursorPS4 object) throws IOException {
+    public void deserialize(BinaryReader reader, TypeFactory factory, HFW.DebugMouseCursorPS4 object) throws IOException {
         object.stride(reader.readInt());
         object.data(reader.readBytes(reader.readInt()));
     }
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/FacialAnimationDNAResourceCallback.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/FacialAnimationDNAResourceCallback.java
index a7cab4c9..2cdf26e6 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/FacialAnimationDNAResourceCallback.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/FacialAnimationDNAResourceCallback.java
@@ -1,6 +1,6 @@
 package sh.adelessfox.odradek.game.hfw.rtti.callbacks;
 
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.FacialAnimationDNAResource;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.io.BinaryReader;
 import sh.adelessfox.odradek.middleware.riglogic.RigLogic;
 import sh.adelessfox.odradek.rtti.data.ExtraBinaryDataCallback;
@@ -9,9 +9,9 @@
 import java.io.IOException;
 import java.nio.ByteOrder;
 
-public class FacialAnimationDNAResourceCallback implements ExtraBinaryDataCallback<FacialAnimationDNAResource> {
+public class FacialAnimationDNAResourceCallback implements ExtraBinaryDataCallback<HFW.FacialAnimationDNAResource> {
     @Override
-    public void deserialize(BinaryReader reader, TypeFactory factory, FacialAnimationDNAResource object) throws IOException {
+    public void deserialize(BinaryReader reader, TypeFactory factory, HFW.FacialAnimationDNAResource object) throws IOException {
         reader.order(ByteOrder.BIG_ENDIAN);
         var rigLogic = RigLogic.read(reader); // FIXME: Not used now
         reader.order(ByteOrder.LITTLE_ENDIAN);
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/IndexArrayResourceCallback.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/IndexArrayResourceCallback.java
index c87b2347..6596a1ef 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/IndexArrayResourceCallback.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/IndexArrayResourceCallback.java
@@ -1,23 +1,21 @@
 package sh.adelessfox.odradek.game.hfw.rtti.callbacks;
 
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.game.hfw.rtti.HFWTypeReader;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.EIndexFormat;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.IndexArrayResource;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.MurmurHashValue;
 import sh.adelessfox.odradek.io.BinaryReader;
 import sh.adelessfox.odradek.rtti.data.ExtraBinaryDataCallback;
 import sh.adelessfox.odradek.rtti.factory.TypeFactory;
 
 import java.io.IOException;
 
-public class IndexArrayResourceCallback implements ExtraBinaryDataCallback<IndexArrayResource> {
+public class IndexArrayResourceCallback implements ExtraBinaryDataCallback<HFW.IndexArrayResource> {
     @Override
-    public void deserialize(BinaryReader reader, TypeFactory factory, IndexArrayResource object) throws IOException {
+    public void deserialize(BinaryReader reader, TypeFactory factory, HFW.IndexArrayResource object) throws IOException {
         var count = reader.readInt();
         var flags = reader.readInt();
-        var format = EIndexFormat.valueOf(reader.readInt());
+        var format = HFW.EIndexFormat.valueOf(reader.readInt());
         var streaming = reader.readIntBoolean();
-        var hash = HFWTypeReader.readCompound(MurmurHashValue.class, reader, factory);
+        var hash = HFWTypeReader.readCompound(HFW.MurmurHashValue.class, reader, factory);
         var data = streaming ? null : reader.readBytes(count * format.stride());
 
         object.count(count);
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/LocalizedTextResourceCallback.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/LocalizedTextResourceCallback.java
index c79dba5e..f782e0f8 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/LocalizedTextResourceCallback.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/LocalizedTextResourceCallback.java
@@ -1,6 +1,6 @@
 package sh.adelessfox.odradek.game.hfw.rtti.callbacks;
 
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.LocalizedTextResource;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.game.hfw.rtti.extensions.ELanguageExtension;
 import sh.adelessfox.odradek.io.BinaryReader;
 import sh.adelessfox.odradek.rtti.data.ExtraBinaryDataCallback;
@@ -9,9 +9,9 @@
 import java.io.IOException;
 import java.util.ArrayList;
 
-public class LocalizedTextResourceCallback implements ExtraBinaryDataCallback<LocalizedTextResource> {
+public class LocalizedTextResourceCallback implements ExtraBinaryDataCallback<HFW.LocalizedTextResource> {
     @Override
-    public void deserialize(BinaryReader reader, TypeFactory factory, LocalizedTextResource object) throws IOException {
+    public void deserialize(BinaryReader reader, TypeFactory factory, HFW.LocalizedTextResource object) throws IOException {
         var count = ELanguageExtension.writtenLanguages().size();
         var texts = new ArrayList<String>(count);
         for (int i = 0; i < count; i++) {
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/MorphemeAnimationCallback.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/MorphemeAnimationCallback.java
index 0bc68412..93fc8798 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/MorphemeAnimationCallback.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/MorphemeAnimationCallback.java
@@ -1,18 +1,17 @@
 package sh.adelessfox.odradek.game.hfw.rtti.callbacks;
 
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.game.hfw.rtti.HFWTypeReader;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.MorphemeAnimation;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.MurmurHashValue;
 import sh.adelessfox.odradek.io.BinaryReader;
 import sh.adelessfox.odradek.rtti.data.ExtraBinaryDataCallback;
 import sh.adelessfox.odradek.rtti.factory.TypeFactory;
 
 import java.io.IOException;
 
-public class MorphemeAnimationCallback implements ExtraBinaryDataCallback<MorphemeAnimation> {
+public class MorphemeAnimationCallback implements ExtraBinaryDataCallback<HFW.MorphemeAnimation> {
     @Override
-    public void deserialize(BinaryReader reader, TypeFactory factory, MorphemeAnimation object) throws IOException {
+    public void deserialize(BinaryReader reader, TypeFactory factory, HFW.MorphemeAnimation object) throws IOException {
         object.data(reader.readBytes(reader.readInt()));
-        object.hash(HFWTypeReader.readCompound(MurmurHashValue.class, reader, factory));
+        object.hash(HFWTypeReader.readCompound(HFW.MurmurHashValue.class, reader, factory));
     }
 }
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/MorphemeAssetCallback.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/MorphemeAssetCallback.java
index fd66f543..b0d5af16 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/MorphemeAssetCallback.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/MorphemeAssetCallback.java
@@ -1,15 +1,15 @@
 package sh.adelessfox.odradek.game.hfw.rtti.callbacks;
 
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.MorphemeAsset;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.io.BinaryReader;
 import sh.adelessfox.odradek.rtti.data.ExtraBinaryDataCallback;
 import sh.adelessfox.odradek.rtti.factory.TypeFactory;
 
 import java.io.IOException;
 
-public class MorphemeAssetCallback implements ExtraBinaryDataCallback<MorphemeAsset> {
+public class MorphemeAssetCallback implements ExtraBinaryDataCallback<HFW.MorphemeAsset> {
     @Override
-    public void deserialize(BinaryReader reader, TypeFactory factory, MorphemeAsset object) throws IOException {
+    public void deserialize(BinaryReader reader, TypeFactory factory, HFW.MorphemeAsset object) throws IOException {
         object.data(reader.readBytes(reader.readInt()));
         object.unk01(reader.readInt());
         object.unk02(reader.readInt());
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/MorphemeNetworkDefResourceCallback.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/MorphemeNetworkDefResourceCallback.java
index 6f6c5efd..29b71682 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/MorphemeNetworkDefResourceCallback.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/MorphemeNetworkDefResourceCallback.java
@@ -1,15 +1,15 @@
 package sh.adelessfox.odradek.game.hfw.rtti.callbacks;
 
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.MorphemeNetworkDefResource;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.io.BinaryReader;
 import sh.adelessfox.odradek.rtti.data.ExtraBinaryDataCallback;
 import sh.adelessfox.odradek.rtti.factory.TypeFactory;
 
 import java.io.IOException;
 
-public class MorphemeNetworkDefResourceCallback implements ExtraBinaryDataCallback<MorphemeNetworkDefResource> {
+public class MorphemeNetworkDefResourceCallback implements ExtraBinaryDataCallback<HFW.MorphemeNetworkDefResource> {
     @Override
-    public void deserialize(BinaryReader reader, TypeFactory factory, MorphemeNetworkDefResource object) throws IOException {
+    public void deserialize(BinaryReader reader, TypeFactory factory, HFW.MorphemeNetworkDefResource object) throws IOException {
         // does nothing
     }
 }
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/MorphemeNetworkInstancePreInitializedDataCallback.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/MorphemeNetworkInstancePreInitializedDataCallback.java
index 0f4beccb..d3753084 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/MorphemeNetworkInstancePreInitializedDataCallback.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/MorphemeNetworkInstancePreInitializedDataCallback.java
@@ -1,15 +1,15 @@
 package sh.adelessfox.odradek.game.hfw.rtti.callbacks;
 
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.MorphemeNetworkInstancePreInitializedData;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.io.BinaryReader;
 import sh.adelessfox.odradek.rtti.data.ExtraBinaryDataCallback;
 import sh.adelessfox.odradek.rtti.factory.TypeFactory;
 
 import java.io.IOException;
 
-public class MorphemeNetworkInstancePreInitializedDataCallback implements ExtraBinaryDataCallback<MorphemeNetworkInstancePreInitializedData> {
+public class MorphemeNetworkInstancePreInitializedDataCallback implements ExtraBinaryDataCallback<HFW.MorphemeNetworkInstancePreInitializedData> {
     @Override
-    public void deserialize(BinaryReader reader, TypeFactory factory, MorphemeNetworkInstancePreInitializedData object) throws IOException {
+    public void deserialize(BinaryReader reader, TypeFactory factory, HFW.MorphemeNetworkInstancePreInitializedData object) throws IOException {
         var count = reader.readInt();
         var unk04 = reader.readInt();
         if (unk04 != 4) {
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/PhysicsRagdollResourceCallback.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/PhysicsRagdollResourceCallback.java
index 7bdd5f86..90fb2477 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/PhysicsRagdollResourceCallback.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/PhysicsRagdollResourceCallback.java
@@ -1,6 +1,6 @@
 package sh.adelessfox.odradek.game.hfw.rtti.callbacks;
 
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.PhysicsRagdollResource;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.io.BinaryReader;
 import sh.adelessfox.odradek.middleware.jolt.physics.ragdoll.RagdollSettings;
 import sh.adelessfox.odradek.rtti.data.ExtraBinaryDataCallback;
@@ -8,9 +8,9 @@
 
 import java.io.IOException;
 
-public class PhysicsRagdollResourceCallback implements ExtraBinaryDataCallback<PhysicsRagdollResource> {
+public class PhysicsRagdollResourceCallback implements ExtraBinaryDataCallback<HFW.PhysicsRagdollResource> {
     @Override
-    public void deserialize(BinaryReader reader, TypeFactory factory, PhysicsRagdollResource object) throws IOException {
+    public void deserialize(BinaryReader reader, TypeFactory factory, HFW.PhysicsRagdollResource object) throws IOException {
         // FIXME: Skipped for now
         var ragdoll = RagdollSettings.sRestoreFromBinaryState(reader);
     }
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/PhysicsShapeResourceCallback.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/PhysicsShapeResourceCallback.java
index 0c5e60e5..032c97ac 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/PhysicsShapeResourceCallback.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/PhysicsShapeResourceCallback.java
@@ -1,6 +1,6 @@
 package sh.adelessfox.odradek.game.hfw.rtti.callbacks;
 
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.PhysicsShapeResource;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.io.BinaryReader;
 import sh.adelessfox.odradek.middleware.jolt.physics.collision.PhysicsMaterial;
 import sh.adelessfox.odradek.middleware.jolt.physics.collision.shape.Shape;
@@ -11,9 +11,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class PhysicsShapeResourceCallback implements ExtraBinaryDataCallback<PhysicsShapeResource> {
+public class PhysicsShapeResourceCallback implements ExtraBinaryDataCallback<HFW.PhysicsShapeResource> {
     @Override
-    public void deserialize(BinaryReader reader, TypeFactory factory, PhysicsShapeResource object) throws IOException {
+    public void deserialize(BinaryReader reader, TypeFactory factory, HFW.PhysicsShapeResource object) throws IOException {
         var shapeMap = new ArrayList<Shape>();
         shapeMap.add(null);
 
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/PoseCallback.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/PoseCallback.java
index b2d1f7ac..2ea9ca27 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/PoseCallback.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/PoseCallback.java
@@ -1,22 +1,20 @@
 package sh.adelessfox.odradek.game.hfw.rtti.callbacks;
 
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.game.hfw.rtti.HFWTypeReader;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.Pose;
 import sh.adelessfox.odradek.io.BinaryReader;
 import sh.adelessfox.odradek.rtti.data.ExtraBinaryDataCallback;
 import sh.adelessfox.odradek.rtti.factory.TypeFactory;
 
 import java.io.IOException;
 
-import static sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.Mat34;
-
-public class PoseCallback implements ExtraBinaryDataCallback<Pose> {
+public class PoseCallback implements ExtraBinaryDataCallback<HFW.Pose> {
     @Override
-    public void deserialize(BinaryReader reader, TypeFactory factory, Pose object) throws IOException {
+    public void deserialize(BinaryReader reader, TypeFactory factory, HFW.Pose object) throws IOException {
         if (reader.readByteBoolean()) {
             var count1 = reader.readInt();
-            object.unk01(reader.readObjects(count1, r -> HFWTypeReader.readCompound(Mat34.class, r, factory)));
-            object.unk02(reader.readObjects(count1, r -> HFWTypeReader.readCompound(Mat34.class, r, factory)));
+            object.unk01(reader.readObjects(count1, r -> HFWTypeReader.readCompound(HFW.Mat34.class, r, factory)));
+            object.unk02(reader.readObjects(count1, r -> HFWTypeReader.readCompound(HFW.Mat34.class, r, factory)));
 
             var count2 = reader.readInt();
             object.unk03(reader.readInts(count2));
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/ShaderResourceCallback.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/ShaderResourceCallback.java
index 867ce81b..631db201 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/ShaderResourceCallback.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/ShaderResourceCallback.java
@@ -1,19 +1,18 @@
 package sh.adelessfox.odradek.game.hfw.rtti.callbacks;
 
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.game.hfw.rtti.HFWTypeReader;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.MurmurHashValue;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.ShaderResource;
 import sh.adelessfox.odradek.io.BinaryReader;
 import sh.adelessfox.odradek.rtti.data.ExtraBinaryDataCallback;
 import sh.adelessfox.odradek.rtti.factory.TypeFactory;
 
 import java.io.IOException;
 
-public class ShaderResourceCallback implements ExtraBinaryDataCallback<ShaderResource> {
+public class ShaderResourceCallback implements ExtraBinaryDataCallback<HFW.ShaderResource> {
     @Override
-    public void deserialize(BinaryReader reader, TypeFactory factory, ShaderResource object) throws IOException {
+    public void deserialize(BinaryReader reader, TypeFactory factory, HFW.ShaderResource object) throws IOException {
         var size = reader.readInt();
-        object.hash(HFWTypeReader.readCompound(MurmurHashValue.class, reader, factory));
+        object.hash(HFWTypeReader.readCompound(HFW.MurmurHashValue.class, reader, factory));
         object.data(reader.readBytes(size));
     }
 }
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/StaticTileCallback.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/StaticTileCallback.java
index 9189e6d3..efa8a67e 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/StaticTileCallback.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/StaticTileCallback.java
@@ -1,22 +1,20 @@
 package sh.adelessfox.odradek.game.hfw.rtti.callbacks;
 
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.game.hfw.rtti.HFWTypeReader;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.Mat34;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.Mat44;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.StaticTile;
 import sh.adelessfox.odradek.io.BinaryReader;
 import sh.adelessfox.odradek.rtti.data.ExtraBinaryDataCallback;
 import sh.adelessfox.odradek.rtti.factory.TypeFactory;
 
 import java.io.IOException;
 
-public class StaticTileCallback implements ExtraBinaryDataCallback<StaticTile> {
+public class StaticTileCallback implements ExtraBinaryDataCallback<HFW.StaticTile> {
     @Override
-    public void deserialize(BinaryReader reader, TypeFactory factory, StaticTile object) throws IOException {
+    public void deserialize(BinaryReader reader, TypeFactory factory, HFW.StaticTile object) throws IOException {
         object.unk01(reader.readBytes(reader.readInt() * 20));
-        object.unk02(reader.readObjects(reader.readInt(), r -> HFWTypeReader.readCompound(Mat44.class, r, factory)));
+        object.unk02(reader.readObjects(reader.readInt(), r -> HFWTypeReader.readCompound(HFW.Mat44.class, r, factory)));
         object.unk03(reader.readBytes(reader.readInt() * 12));
         object.unk04(reader.readBytes(reader.readInt() * 16));
-        object.unk05(reader.readObjects(reader.readInt(), r -> HFWTypeReader.readCompound(Mat34.class, r, factory)));
+        object.unk05(reader.readObjects(reader.readInt(), r -> HFWTypeReader.readCompound(HFW.Mat34.class, r, factory)));
     }
 }
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/TextureCallback.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/TextureCallback.java
index 64efb613..976fb74c 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/TextureCallback.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/TextureCallback.java
@@ -1,50 +1,50 @@
 package sh.adelessfox.odradek.game.hfw.rtti.callbacks;
 
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.game.hfw.rtti.HFWTypeReader;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.*;
 import sh.adelessfox.odradek.io.BinaryReader;
 import sh.adelessfox.odradek.rtti.data.ExtraBinaryDataCallback;
 import sh.adelessfox.odradek.rtti.factory.TypeFactory;
 
 import java.io.IOException;
 
-public class TextureCallback implements ExtraBinaryDataCallback<Texture> {
+public class TextureCallback implements ExtraBinaryDataCallback<HFW.Texture> {
     @Override
-    public void deserialize(BinaryReader reader, TypeFactory factory, Texture object) throws IOException {
+    public void deserialize(BinaryReader reader, TypeFactory factory, HFW.Texture object) throws IOException {
         read(reader, factory, object);
     }
 
-    static TextureInfo read(BinaryReader reader, TypeFactory factory) throws IOException {
-        var object = factory.newInstance(TextureInfo.class);
+    static HFW.TextureInfo read(BinaryReader reader, TypeFactory factory) throws IOException {
+        var object = factory.newInstance(HFW.TextureInfo.class);
         read(reader, factory, object);
         return object;
     }
 
-    private static void read(BinaryReader reader, TypeFactory factory, TextureInfo object) throws IOException {
+    private static void read(BinaryReader reader, TypeFactory factory, HFW.TextureInfo object) throws IOException {
         object.header(readHeader(reader, factory));
         object.data(readData(reader, factory));
     }
 
-    private static TextureHeader readHeader(BinaryReader reader, TypeFactory factory) throws IOException {
-        var header = factory.newInstance(TextureHeader.class);
-        header.type(ETextureType.valueOf(reader.readShort()));
+    private static HFW.TextureHeader readHeader(BinaryReader reader, TypeFactory factory) throws IOException {
+        var header = factory.newInstance(HFW.TextureHeader.class);
+        header.type(HFW.ETextureType.valueOf(reader.readShort()));
         header.width(reader.readShort());
         header.height(reader.readShort());
         header.numSurfaces(reader.readShort());
         header.numMips(reader.readByte());
-        header.pixelFormat(EPixelFormat.valueOf(reader.readByte()));
+        header.pixelFormat(HFW.EPixelFormat.valueOf(reader.readByte()));
         header.unk0A(reader.readByte());
-        header.colorSpace(ETexColorSpace.valueOf(reader.readByte()));
+        header.colorSpace(HFW.ETexColorSpace.valueOf(reader.readByte()));
         header.unk0C(reader.readByte());
         header.unk0D(reader.readByte());
         header.unk0E(reader.readByte());
         header.unk0F(reader.readByte());
-        header.hash(HFWTypeReader.readCompound(MurmurHashValue.class, reader, factory));
+        header.hash(HFWTypeReader.readCompound(HFW.MurmurHashValue.class, reader, factory));
         return header;
     }
 
-    private static TextureData readData(BinaryReader reader, TypeFactory factory) throws IOException {
-        var data = factory.newInstance(TextureData.class);
+    private static HFW.TextureData readData(BinaryReader reader, TypeFactory factory) throws IOException {
+        var data = factory.newInstance(HFW.TextureData.class);
         data.totalSize(reader.readInt());
         data.embeddedSize(reader.readInt());
         data.streamedSize(reader.readInt());
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/TextureListCallback.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/TextureListCallback.java
index f1edacbb..848aea17 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/TextureListCallback.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/TextureListCallback.java
@@ -1,21 +1,20 @@
 package sh.adelessfox.odradek.game.hfw.rtti.callbacks;
 
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.TextureList;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.TextureListEntryInfo;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.io.BinaryReader;
 import sh.adelessfox.odradek.rtti.data.ExtraBinaryDataCallback;
 import sh.adelessfox.odradek.rtti.factory.TypeFactory;
 
 import java.io.IOException;
 
-public class TextureListCallback implements ExtraBinaryDataCallback<TextureList> {
+public class TextureListCallback implements ExtraBinaryDataCallback<HFW.TextureList> {
     @Override
-    public void deserialize(BinaryReader reader, TypeFactory factory, TextureList object) throws IOException {
+    public void deserialize(BinaryReader reader, TypeFactory factory, HFW.TextureList object) throws IOException {
         object.entries(reader.readObjects(reader.readInt(), r -> readEntry(r, factory)));
     }
 
-    static TextureListEntryInfo readEntry(BinaryReader reader, TypeFactory factory) throws IOException {
-        var entry = factory.newInstance(TextureListEntryInfo.class);
+    static HFW.TextureListEntryInfo readEntry(BinaryReader reader, TypeFactory factory) throws IOException {
+        var entry = factory.newInstance(HFW.TextureListEntryInfo.class);
         entry.streamingOffset(reader.readInt());
         entry.streamingLength(reader.readInt());
         entry.texture(TextureCallback.read(reader, factory));
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/UITextureCallback.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/UITextureCallback.java
index 27cdd408..87c40177 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/UITextureCallback.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/UITextureCallback.java
@@ -1,15 +1,15 @@
 package sh.adelessfox.odradek.game.hfw.rtti.callbacks;
 
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.UITexture;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.io.BinaryReader;
 import sh.adelessfox.odradek.rtti.data.ExtraBinaryDataCallback;
 import sh.adelessfox.odradek.rtti.factory.TypeFactory;
 
 import java.io.IOException;
 
-public class UITextureCallback implements ExtraBinaryDataCallback<UITexture> {
+public class UITextureCallback implements ExtraBinaryDataCallback<HFW.UITexture> {
     @Override
-    public void deserialize(BinaryReader reader, TypeFactory factory, UITexture object) throws IOException {
+    public void deserialize(BinaryReader reader, TypeFactory factory, HFW.UITexture object) throws IOException {
         var animated = reader.readByteBoolean();
         object.animated(animated);
 
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/UITextureFramesCallback.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/UITextureFramesCallback.java
index 151a840d..3eeac29e 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/UITextureFramesCallback.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/UITextureFramesCallback.java
@@ -1,33 +1,33 @@
 package sh.adelessfox.odradek.game.hfw.rtti.callbacks;
 
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.game.hfw.rtti.HFWTypeReader;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.*;
 import sh.adelessfox.odradek.io.BinaryReader;
 import sh.adelessfox.odradek.rtti.data.ExtraBinaryDataCallback;
 import sh.adelessfox.odradek.rtti.factory.TypeFactory;
 
 import java.io.IOException;
 
-public class UITextureFramesCallback implements ExtraBinaryDataCallback<UITextureFrames> {
+public class UITextureFramesCallback implements ExtraBinaryDataCallback<HFW.UITextureFrames> {
     @Override
-    public void deserialize(BinaryReader reader, TypeFactory factory, UITextureFrames object) throws IOException {
+    public void deserialize(BinaryReader reader, TypeFactory factory, HFW.UITextureFrames object) throws IOException {
         read(reader, factory, object);
     }
 
-    static UITextureFramesInfo read(BinaryReader reader, TypeFactory factory) throws IOException {
-        var object = factory.newInstance(UITextureFramesInfo.class);
+    static HFW.UITextureFramesInfo read(BinaryReader reader, TypeFactory factory) throws IOException {
+        var object = factory.newInstance(HFW.UITextureFramesInfo.class);
         read(reader, factory, object);
         return object;
     }
 
-    private static void read(BinaryReader reader, TypeFactory factory, UITextureFramesInfo object) throws IOException {
+    private static void read(BinaryReader reader, TypeFactory factory, HFW.UITextureFramesInfo object) throws IOException {
         object.data(reader.readBytes(reader.readInt()));
         object.spans(reader.readLongs(reader.readInt()));
         object.width(reader.readInt());
         object.height(reader.readInt());
-        object.pixelFormat(EPixelFormat.valueOf(reader.readInt()));
-        object.frequency(EUpdateFrequency.valueOf((byte) reader.readInt()));
+        object.pixelFormat(HFW.EPixelFormat.valueOf(reader.readInt()));
+        object.frequency(HFW.EUpdateFrequency.valueOf((byte) reader.readInt()));
         object.size(reader.readInt());
-        object.scale(HFWTypeReader.readCompound(FSize.class, reader, factory));
+        object.scale(HFWTypeReader.readCompound(HFW.FSize.class, reader, factory));
     }
 }
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/VertexArrayResourceCallback.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/VertexArrayResourceCallback.java
index 23827ee5..d4da8961 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/VertexArrayResourceCallback.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/VertexArrayResourceCallback.java
@@ -1,16 +1,16 @@
 package sh.adelessfox.odradek.game.hfw.rtti.callbacks;
 
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.game.hfw.rtti.HFWTypeReader;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.*;
 import sh.adelessfox.odradek.io.BinaryReader;
 import sh.adelessfox.odradek.rtti.data.ExtraBinaryDataCallback;
 import sh.adelessfox.odradek.rtti.factory.TypeFactory;
 
 import java.io.IOException;
 
-public class VertexArrayResourceCallback implements ExtraBinaryDataCallback<VertexArrayResource> {
+public class VertexArrayResourceCallback implements ExtraBinaryDataCallback<HFW.VertexArrayResource> {
     @Override
-    public void deserialize(BinaryReader reader, TypeFactory factory, VertexArrayResource object) throws IOException {
+    public void deserialize(BinaryReader reader, TypeFactory factory, HFW.VertexArrayResource object) throws IOException {
         var numVertices = reader.readInt();
         var numStreams = reader.readInt();
         var streaming = reader.readByteBoolean();
@@ -21,7 +21,7 @@ public void deserialize(BinaryReader reader, TypeFactory factory, VertexArrayRes
         object.isStreaming(streaming);
     }
 
-    private static VertexArrayStreamInfo readVertexStream(
+    private static HFW.VertexArrayStreamInfo readVertexStream(
         BinaryReader reader,
         TypeFactory factory,
         int numVertices,
@@ -30,10 +30,10 @@ private static VertexArrayStreamInfo readVertexStream(
         var flags = reader.readInt();
         var stride = reader.readInt();
         var elements = reader.readObjects(reader.readInt(), r -> readVertexStreamElement(r, factory));
-        var hash = HFWTypeReader.readCompound(MurmurHashValue.class, reader, factory);
+        var hash = HFWTypeReader.readCompound(HFW.MurmurHashValue.class, reader, factory);
         var data = streaming ? null : reader.readBytes(stride * numVertices);
 
-        var stream = factory.newInstance(VertexArrayStreamInfo.class);
+        var stream = factory.newInstance(HFW.VertexArrayStreamInfo.class);
         stream.flags(flags);
         stream.stride(stride);
         stream.elements(elements);
@@ -43,16 +43,16 @@ private static VertexArrayStreamInfo readVertexStream(
         return stream;
     }
 
-    private static VertexArrayStreamElementInfo readVertexStreamElement(
+    private static HFW.VertexArrayStreamElementInfo readVertexStreamElement(
         BinaryReader reader,
         TypeFactory factory
     ) throws IOException {
         var offset = reader.readByte();
-        var storageType = EVertexElementStorageType.valueOf(reader.readByte());
+        var storageType = HFW.EVertexElementStorageType.valueOf(reader.readByte());
         var slotsUsed = reader.readByte();
-        var element = EVertexElement.valueOf(reader.readByte());
+        var element = HFW.EVertexElement.valueOf(reader.readByte());
 
-        var object = factory.newInstance(VertexArrayStreamElementInfo.class);
+        var object = factory.newInstance(HFW.VertexArrayStreamElementInfo.class);
         object.offset(offset);
         object.storageType(storageType);
         object.slotsUsed(slotsUsed);
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/WorldMapSuperTileCallback.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/WorldMapSuperTileCallback.java
index ee5fed38..a53a7e68 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/WorldMapSuperTileCallback.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/callbacks/WorldMapSuperTileCallback.java
@@ -1,7 +1,6 @@
 package sh.adelessfox.odradek.game.hfw.rtti.callbacks;
 
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.TextureInfo;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.WorldMapSuperTile;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.io.BinaryReader;
 import sh.adelessfox.odradek.rtti.data.ExtraBinaryDataCallback;
 import sh.adelessfox.odradek.rtti.factory.TypeFactory;
@@ -9,15 +8,15 @@
 import java.io.IOException;
 import java.util.ArrayList;
 
-public class WorldMapSuperTileCallback implements ExtraBinaryDataCallback<WorldMapSuperTile> {
+public class WorldMapSuperTileCallback implements ExtraBinaryDataCallback<HFW.WorldMapSuperTile> {
     @Override
-    public void deserialize(BinaryReader reader, TypeFactory factory, WorldMapSuperTile object) throws IOException {
+    public void deserialize(BinaryReader reader, TypeFactory factory, HFW.WorldMapSuperTile object) throws IOException {
         var smallTextureSize = reader.readInt();
         var largeTextureSize = reader.readInt();
         var mask = reader.readInt();
 
-        var smallTextures = new ArrayList<TextureInfo>(4);
-        var largeTextures = new ArrayList<TextureInfo>(4);
+        var smallTextures = new ArrayList<HFW.TextureInfo>(4);
+        var largeTextures = new ArrayList<HFW.TextureInfo>(4);
 
         if (smallTextureSize > 0) {
             for (int i = 0; i < 4; i++) {
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/data/HwShader.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/data/HwShader.java
index 5bfcd50e..2a53acc9 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/data/HwShader.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/data/HwShader.java
@@ -1,6 +1,6 @@
 package sh.adelessfox.odradek.game.hfw.rtti.data;
 
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.io.BinaryReader;
 
 import java.io.IOException;
@@ -9,7 +9,7 @@
 public record HwShader(
     int unk00,
     int unk04,
-    HorizonForbiddenWest.EProgramTypeMask programTypeMask,
+    HFW.EProgramTypeMask programTypeMask,
     int unk0C,
     int unk10,
     List<HwShaderProgram> programs,
@@ -22,7 +22,7 @@ public record HwShader(
     public static HwShader read(BinaryReader reader) throws IOException {
         var unk00 = reader.readInt();
         var unk04 = reader.readInt();
-        var programTypeMask = HorizonForbiddenWest.EProgramTypeMask.valueOf(reader.readInt());
+        var programTypeMask = HFW.EProgramTypeMask.valueOf(reader.readInt());
         var unk0C = reader.readInt();
         var unk10 = reader.readInt();
         var programs = reader.readObjects(reader.readInt(), HwShaderProgram::read);
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/data/HwShaderProgram.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/data/HwShaderProgram.java
index a892311f..4ef3208c 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/data/HwShaderProgram.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/data/HwShaderProgram.java
@@ -1,6 +1,6 @@
 package sh.adelessfox.odradek.game.hfw.rtti.data;
 
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.io.BinaryReader;
 
 import java.io.IOException;
@@ -11,7 +11,7 @@ public record HwShaderProgram(
     int unk08,
     int unk0C,
     int unk10,
-    HorizonForbiddenWest.EProgramType type,
+    HFW.EProgramType type,
     int unk18,
     int shaderModel,
     int unk20,
@@ -27,7 +27,7 @@ public static HwShaderProgram read(BinaryReader reader) throws IOException {
         var unk08 = reader.readInt();
         var unk0C = reader.readInt();
         var unk10 = reader.readInt();
-        var type = HorizonForbiddenWest.EProgramType.valueOf(reader.readInt());
+        var type = HFW.EProgramType.valueOf(reader.readInt());
         var unk18 = reader.readInt();
         var shaderModel = reader.readInt();
         var unk20 = reader.readInt();
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/data/TextureSetPackingChannel.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/data/TextureSetPackingChannel.java
index a595f72a..cb908d3d 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/data/TextureSetPackingChannel.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/data/TextureSetPackingChannel.java
@@ -1,21 +1,20 @@
 package sh.adelessfox.odradek.game.hfw.rtti.data;
 
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.ETextureSetChannel;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.ETextureSetType;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.rtti.data.Value;
 
 import java.util.Optional;
 
-public record TextureSetPackingChannel(Optional<ETextureSetChannel> channel, ETextureSetType type) {
+public record TextureSetPackingChannel(Optional<HFW.ETextureSetChannel> channel, HFW.ETextureSetType type) {
     public static Optional<TextureSetPackingChannel> of(int packingInfo) {
-        var type = ETextureSetType.valueOf(packingInfo & 0xf);
-        if (type == ETextureSetType.Invalid) {
+        var type = HFW.ETextureSetType.valueOf(packingInfo & 0xf);
+        if (type == HFW.ETextureSetType.Invalid) {
             return Optional.empty();
         }
 
-        Optional<ETextureSetChannel> channel;
+        Optional<HFW.ETextureSetChannel> channel;
         if ((packingInfo & 0x80) == 0) {
-            channel = Value.valueOf(ETextureSetChannel.class, packingInfo >>> 4).tryUnwrap();
+            channel = Value.valueOf(HFW.ETextureSetChannel.class, packingInfo >>> 4).tryUnwrap();
         } else {
             channel = Optional.empty();
         }
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/data/ref/CPtr.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/data/ref/CPtr.java
index 585ef36d..e1c9cf6e 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/data/ref/CPtr.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/data/ref/CPtr.java
@@ -1,9 +1,9 @@
 package sh.adelessfox.odradek.game.hfw.rtti.data.ref;
 
-import sh.adelessfox.odradek.game.ObjectHolder;
-import sh.adelessfox.odradek.game.ObjectId;
+import sh.adelessfox.odradek.game.decima.ObjectId;
+import sh.adelessfox.odradek.game.decima.ObjectWithIdHolder;
 
-public record CPtr<T>(ObjectId objectId, T object) implements ObjectHolder<T> {
+public record CPtr<T>(ObjectId objectId, T object) implements ObjectWithIdHolder<T> {
     @Override
     public boolean equals(Object obj) {
         if (this == obj) {
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/data/ref/Ref.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/data/ref/Ref.java
index f0e908a7..82264d1b 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/data/ref/Ref.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/data/ref/Ref.java
@@ -1,12 +1,12 @@
 package sh.adelessfox.odradek.game.hfw.rtti.data.ref;
 
-import sh.adelessfox.odradek.game.ObjectHolder;
-import sh.adelessfox.odradek.game.ObjectId;
+import sh.adelessfox.odradek.game.decima.ObjectId;
+import sh.adelessfox.odradek.game.decima.ObjectWithIdHolder;
 import sh.adelessfox.odradek.rtti.data.TypedObject;
 
 import java.util.Iterator;
 
-public record Ref<T extends TypedObject>(ObjectId objectId, T object) implements ObjectHolder<T> {
+public record Ref<T extends TypedObject>(ObjectId objectId, T object) implements ObjectWithIdHolder<T> {
     public static <T extends TypedObject> Iterable<T> unwrap(Iterable<Ref<T>> iterable) {
         return () -> unwrap(iterable.iterator());
     }
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/data/ref/StreamingRef.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/data/ref/StreamingRef.java
index 80ddd105..cdc24729 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/data/ref/StreamingRef.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/data/ref/StreamingRef.java
@@ -1,7 +1,7 @@
 package sh.adelessfox.odradek.game.hfw.rtti.data.ref;
 
-import sh.adelessfox.odradek.game.ObjectId;
-import sh.adelessfox.odradek.game.ObjectIdHolder;
+import sh.adelessfox.odradek.game.decima.ObjectId;
+import sh.adelessfox.odradek.game.decima.ObjectIdHolder;
 
 @SuppressWarnings("unused")
 public record StreamingRef<T>(ObjectId objectId) implements ObjectIdHolder {
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/data/ref/UUIDRef.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/data/ref/UUIDRef.java
index be4d6dde..090d0b11 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/data/ref/UUIDRef.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/data/ref/UUIDRef.java
@@ -1,9 +1,9 @@
 package sh.adelessfox.odradek.game.hfw.rtti.data.ref;
 
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.GGUUID;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 
 @SuppressWarnings("unused")
-public record UUIDRef<T>(GGUUID uuid) {
+public record UUIDRef<T>(HFW.GGUUID uuid) {
     @Override
     public String toString() {
         return "<uuid ref to " + uuid.toDisplayString() + ">";
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/data/ref/WeakPtr.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/data/ref/WeakPtr.java
index 0a8db116..fb5c2fbc 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/data/ref/WeakPtr.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/data/ref/WeakPtr.java
@@ -1,10 +1,9 @@
 package sh.adelessfox.odradek.game.hfw.rtti.data.ref;
 
-import sh.adelessfox.odradek.game.ObjectHolder;
-import sh.adelessfox.odradek.game.ObjectId;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.RTTIRefObject;
+import sh.adelessfox.odradek.game.decima.ObjectId;
+import sh.adelessfox.odradek.game.decima.ObjectWithIdHolder;
 
-public record WeakPtr<T extends RTTIRefObject>(ObjectId objectId, T object) implements ObjectHolder<T> {
+public record WeakPtr<T>(ObjectId objectId, T object) implements ObjectWithIdHolder<T> {
     @Override
     public boolean equals(Object obj) {
         if (this == obj) {
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/extensions/DrawFlagsExtension.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/extensions/DrawFlagsExtension.java
index 950038fc..366edf2f 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/extensions/DrawFlagsExtension.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/extensions/DrawFlagsExtension.java
@@ -1,57 +1,56 @@
 package sh.adelessfox.odradek.game.hfw.rtti.extensions;
 
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.*;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 
 // TODO: Introduce a mechanism for providing getters/setters for actual properties
 public interface DrawFlagsExtension {
-    default EShadowCastMode castShadows() {
-        var flags = (HorizonForbiddenWest.DrawFlags) this;
-        return EShadowCastMode.valueOf(flags.general().data() & 3);
+    default HFW.EShadowCastMode castShadows() {
+        var flags = (HFW.DrawFlags) this;
+        return HFW.EShadowCastMode.valueOf(flags.general().data() & 3);
     }
 
-    default EShadowCull shadowCullMode() {
-        var flags = (HorizonForbiddenWest.DrawFlags) this;
-        return EShadowCull.valueOf((flags.general().data() >>> 2) & 3);
+    default HFW.EShadowCull shadowCullMode() {
+        var flags = (HFW.DrawFlags) this;
+        return HFW.EShadowCull.valueOf((flags.general().data() >>> 2) & 3);
     }
 
-    default EDrawPartType renderType() {
-        var flags = (HorizonForbiddenWest.DrawFlags) this;
-        return EDrawPartType.valueOf((flags.general().data() >>> 4) & 3);
+    default HFW.EDrawPartType renderType() {
+        var flags = (HFW.DrawFlags) this;
+        return HFW.EDrawPartType.valueOf((flags.general().data() >>> 4) & 3);
     }
 
-    default EViewLayer viewLayer() {
-        var flags = (HorizonForbiddenWest.DrawFlags) this;
-        return EViewLayer.valueOf((flags.general().data() >>> 6) & 3);
+    default HFW.EViewLayer viewLayer() {
+        var flags = (HFW.DrawFlags) this;
+        return HFW.EViewLayer.valueOf((flags.general().data() >>> 6) & 3);
     }
 
     default float shadowBiasMultiplier() {
-        var flags = (HorizonForbiddenWest.DrawFlags) this;
+        var flags = (HFW.DrawFlags) this;
         return Float.float16ToFloat((short) (flags.general().data() >>> 8));
     }
 
-    default EShadowBiasMode shadowBiasMode() {
-        var flags = (HorizonForbiddenWest.DrawFlags) this;
-        return EShadowBiasMode.valueOf((flags.general().data() >>> 24) & 1);
+    default HFW.EShadowBiasMode shadowBiasMode() {
+        var flags = (HFW.DrawFlags) this;
+        return HFW.EShadowBiasMode.valueOf((flags.general().data() >>> 24) & 1);
     }
 
     default boolean disableOcclusionCulling() {
-        var flags = (HorizonForbiddenWest.DrawFlags) this;
+        var flags = (HFW.DrawFlags) this;
         return ((flags.general().data() >>> 25) & 1) != 0;
     }
 
     default boolean disableDepthOnlyPass() {
-        var flags = (HorizonForbiddenWest.DrawFlags) this;
+        var flags = (HFW.DrawFlags) this;
         return ((flags.general().data() >>> 26) & 1) != 0;
     }
 
     default boolean castShadowsInSunCascade0() {
-        var flags = (HorizonForbiddenWest.DrawFlags) this;
+        var flags = (HFW.DrawFlags) this;
         return ((flags.general().data() >>> 28) & 1) != 0;
     }
 
     default boolean castShadowsInSunCascade1() {
-        var flags = (HorizonForbiddenWest.DrawFlags) this;
+        var flags = (HFW.DrawFlags) this;
         return ((flags.general().data() >>> 29) & 1) != 0;
     }
 }
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/extensions/EIndexFormatExtension.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/extensions/EIndexFormatExtension.java
index 38a5e5a5..b454e79f 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/extensions/EIndexFormatExtension.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/extensions/EIndexFormatExtension.java
@@ -1,10 +1,10 @@
 package sh.adelessfox.odradek.game.hfw.rtti.extensions;
 
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.EIndexFormat;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 
 public interface EIndexFormatExtension {
     default int stride() {
-        var indexFormat = (EIndexFormat) this;
+        var indexFormat = (HFW.EIndexFormat) this;
         return switch (indexFormat) {
             case Index16 -> Short.BYTES;
             case Index32 -> Integer.BYTES;
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/extensions/ELanguageExtension.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/extensions/ELanguageExtension.java
index 989e1564..3415a1ff 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/extensions/ELanguageExtension.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/extensions/ELanguageExtension.java
@@ -1,6 +1,6 @@
 package sh.adelessfox.odradek.game.hfw.rtti.extensions;
 
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.ELanguage;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 
 import java.util.Comparator;
 import java.util.List;
@@ -11,21 +11,21 @@ public interface ELanguageExtension {
     int IS_SPOKEN_LANGUAGE = 2;
     int IS_DEFAULT_LANGUAGE = 4;
 
-    static List<ELanguage> writtenLanguages() {
+    static List<HFW.ELanguage> writtenLanguages() {
         class Holder {
-            static final List<ELanguage> languages = Stream.of(ELanguage.values())
-                .filter(ELanguage::isWrittenLanguage)
-                .sorted(Comparator.comparingInt(ELanguage::value))
+            static final List<HFW.ELanguage> languages = Stream.of(HFW.ELanguage.values())
+                .filter(HFW.ELanguage::isWrittenLanguage)
+                .sorted(Comparator.comparingInt(HFW.ELanguage::value))
                 .toList();
         }
         return Holder.languages;
     }
 
-    static List<ELanguage> spokenLanguages() {
+    static List<HFW.ELanguage> spokenLanguages() {
         class Holder {
-            static final List<ELanguage> languages = Stream.of(ELanguage.values())
-                .filter(ELanguage::isSpokenLanguage)
-                .sorted(Comparator.comparingInt(ELanguage::value))
+            static final List<HFW.ELanguage> languages = Stream.of(HFW.ELanguage.values())
+                .filter(HFW.ELanguage::isSpokenLanguage)
+                .sorted(Comparator.comparingInt(HFW.ELanguage::value))
                 .toList();
         }
         return Holder.languages;
@@ -44,7 +44,7 @@ default boolean isDefaultLanguage() {
     }
 
     default int flags() {
-        return switch ((ELanguage) this) {
+        return switch ((HFW.ELanguage) this) {
             case English -> IS_WRITTEN_LANGUAGE | IS_SPOKEN_LANGUAGE | IS_DEFAULT_LANGUAGE;
 
             case French,
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/extensions/GGUUIDExtension.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/extensions/GGUUIDExtension.java
index e1b51831..99332d31 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/extensions/GGUUIDExtension.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/extensions/GGUUIDExtension.java
@@ -1,12 +1,12 @@
 package sh.adelessfox.odradek.game.hfw.rtti.extensions;
 
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.GGUUID;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 
 import java.util.HexFormat;
 
 public interface GGUUIDExtension {
     default String toDisplayString() {
-        var object = (GGUUID) this;
+        var object = (HFW.GGUUID) this;
         var builder = new StringBuilder(36);
         var format = HexFormat.of();
 
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/extensions/LocalizedSimpleSoundResourceExtension.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/extensions/LocalizedSimpleSoundResourceExtension.java
index 77925338..ceb2d369 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/extensions/LocalizedSimpleSoundResourceExtension.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/extensions/LocalizedSimpleSoundResourceExtension.java
@@ -1,12 +1,10 @@
 package sh.adelessfox.odradek.game.hfw.rtti.extensions;
 
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.ELanguage;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.LocalizedDataSource;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.LocalizedSimpleSoundResource;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 
 public interface LocalizedSimpleSoundResourceExtension {
-    default LocalizedDataSource localizedDataSource(ELanguage language) {
-        var resource = (LocalizedSimpleSoundResource) this;
+    default HFW.LocalizedDataSource localizedDataSource(HFW.ELanguage language) {
+        var resource = (HFW.LocalizedSimpleSoundResource) this;
         var index = Math.max(0 /* English */, ELanguageExtension.spokenLanguages().indexOf(language));
         return resource.streaming().localizedDataSources().get(index);
     }
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/extensions/LocalizedTextResourceExtension.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/extensions/LocalizedTextResourceExtension.java
index d663b047..8497bd14 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/extensions/LocalizedTextResourceExtension.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/extensions/LocalizedTextResourceExtension.java
@@ -1,11 +1,10 @@
 package sh.adelessfox.odradek.game.hfw.rtti.extensions;
 
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.ELanguage;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.LocalizedTextResource;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 
 public interface LocalizedTextResourceExtension {
-    default String text(ELanguage language) {
-        var resource = (LocalizedTextResource) this;
+    default String text(HFW.ELanguage language) {
+        var resource = (HFW.LocalizedTextResource) this;
         var index = Math.max(0 /* English */, ELanguageExtension.writtenLanguages().indexOf(language));
         return resource.texts().get(index);
     }
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/extensions/MurmurHashValueExtension.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/extensions/MurmurHashValueExtension.java
index 385af9a5..40d713a0 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/extensions/MurmurHashValueExtension.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/extensions/MurmurHashValueExtension.java
@@ -1,12 +1,12 @@
 package sh.adelessfox.odradek.game.hfw.rtti.extensions;
 
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.MurmurHashValue;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 
 import java.util.HexFormat;
 
 public interface MurmurHashValueExtension {
     default String toDisplayString() {
-        var object = (MurmurHashValue) this;
+        var object = (HFW.MurmurHashValue) this;
         var builder = new StringBuilder(32);
         var format = HexFormat.of();
 
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/extensions/StreamingDataSourceExtension.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/extensions/StreamingDataSourceExtension.java
index 74594fc7..95345dce 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/extensions/StreamingDataSourceExtension.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/rtti/extensions/StreamingDataSourceExtension.java
@@ -1,25 +1,25 @@
 package sh.adelessfox.odradek.game.hfw.rtti.extensions;
 
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.StreamingDataSource;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 
 public interface StreamingDataSourceExtension {
     default int fileId() {
-        var dataSource = (StreamingDataSource) this;
+        var dataSource = (HFW.StreamingDataSource) this;
         return (int) (dataSource.locator() & 0xffffff);
     }
 
     default int fileOffset() {
-        var dataSource = (StreamingDataSource) this;
+        var dataSource = (HFW.StreamingDataSource) this;
         return (int) (dataSource.locator() >>> 24);
     }
 
     default boolean isValid() {
-        var dataSource = (StreamingDataSource) this;
+        var dataSource = (HFW.StreamingDataSource) this;
         return dataSource.channel() != -1 /* EStreamingDataChannel.Invalid */ && dataSource.length() > 0;
     }
 
     default boolean isPresent() {
-        var dataSource = (StreamingDataSource) this;
+        var dataSource = (HFW.StreamingDataSource) this;
         return dataSource.locator() != 0 && dataSource.length() > 0;
     }
 }
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/storage/ObjectStreamingSystem.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/storage/ObjectStreamingSystem.java
deleted file mode 100644
index 0fc93c48..00000000
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/storage/ObjectStreamingSystem.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package sh.adelessfox.odradek.game.hfw.storage;
-
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.StreamingDataSource;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-
-public final class ObjectStreamingSystem {
-    /**
-     * Represents the result of reading a link from the link table.
-     *
-     * @param position The new position of the link in the link table
-     * @param group    The relative subgroup index of a {@code Ref}, or the {@code groupID} of a {@code StreamingRef}
-     * @param index    The index of object within the group
-     */
-    public record LinkReadResult(int position, int group, int index) {
-    }
-
-    private final StorageReadDevice device;
-    private final StreamingGraphResource graph;
-    private final ByteBuffer links;
-
-    public ObjectStreamingSystem(StorageReadDevice device, StreamingGraphResource graph) throws IOException {
-        this.device = device;
-        this.graph = graph;
-        this.links = ByteBuffer.wrap(getFileData(Math.toIntExact(graph.linkTableID()), 0, graph.linkTableSize()));
-    }
-
-    public byte[] getDataSourceData(StreamingDataSource dataSource) throws IOException {
-        return getDataSourceData(dataSource, dataSource.offset(), dataSource.length());
-    }
-
-    public byte[] getDataSourceData(StreamingDataSource dataSource, int offset, int length) throws IOException {
-        return getFileData(dataSource.fileId(), (long) dataSource.fileOffset() + offset, length);
-    }
-
-    public byte[] getFileData(int fileId, long offset, long length) throws IOException {
-        return getFileData(graph.files().get(fileId), offset, length);
-    }
-
-    public byte[] getFileData(String file, long offset, long length) throws IOException {
-        var reader = device.resolve(file);
-        var buffer = new byte[Math.toIntExact(length)];
-
-        if (length == 0) {
-            return buffer;
-        }
-
-        synchronized (reader) {
-            reader.position(offset);
-            reader.readBytes(buffer, 0, buffer.length);
-        }
-
-        return buffer;
-    }
-
-    public StreamingGraphResource graph() {
-        return graph;
-    }
-
-    public LinkReadResult readLink(int position) {
-        return readLink(links.position(position));
-    }
-
-    private static LinkReadResult readLink(ByteBuffer buffer) {
-        int linkIndex;
-        int linkGroup;
-
-        int first = buffer.get();
-        if ((first & 0x40) != 0) {
-            linkGroup = readVarInt(buffer, first & 0xbf);
-            linkIndex = readVarInt(buffer, buffer.get());
-        } else {
-            linkGroup = -1;
-            linkIndex = readVarInt(buffer, first & 0xbf);
-        }
-
-        return new LinkReadResult(buffer.position(), linkGroup, linkIndex);
-    }
-
-    private static int readVarInt(ByteBuffer buffer, int initial) {
-        int temp = initial;
-        int value = initial & 0x7f;
-        while ((temp & 0x80) != 0) {
-            temp = buffer.get();
-            value = (value << 7) | (temp & 0x7f);
-        }
-        return value;
-    }
-}
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/storage/StreamingGraphImpl.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/storage/StreamingGraphImpl.java
new file mode 100644
index 00000000..c391066f
--- /dev/null
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/storage/StreamingGraphImpl.java
@@ -0,0 +1,280 @@
+package sh.adelessfox.odradek.game.hfw.storage;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import sh.adelessfox.odradek.game.decima.StreamingGraph;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
+import sh.adelessfox.odradek.game.hfw.rtti.HFWTypeId;
+import sh.adelessfox.odradek.hashing.HashCode;
+import sh.adelessfox.odradek.hashing.HashFunction;
+import sh.adelessfox.odradek.io.BinaryReader;
+import sh.adelessfox.odradek.rtti.ClassTypeInfo;
+import sh.adelessfox.odradek.rtti.data.TypedObject;
+import sh.adelessfox.odradek.rtti.factory.TypeFactory;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+public final class StreamingGraphImpl implements StreamingGraph {
+    private static final Logger log = LoggerFactory.getLogger(StreamingGraphImpl.class);
+
+    private final HFW.StreamingGraphResource resource;
+
+    private final List<? extends StreamingGraph.Group> groups;
+    private final Map<Integer, StreamingGraph.Group> groupIds;
+    private final List<? extends StreamingGraph.Group> subGroups;
+    private final Map<StreamingGraph.Group, List<StreamingGraph.Group>> superGroups;
+
+    private final List<ClassTypeInfo> typeTable;
+    private final byte[] linkTable;
+
+    private final List<StreamingGraph.Span> spans;
+    private final List<StreamingGraph.Locator> locators;
+    private final List<String> files;
+
+    public StreamingGraphImpl(
+        HFW.StreamingGraphResource graph,
+        StreamingGraphStorage storage,
+        TypeFactory typeFactory
+    ) throws IOException {
+        this.resource = graph;
+
+        groups = computeGroups(this);
+        groupIds = computeGroupIdToGroup(groups);
+        subGroups = computeSubgroups(graph);
+        superGroups = computeGroupToSuperGroups(groups);
+
+        typeTable = readTypeTable(graph, typeFactory);
+        linkTable = readLinkTable(graph, storage);
+
+        spans = computeSpans(graph);
+        locators = computeLocators(graph);
+        files = computeFiles(graph);
+    }
+
+    @Override
+    public List<ClassTypeInfo> types() {
+        return typeTable;
+    }
+
+    @Override
+    public List<? extends StreamingGraph.Group> groups() {
+        return groups;
+    }
+
+    @Override
+    public List<String> files() {
+        return files;
+    }
+
+    @Override
+    public StreamingGraph.Group group(int id) {
+        return Objects.requireNonNull(groupIds.get(id), () -> "Group not found: " + id);
+    }
+
+    @Override
+    public Iterator<StreamingGraph.Link> links(int position) {
+        var buffer = ByteBuffer.wrap(linkTable, position, linkTable.length - position);
+        return new Iterator<>() {
+            @Override
+            public boolean hasNext() {
+                return buffer.hasRemaining();
+            }
+
+            @Override
+            public StreamingGraph.Link next() {
+                return readLink(buffer);
+            }
+        };
+    }
+
+    @Override
+    public HashCode checksum() {
+        return HashFunction.murmur3().hash(linkTable);
+    }
+
+    @Override
+    public TypedObject resource() {
+        return resource;
+    }
+
+    private static List<String> computeFiles(HFW.StreamingGraphResource graph) {
+        return Collections.unmodifiableList(graph.files());
+    }
+
+    private static List<StreamingGraph.Locator> computeLocators(HFW.StreamingGraphResource graph) {
+        return graph.locatorTable().stream()
+            .map(locator -> new StreamingGraph.Locator((int) (locator.data() & 0xffffff), locator.data() >>> 24))
+            .toList();
+    }
+
+    private static List<StreamingGraph.Span> computeSpans(HFW.StreamingGraphResource graph) {
+        return graph.spanTable().stream()
+            .map(span -> new StreamingGraph.Span(span.fileIndexAndIsPatch() & 0x7fffffff, span.offset(), span.length()))
+            .toList();
+    }
+
+    private static List<? extends StreamingGraph.Group> computeGroups(StreamingGraphImpl graph) {
+        return graph.resource.groups().stream()
+            .map(group -> new GroupImpl(graph, group))
+            .toList();
+    }
+
+    private static Map<Integer, StreamingGraph.Group> computeGroupIdToGroup(List<? extends StreamingGraph.Group> groups) {
+        return groups.stream().collect(Collectors.toMap(StreamingGraph.Group::id, Function.identity()));
+    }
+
+    private static Map<StreamingGraph.Group, List<StreamingGraph.Group>> computeGroupToSuperGroups(List<? extends StreamingGraph.Group> groups) {
+        var result = new HashMap<StreamingGraph.Group, List<StreamingGraph.Group>>();
+        for (StreamingGraph.Group group : groups) {
+            for (StreamingGraph.Group subGroup : group.subGroups()) {
+                result.computeIfAbsent(subGroup, _ -> new ArrayList<>()).add(group);
+            }
+        }
+        result.replaceAll((_, parents) -> List.copyOf(parents));
+        return Map.copyOf(result);
+    }
+
+    private List<StreamingGraph.Group> computeSubgroups(HFW.StreamingGraphResource graph) {
+        return IntStream.of(graph.subGroups())
+            .mapToObj(this::group)
+            .toList();
+    }
+
+    private static List<ClassTypeInfo> readTypeTable(
+        HFW.StreamingGraphResource graph,
+        TypeFactory factory
+    ) throws IOException {
+        log.debug("Reading type table");
+
+        var reader = BinaryReader.wrap(graph.typeTableData());
+
+        var compression = reader.readInt();
+        var stride = reader.readInt();
+        var count = reader.readInt();
+        var count2 = reader.readInt();
+        var unk10 = reader.readInt();
+
+        if (compression != 0) {
+            throw new IOException("Unsupported compression: " + compression);
+        }
+        if (stride != 2) {
+            throw new IOException("Unsupported stride: " + stride);
+        }
+        if (count != count2) {
+            throw new IOException("Count mismatch");
+        }
+        if (unk10 != 1) {
+            throw new IOException("Unexpected unknown value: " + unk10);
+        }
+
+        var types = new ArrayList<ClassTypeInfo>(count);
+
+        for (int i = 0; i < count; i++) {
+            var index = Short.toUnsignedInt(reader.readShort());
+            var hash = graph.typeHashes()[index];
+            var type = factory.get(HFWTypeId.of(hash));
+            types.add(type.asClass());
+        }
+
+        return List.copyOf(types);
+    }
+
+    private static byte[] readLinkTable(
+        HFW.StreamingGraphResource graph,
+        StreamingGraphStorage storage
+    ) throws IOException {
+        var file = graph.files().get(Math.toIntExact(graph.linkTableID()));
+        return storage.read(file, 0, graph.linkTableSize());
+    }
+
+    private static StreamingGraph.Link readLink(ByteBuffer buffer) {
+        OptionalInt linkGroup;
+        int linkIndex;
+
+        int first = buffer.get();
+        if ((first & 0x40) != 0) {
+            linkGroup = OptionalInt.of(readVarInt(buffer, first & 0xbf));
+            linkIndex = readVarInt(buffer, buffer.get());
+        } else {
+            linkGroup = OptionalInt.empty();
+            linkIndex = readVarInt(buffer, first & 0xbf);
+        }
+
+        return new StreamingGraph.Link(linkGroup, linkIndex);
+    }
+
+    private static int readVarInt(ByteBuffer buffer, int initial) {
+        int temp = initial;
+        int value = initial & 0x7f;
+        while ((temp & 0x80) != 0) {
+            temp = buffer.get();
+            value = (value << 7) | (temp & 0x7f);
+        }
+        return value;
+    }
+
+    private static final class GroupImpl implements StreamingGraph.Group {
+        private final StreamingGraphImpl graph;
+        private final HFW.StreamingGroupData inner;
+        private final List<Integer> roots;
+
+        private GroupImpl(StreamingGraphImpl graph, HFW.StreamingGroupData inner) {
+            this.graph = graph;
+            this.inner = inner;
+
+            roots = Arrays.stream(graph.resource.rootIndices(), inner.rootStart(), inner.rootStart() + inner.rootCount())
+                .boxed()
+                .toList();
+        }
+
+        @Override
+        public int id() {
+            return inner.groupID();
+        }
+
+        @Override
+        public int typeStart() {
+            return inner.typeStart();
+        }
+
+        @Override
+        public List<? extends StreamingGraph.Group> subGroups() {
+            return graph.subGroups.subList(inner.subGroupStart(), inner.subGroupStart() + inner.subGroupCount());
+        }
+
+        @Override
+        public List<? extends StreamingGraph.Group> superGroups() {
+            return graph.superGroups.getOrDefault(this, List.of());
+        }
+
+        @Override
+        public List<Integer> roots() {
+            return roots;
+        }
+
+        @Override
+        public List<ClassTypeInfo> types() {
+            return graph.typeTable.subList(inner.typeStart(), inner.typeStart() + inner.typeCount());
+        }
+
+        @Override
+        public List<StreamingGraph.Span> spans() {
+            return graph.spans.subList(inner.spanStart(), inner.spanStart() + inner.spanCount());
+        }
+
+        @Override
+        public List<StreamingGraph.Locator> locators() {
+            return graph.locators.subList(inner.locatorStart(), inner.locatorStart() + inner.locatorCount());
+        }
+
+        @Override
+        public Iterator<StreamingGraph.Link> links() {
+            return graph.links(inner.linkStart());
+        }
+    }
+}
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/storage/StreamingGraphResource.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/storage/StreamingGraphResource.java
deleted file mode 100644
index 2ce324ef..00000000
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/storage/StreamingGraphResource.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package sh.adelessfox.odradek.game.hfw.storage;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import sh.adelessfox.odradek.game.hfw.rtti.HFWTypeId;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.GGUUID;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.StreamingDataSourceLocator;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.StreamingGroupData;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.StreamingSourceSpan;
-import sh.adelessfox.odradek.io.BinaryReader;
-import sh.adelessfox.odradek.rtti.ClassTypeInfo;
-import sh.adelessfox.odradek.rtti.factory.TypeFactory;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Stream;
-
-public class StreamingGraphResource {
-    private static final Logger log = LoggerFactory.getLogger(StreamingGraphResource.class);
-
-    private final HorizonForbiddenWest.StreamingGraphResource graph;
-
-    private final List<ClassTypeInfo> types;
-    private final Map<GGUUID, StreamingGroupData> groupByUuid = new HashMap<>(); // RootUUID -> Group
-    private final Map<Integer, StreamingGroupData> groupById = new HashMap<>(); // GroupId -> Group
-    private final Map<GGUUID, Integer> rootIndexByRootUuid = new HashMap<>(); // RootUUIDs -> RootIndices
-
-    private final Map<StreamingGroupData, List<StreamingGroupData>> dependentGroups = new HashMap<>();
-
-    public StreamingGraphResource(HorizonForbiddenWest.StreamingGraphResource graph, TypeFactory factory) throws IOException {
-        this.graph = graph;
-        this.types = readTypeTable(graph, factory);
-
-        var rootUuids = graph.rootUUIDs();
-        var rootIndices = graph.rootIndices();
-        var groups = graph.groups();
-
-        log.debug("Building group index");
-
-        for (var group : groups) {
-            groupById.put(group.groupID(), group);
-
-            for (int i = group.rootStart(); i < group.rootStart() + group.rootCount(); i++) {
-                groupByUuid.put(rootUuids.get(i), group);
-                rootIndexByRootUuid.put(rootUuids.get(i), rootIndices[i]);
-            }
-        }
-
-        for (var group : groups) {
-            for (int i = 0; i < group.subGroupCount(); i++) {
-                var subgroup = group(graph.subGroups()[group.subGroupStart() + i]);
-                dependentGroups.computeIfAbsent(subgroup, _ -> new ArrayList<>()).add(group);
-            }
-        }
-    }
-
-    public HorizonForbiddenWest.StreamingGraphResource resource() {
-        return graph;
-    }
-
-    public long linkTableID() {
-        return graph.linkTableID();
-    }
-
-    public int linkTableSize() {
-        return graph.linkTableSize();
-    }
-
-    public List<String> files() {
-        return graph.files();
-    }
-
-    public List<StreamingSourceSpan> spanTable() {
-        return graph.spanTable();
-    }
-
-    public List<StreamingGroupData> groups() {
-        return graph.groups();
-    }
-
-    public List<GGUUID> rootUUIDs() {
-        return graph.rootUUIDs();
-    }
-
-    public int[] rootIndices() {
-        return graph.rootIndices();
-    }
-
-    public int[] subGroups() {
-        return graph.subGroups();
-    }
-
-    public List<StreamingDataSourceLocator> locatorTable() {
-        return graph.locatorTable();
-    }
-
-    public List<ClassTypeInfo> types() {
-        return types;
-    }
-
-    public Stream<ClassTypeInfo> types(StreamingGroupData group) {
-        return types.subList(group.typeStart(), group.typeStart() + group.typeCount()).stream();
-    }
-
-    public List<StreamingGroupData> incomingGroups(StreamingGroupData group) {
-        return dependentGroups.getOrDefault(group, List.of());
-    }
-
-    public StreamingGroupData group(GGUUID rootUUID) {
-        return groupByUuid.get(rootUUID);
-    }
-
-    public StreamingGroupData group(int groupId) {
-        return groupById.get(groupId);
-    }
-
-    public Integer rootIndex(GGUUID rootUUID) {
-        return rootIndexByRootUuid.get(rootUUID);
-    }
-
-    private static List<ClassTypeInfo> readTypeTable(HorizonForbiddenWest.StreamingGraphResource graph, TypeFactory factory) throws IOException {
-        log.debug("Reading type table");
-
-        var reader = BinaryReader.wrap(graph.typeTableData());
-
-        var compression = reader.readInt();
-        var stride = reader.readInt();
-        var count = reader.readInt();
-        var count2 = reader.readInt();
-        var unk10 = reader.readInt();
-
-        if (compression != 0) {
-            throw new IOException("Unsupported compression: " + compression);
-        }
-        if (stride != 2) {
-            throw new IOException("Unsupported stride: " + stride);
-        }
-        if (count != count2) {
-            throw new IOException("Count mismatch");
-        }
-        if (unk10 != 1) {
-            throw new IOException("Unexpected unknown value: " + unk10);
-        }
-
-        var types = new ArrayList<ClassTypeInfo>(count);
-
-        for (int i = 0; i < count; i++) {
-            var index = Short.toUnsignedInt(reader.readShort());
-            var hash = graph.typeHashes()[index];
-            var type = factory.get(HFWTypeId.of(hash));
-            types.add(type.asClass());
-        }
-
-        return List.copyOf(types);
-    }
-}
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/storage/StorageReadDevice.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/storage/StreamingGraphStorage.java
similarity index 68%
rename from odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/storage/StorageReadDevice.java
rename to odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/storage/StreamingGraphStorage.java
index 53eaa196..85c2695b 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/storage/StorageReadDevice.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/storage/StreamingGraphStorage.java
@@ -2,8 +2,8 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import sh.adelessfox.odradek.game.hfw.game.ForbiddenWestFileSystem;
-import sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.EStreamingDataChannel;
+import sh.adelessfox.odradek.game.decima.DecimaGame;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.io.BinaryReader;
 import sh.adelessfox.odradek.io.DirectStorageReader;
 
@@ -15,15 +15,15 @@
 import java.util.Map;
 import java.util.regex.Pattern;
 
-public final class StorageReadDevice implements Closeable {
-    private static final Logger log = LoggerFactory.getLogger(StorageReadDevice.class);
+public final class StreamingGraphStorage implements Closeable {
+    private static final Logger log = LoggerFactory.getLogger(StreamingGraphStorage.class);
     private static final Pattern PACKAGE_NAME = Pattern.compile("^package\\.(?<channel>\\d+)\\.(?<index>\\d+)\\.core");
 
     private final Map<String, BinaryReader> files = new HashMap<>();
-    private final ForbiddenWestFileSystem fileSystem;
+    private final DecimaGame game;
 
-    public StorageReadDevice(ForbiddenWestFileSystem fileSystem) {
-        this.fileSystem = fileSystem;
+    public StreamingGraphStorage(DecimaGame game) {
+        this.game = game;
     }
 
     public void mount(String file) throws IOException {
@@ -32,7 +32,7 @@ public void mount(String file) throws IOException {
             return;
         }
 
-        Path path = fileSystem.resolve(file);
+        Path path = game.resolvePath(file);
         if (Files.notExists(path)) {
             log.warn("File not found: {}", file);
             return;
@@ -51,13 +51,29 @@ public void mount(String file) throws IOException {
         var filename = path.getFileName().toString();
         var matcher = PACKAGE_NAME.matcher(filename);
         if (matcher.find()) {
-            var channel = EStreamingDataChannel.valueOf(Byte.parseByte(matcher.group("channel")));
+            var channel = HFW.EStreamingDataChannel.valueOf(Byte.parseByte(matcher.group("channel")));
             log.info("Mounted file: {} ({})", file, channel);
         } else {
             log.info("Mounted file: {}", file);
         }
     }
 
+    public byte[] read(String file, long offset, long length) throws IOException {
+        var reader = resolve(file);
+        var buffer = new byte[Math.toIntExact(length)];
+
+        if (length == 0) {
+            return buffer;
+        }
+
+        synchronized (reader) {
+            reader.position(offset);
+            reader.readBytes(buffer, 0, buffer.length);
+        }
+
+        return buffer;
+    }
+
     public BinaryReader resolve(String file) {
         BinaryReader reader = files.get(file);
         if (reader == null) {
diff --git a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/storage/StreamingObjectReader.java b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/storage/StreamingObjectReader.java
index 0c85a965..f322b021 100644
--- a/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/storage/StreamingObjectReader.java
+++ b/odradek-game-hfw/src/main/java/sh/adelessfox/odradek/game/hfw/storage/StreamingObjectReader.java
@@ -2,24 +2,27 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import sh.adelessfox.odradek.game.ObjectId;
+import sh.adelessfox.odradek.game.decima.DecimaGame;
+import sh.adelessfox.odradek.game.decima.ObjectId;
+import sh.adelessfox.odradek.game.decima.StreamingGraph;
+import sh.adelessfox.odradek.game.hfw.rtti.HFW;
 import sh.adelessfox.odradek.game.hfw.rtti.HFWTypeReader;
 import sh.adelessfox.odradek.game.hfw.rtti.data.ref.*;
 import sh.adelessfox.odradek.io.BinaryReader;
 import sh.adelessfox.odradek.rtti.ClassTypeInfo;
 import sh.adelessfox.odradek.rtti.PointerTypeInfo;
+import sh.adelessfox.odradek.rtti.data.TypedObject;
 import sh.adelessfox.odradek.rtti.factory.TypeFactory;
+import sh.adelessfox.odradek.util.LruWeakCache;
 
 import java.io.IOException;
 import java.util.*;
 
-import static sh.adelessfox.odradek.game.hfw.rtti.HorizonForbiddenWest.*;
-
 public class StreamingObjectReader extends HFWTypeReader {
     private static final Logger log = LoggerFactory.getLogger(StreamingObjectReader.class);
 
-    private final ObjectStreamingSystem system;
-    private final StreamingGraphResource graph;
+    private final DecimaGame game;
+    private final StreamingGraph graph;
     private final TypeFactory factory;
 
     private final LruWeakCache<Integer, GroupResult> cache = new LruWeakCache<>(5000);
@@ -28,11 +31,11 @@ public class StreamingObjectReader extends HFWTypeReader {
     private List<GroupResult> currentSubGroups;
 
     private boolean resolveStreamingLinksAndLocators;
-    private int streamingLinkIndex;
-    private int streamingLocatorIndex;
+    private Iterator<StreamingGraph.Link> streamingLinks;
+    private Iterator<StreamingGraph.Locator> streamingLocators;
     private int depth;
 
-    public record GroupResult(StreamingGroupData group, List<ObjectInfo> objects) {
+    public record GroupResult(StreamingGraph.Group group, List<TypedObject> objects) {
         public GroupResult {
             objects = List.copyOf(objects);
         }
@@ -43,12 +46,9 @@ public String toString() {
         }
     }
 
-    public record ObjectResult(GroupResult group, ObjectInfo object) {
-    }
-
-    public StreamingObjectReader(ObjectStreamingSystem system, TypeFactory factory) {
-        this.system = system;
-        this.graph = system.graph();
+    public StreamingObjectReader(DecimaGame game, TypeFactory factory) {
+        this.game = game;
+        this.graph = game.streamingGraph();
         this.factory = factory;
     }
 
@@ -67,11 +67,11 @@ private GroupResult readGroup(int id, Map<Integer, GroupResult> cache, boolean r
             log.debug("{}Reading group {}", indent(), Colors.blue(id));
         }
 
-        var result = cache.get(group.groupID());
+        var result = cache.get(group.id());
         if (result == null) {
             depth++;
             result = readGroup(group, cache, readSubgroups);
-            cache.put(result.group.groupID(), result);
+            cache.put(result.group.id(), result);
             depth--;
         }
 
@@ -79,62 +79,60 @@ private GroupResult readGroup(int id, Map<Integer, GroupResult> cache, boolean r
     }
 
     private synchronized GroupResult readGroup(
-        StreamingGroupData group,
+        StreamingGraph.Group group,
         Map<Integer, GroupResult> groups,
         boolean readSubgroups
     ) throws IOException {
-        var subGroups = new ArrayList<GroupResult>(group.subGroupCount());
+        var subGroups = new ArrayList<GroupResult>(group.subGroups().size());
         if (readSubgroups) {
-            for (int i = 0; i < group.subGroupCount(); i++) {
-                subGroups.add(readGroup(graph.subGroups()[group.subGroupStart() + i], groups, true));
+            for (StreamingGraph.Group subGroup : group.subGroups()) {
+                subGroups.add(readGroup(subGroup, groups, true));
             }
         }
 
         currentSubGroups = subGroups;
         resolveStreamingLinksAndLocators = readSubgroups;
 
-        var result = cache.get(group.groupID());
+        var result = cache.get(group.id());
         if (result == null) {
             result = readSingleGroup(group);
-            cache.put(group.groupID(), result);
+            cache.put(group.id(), result);
         }
 
         return result;
     }
 
-    private GroupResult readSingleGroup(StreamingGroupData group) throws IOException {
-        var objects = new ArrayList<ObjectInfo>(group.numObjects());
-        for (int i = 0; i < group.numObjects(); i++) {
-            var type = graph.types().get(group.typeStart() + objects.size());
-            var object = (RTTIRefObject) factory.newInstance(type);
-            objects.add(new ObjectInfo(type, object));
+    private GroupResult readSingleGroup(StreamingGraph.Group group) throws IOException {
+        var objects = new ArrayList<TypedObject>(group.types().size());
+        for (ClassTypeInfo type : group.types()) {
+            objects.add(factory.newInstance(type));
         }
 
         var result = new GroupResult(group, objects);
 
         currentGroup = result;
-        streamingLinkIndex = group.linkStart();
-        streamingLocatorIndex = group.locatorStart();
+        streamingLinks = group.links();
+        streamingLocators = group.locators().iterator();
 
-        for (int i = 0, j = 0; i < group.spanCount(); i++) {
-            var span = graph.spanTable().get(group.spanStart() + i);
+        int index = 0;
+        for (StreamingGraph.Span span : group.spans()) {
             var data = getSpanData(span);
             var reader = BinaryReader.wrap(data);
 
             while (reader.remaining() > 0) {
-                var object = objects.get(j++);
+                var object = objects.get(index++);
 
                 if (log.isDebugEnabled()) {
                     log.debug(
                         "{}Reading {} in {} at offset {}",
                         indent(),
-                        Colors.yellow(object.type()),
+                        Colors.yellow(object.getType()),
                         Colors.yellow(getSpanFile(span)),
                         Colors.blue(span.offset() + reader.position())
                     );
                 }
 
-                fillCompound(object.type(), reader, factory, object.object());
+                fillCompound(object.getType(), reader, factory, object);
             }
         }
 
@@ -145,7 +143,7 @@ private GroupResult readSingleGroup(StreamingGroupData group) throws IOException
     protected void fillCompound(ClassTypeInfo info, BinaryReader reader, TypeFactory factory, Object object) throws IOException {
         super.fillCompound(info, reader, factory, object);
 
-        if (object instanceof StreamingDataSource dataSource) {
+        if (object instanceof HFW.StreamingDataSource dataSource) {
             resolveStreamingDataSource(dataSource);
         }
     }
@@ -155,30 +153,30 @@ protected Object readPointer(PointerTypeInfo info, BinaryReader reader, TypeFact
         if (!reader.readByteBoolean()) {
             return null;
         } else if (info.pointerType().equals("UUIDRef")) {
-            return new UUIDRef<>((GGUUID) readCompound(factory.get("GGUUID").asClass(), reader, factory));
+            return new UUIDRef<>((HFW.GGUUID) readCompound(factory.get("GGUUID").asClass(), reader, factory));
         } else {
             return resolveLink(info);
         }
     }
 
-    private void resolveStreamingDataSource(StreamingDataSource dataSource) {
+    private void resolveStreamingDataSource(HFW.StreamingDataSource dataSource) {
         if (!resolveStreamingLinksAndLocators) {
             return;
         }
 
         if (dataSource.isValid()) {
-            var locator = graph.locatorTable().get(streamingLocatorIndex++).data();
+            var locator = streamingLocators.next();
 
             if (log.isDebugEnabled()) {
                 log.debug(
                     "{}Resolving data source to {} at offset {}",
                     indent(),
-                    Colors.yellow(graph.files().get(Math.toIntExact(locator & 0xffffff))),
-                    Colors.blue(locator >>> 24)
+                    Colors.yellow(graph.files().get(locator.fileIndex())),
+                    Colors.blue(locator.offset())
                 );
             }
 
-            dataSource.locator(locator);
+            dataSource.locator(locator.offset() << 24 | locator.fileIndex() & 0xffffff);
         }
     }
 
@@ -187,17 +185,15 @@ private Object resolveLink(PointerTypeInfo info) {
             return null;
         }
 
-        var result = system.readLink(streamingLinkIndex);
-        int linkGroup = result.group();
+        var result = streamingLinks.next();
+        var linkGroup = result.group();
         int linkIndex = result.index();
 
-        streamingLinkIndex = result.position();
-
         var pointerType = info.pointerType();
         if (pointerType.equals("StreamingRef")) {
-            if (linkGroup != -1) {
+            if (linkGroup.isPresent()) {
                 // If linkGroup != -1, then it's the id of the group; it's an equivalent of doing graph.group(linkGroup)
-                return new StreamingRef<>(new ObjectId(linkGroup, linkIndex));
+                return new StreamingRef<>(new ObjectId(linkGroup.orElseThrow(), linkIndex));
             } else {
                 // No idea how to resolve it otherwise. Presumably points to a runtime singleton?
                 return null;
@@ -205,25 +201,25 @@ private Object resolveLink(PointerTypeInfo info) {
         }
 
         GroupResult group;
-        if (linkGroup == -1) {
+        if (linkGroup.isPresent()) {
+            // Seems to reference subgroups
+            group = currentSubGroups.get(linkGroup.orElseThrow());
+        } else {
             // References the current group being read
             group = currentGroup;
-        } else {
-            // Seems to reference subgroups
-            group = currentSubGroups.get(linkGroup);
         }
 
         var object = group.objects().get(linkIndex);
-        var matches = info.itemType().asClass().isAssignableFrom(object.type());
+        var matches = info.itemType().asClass().isAssignableFrom(object.getType());
 
         if (log.isDebugEnabled()) {
             log.debug(
                 "{}Resolving {} to object {} (index: {}) in group {} (index: {})",
                 indent(),
                 Colors.yellow(info.name()),
-                Colors.yellow(object.type()),
+                Colors.yellow(object.getType()),
                 Colors.blue(linkIndex),
-                Colors.blue(group.group.groupID()),
+                Colors.blue(group.group.id()),
                 Colors.blue(linkGroup)
             );
         }
@@ -232,11 +228,11 @@ private Object resolveLink(PointerTypeInfo info) {
             throw new IllegalStateException("Type mismatch for pointer");
         }
 
-        var objectId = new ObjectId(group.group().groupID(), linkIndex);
+        var objectId = new ObjectId(group.group().id(), linkIndex);
         return switch (pointerType) {
-            case "Ref" -> new Ref<>(objectId, object.object());
-            case "WeakPtr" -> new WeakPtr<>(objectId, object.object());
-            case "cptr" -> new CPtr<>(objectId, object.object());
+            case "Ref" -> new Ref<>(objectId, object);
+            case "WeakPtr" -> new WeakPtr<>(objectId, object);
+            case "cptr" -> new CPtr<>(objectId, object);
             default -> throw new UnsupportedOperationException("Unsupported pointer type: " + pointerType);
         };
     }
@@ -245,12 +241,12 @@ private String indent() {
         return "\t".repeat(depth);
     }
 
-    private byte[] getSpanData(StreamingSourceSpan span) throws IOException {
-        return system.getFileData(getSpanFile(span), span.offset(), span.length());
+    private byte[] getSpanData(StreamingGraph.Span span) throws IOException {
+        return game.readFile(getSpanFile(span), span.offset(), span.length());
     }
 
-    private String getSpanFile(StreamingSourceSpan span) {
-        return graph.files().get(span.fileIndexAndIsPatch() & 0x7fffffff);
+    private String getSpanFile(StreamingGraph.Span span) {
+        return graph.files().get(span.fileIndex());
     }
 
     private record Colors(CharSequence text, int foreground) {
diff --git a/odradek-game/src/main/java/module-info.java b/odradek-game/src/main/java/module-info.java
index d13b7bd2..d62230db 100644
--- a/odradek-game/src/main/java/module-info.java
+++ b/odradek-game/src/main/java/module-info.java
@@ -1,3 +1,5 @@
+import sh.adelessfox.odradek.game.Game;
+
 module odradek.game {
     requires odradek.rtti;
     requires odradek.core;
@@ -7,5 +9,5 @@
 
     uses sh.adelessfox.odradek.game.Converter;
     uses sh.adelessfox.odradek.game.Exporter;
-    uses sh.adelessfox.odradek.game.Game.Provider;
+    uses Game.Provider;
 }
diff --git a/odradek-game/src/main/java/sh/adelessfox/odradek/game/Game.java b/odradek-game/src/main/java/sh/adelessfox/odradek/game/Game.java
index e8b58516..6e2d35bd 100644
--- a/odradek-game/src/main/java/sh/adelessfox/odradek/game/Game.java
+++ b/odradek-game/src/main/java/sh/adelessfox/odradek/game/Game.java
@@ -1,7 +1,5 @@
 package sh.adelessfox.odradek.game;
 
-import sh.adelessfox.odradek.rtti.data.TypedObject;
-
 import java.io.Closeable;
 import java.io.IOException;
 import java.nio.file.Path;
@@ -48,30 +46,4 @@ static Game load(Path path) throws IOException {
             default -> throw new IllegalStateException("Multiple providers found for " + path + ": " + providers);
         };
     }
-
-    /**
-     * Reads an object from the streaming graph by its group ID and object index.
-     *
-     * @param groupId     id of the group that contains the object
-     * @param objectIndex index of the object within the group
-     * @return the typed object
-     * @throws IOException if an I/O error occurs during reading
-     */
-    TypedObject readObject(int groupId, int objectIndex) throws IOException;
-
-    /**
-     * Resolve game-specific path to actual filesystem path.
-     * The path should be in a form of {@code <device>:<path>}.
-     * <p>
-     * Supported devices:
-     * <ul>
-     *     <li>{@code source} - points to the game root directory</li>
-     *     <li>{@code cache} - alias for {@code source:LocalCache<platform>}</li>
-     *     <li>{@code tools} - alias for {@code source:tools}</li>
-     * </ul>
-     *
-     * @param path device-specific path
-     * @return resolved filesystem path
-     */
-    Path resolvePath(String path);
 }
diff --git a/odradek-game/src/main/java/sh/adelessfox/odradek/game/LinkProvider.java b/odradek-game/src/main/java/sh/adelessfox/odradek/game/LinkProvider.java
deleted file mode 100644
index bc192d14..00000000
--- a/odradek-game/src/main/java/sh/adelessfox/odradek/game/LinkProvider.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package sh.adelessfox.odradek.game;
-
-import sh.adelessfox.odradek.rtti.data.TypePath;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.util.List;
-
-public interface LinkProvider extends Closeable {
-    record Link(int groupId, int objectIndex, TypePath path) {
-    }
-
-    List<Link> getIncomingLinks(ObjectId target) throws IOException;
-
-    List<Link> getOutgoingLinks(ObjectId source) throws IOException;
-}
diff --git a/odradek-game/src/main/java/sh/adelessfox/odradek/game/ObjectHolder.java b/odradek-game/src/main/java/sh/adelessfox/odradek/game/ObjectHolder.java
index 4cfc73fd..70dce16a 100644
--- a/odradek-game/src/main/java/sh/adelessfox/odradek/game/ObjectHolder.java
+++ b/odradek-game/src/main/java/sh/adelessfox/odradek/game/ObjectHolder.java
@@ -2,11 +2,9 @@
 
 import java.util.function.Supplier;
 
-public interface ObjectHolder<T> extends ObjectIdHolder, Supplier<T> {
+public interface ObjectHolder<T> extends Supplier<T> {
     T object();
 
     @Override
-    default T get() {
-        return object();
-    }
+    T get();
 }
diff --git a/odradek-rtti/src/main/java/sh/adelessfox/odradek/rtti/factory/AbstractTypeFactory.java b/odradek-rtti/src/main/java/sh/adelessfox/odradek/rtti/factory/AbstractTypeFactory.java
index 9c221ded..2a1a592b 100644
--- a/odradek-rtti/src/main/java/sh/adelessfox/odradek/rtti/factory/AbstractTypeFactory.java
+++ b/odradek-rtti/src/main/java/sh/adelessfox/odradek/rtti/factory/AbstractTypeFactory.java
@@ -6,6 +6,7 @@
 import sh.adelessfox.odradek.rtti.ClassBaseInfo;
 import sh.adelessfox.odradek.rtti.ClassTypeInfo;
 import sh.adelessfox.odradek.rtti.TypeInfo;
+import sh.adelessfox.odradek.rtti.data.TypedObject;
 import sh.adelessfox.odradek.rtti.generator.TypeBindings;
 import sh.adelessfox.odradek.rtti.generator.TypeContext;
 import sh.adelessfox.odradek.rtti.generator.TypeRuntimeGenerator;
@@ -74,7 +75,7 @@ public Collection<TypeInfo> getAll() {
 
     @Override
     @SuppressWarnings({"deprecation", "unchecked"})
-    public <T> T newInstance(ClassTypeInfo info) {
+    public <T extends TypedObject> T newInstance(ClassTypeInfo info) {
         Class<?> clazz = classes.computeIfAbsent(info, generator::lookup);
         try {
             return (T) clazz.newInstance();
diff --git a/odradek-rtti/src/main/java/sh/adelessfox/odradek/rtti/factory/TypeFactory.java b/odradek-rtti/src/main/java/sh/adelessfox/odradek/rtti/factory/TypeFactory.java
index 9105f8c4..1e498ac4 100644
--- a/odradek-rtti/src/main/java/sh/adelessfox/odradek/rtti/factory/TypeFactory.java
+++ b/odradek-rtti/src/main/java/sh/adelessfox/odradek/rtti/factory/TypeFactory.java
@@ -2,6 +2,7 @@
 
 import sh.adelessfox.odradek.rtti.ClassTypeInfo;
 import sh.adelessfox.odradek.rtti.TypeInfo;
+import sh.adelessfox.odradek.rtti.data.TypedObject;
 
 import java.util.Collection;
 
@@ -12,9 +13,9 @@ public interface TypeFactory {
 
     Collection<TypeInfo> getAll();
 
-    <T> T newInstance(ClassTypeInfo info);
+    <T extends TypedObject> T newInstance(ClassTypeInfo info);
 
-    default <T> T newInstance(Class<T> clazz) {
+    default <T extends TypedObject> T newInstance(Class<T> clazz) {
         var name = clazz.getSimpleName();
         var info = get(name).asClass();
         return newInstance(info);
diff --git a/odradek-rtti/src/main/java/sh/adelessfox/odradek/rtti/io/AbstractTypeReader.java b/odradek-rtti/src/main/java/sh/adelessfox/odradek/rtti/io/AbstractTypeReader.java
index e0008cff..fddcec32 100644
--- a/odradek-rtti/src/main/java/sh/adelessfox/odradek/rtti/io/AbstractTypeReader.java
+++ b/odradek-rtti/src/main/java/sh/adelessfox/odradek/rtti/io/AbstractTypeReader.java
@@ -3,6 +3,7 @@
 import sh.adelessfox.odradek.io.BinaryReader;
 import sh.adelessfox.odradek.rtti.*;
 import sh.adelessfox.odradek.rtti.data.ExtraBinaryDataHolder;
+import sh.adelessfox.odradek.rtti.data.TypedObject;
 import sh.adelessfox.odradek.rtti.data.Value;
 import sh.adelessfox.odradek.rtti.factory.TypeFactory;
 
@@ -20,8 +21,8 @@ public Object read(TypeInfo info, BinaryReader reader, TypeFactory factory) thro
         };
     }
 
-    protected Object readCompound(ClassTypeInfo info, BinaryReader reader, TypeFactory factory) throws IOException {
-        Object object = factory.newInstance(info);
+    protected TypedObject readCompound(ClassTypeInfo info, BinaryReader reader, TypeFactory factory) throws IOException {
+        var object = factory.newInstance(info);
         fillCompound(info, reader, factory, object);
         return object;
     }
diff --git a/odradek-ui/src/main/java/sh/adelessfox/odradek/ui/Renderer.java b/odradek-ui/src/main/java/sh/adelessfox/odradek/ui/Renderer.java
index 30cdf1ba..a657fece 100644
--- a/odradek-ui/src/main/java/sh/adelessfox/odradek/ui/Renderer.java
+++ b/odradek-ui/src/main/java/sh/adelessfox/odradek/ui/Renderer.java
@@ -40,7 +40,6 @@ default boolean supports(TypeInfo info) {
             return supportedType().isAssignableFrom(info.type());
         }
 
-        @SuppressWarnings("unchecked")
         default Class<T> supportedType() {
             return Reflections.getGenericInterfaceArgument(getClass(), OfObject.class, 0);
         }
diff --git a/odradek-ui/src/main/java/sh/adelessfox/odradek/ui/Viewer.java b/odradek-ui/src/main/java/sh/adelessfox/odradek/ui/Viewer.java
index 7d261992..4f03eb8c 100644
--- a/odradek-ui/src/main/java/sh/adelessfox/odradek/ui/Viewer.java
+++ b/odradek-ui/src/main/java/sh/adelessfox/odradek/ui/Viewer.java
@@ -1,6 +1,5 @@
 package sh.adelessfox.odradek.ui;
 
-import sh.adelessfox.odradek.game.Converter;
 import sh.adelessfox.odradek.game.Game;
 import sh.adelessfox.odradek.util.Reflections;
 
diff --git a/odradek-viewer-shader/src/main/java/sh/adelessfox/odradek/viewer/shader/ShaderViewer.java b/odradek-viewer-shader/src/main/java/sh/adelessfox/odradek/viewer/shader/ShaderViewer.java
index c1849a8c..f5b57bc9 100644
--- a/odradek-viewer-shader/src/main/java/sh/adelessfox/odradek/viewer/shader/ShaderViewer.java
+++ b/odradek-viewer-shader/src/main/java/sh/adelessfox/odradek/viewer/shader/ShaderViewer.java
@@ -39,8 +39,7 @@ public Optional<String> icon() {
     @Override
     public JComponent createComponent() {
         try (Arena arena = Arena.ofConfined()) {
-            var path = game.resolvePath("tools:bin/x64/dxcompiler.dll");
-            var lookup = SymbolLookup.libraryLookup(path, arena);
+            var lookup = SymbolLookup.libraryLookup("dxcompiler", arena);
             var compiler = new DxCompiler(lookup);
 
             return createShaderPanel(shader, compiler);
diff --git a/pom.xml b/pom.xml
index 68f34852..c9eecc7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,6 +21,7 @@
         <module>odradek-export-json</module>
         <module>odradek-export-png</module>
         <module>odradek-export-wave</module>
+        <module>odradek-game-decima</module>
         <module>odradek-game-hfw-ui</module>
         <module>odradek-game-hfw</module>
         <module>odradek-game</module>
@@ -170,6 +171,11 @@
                 <artifactId>odradek-game</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>sh.adelessfox</groupId>
+                <artifactId>odradek-game-decima</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>sh.adelessfox</groupId>
                 <artifactId>odradek-game-hfw</artifactId>