diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
index 8bda18adb6c..f1b106691d1 100644
--- a/build-logic/build.gradle.kts
+++ b/build-logic/build.gradle.kts
@@ -26,7 +26,7 @@ dependencies {
     implementation("dom4j:dom4j:1.6.1")
 
     // for inspecting modules
-    implementation("org.terasology.gestalt:gestalt-module:7.1.0-SNAPSHOT")
+    implementation("org.terasology.gestalt:gestalt-module:8.0.0-SNAPSHOT")
 
     api(kotlin("test"))
 }
diff --git a/build-logic/src/main/kotlin/terasology-module.gradle.kts b/build-logic/src/main/kotlin/terasology-module.gradle.kts
index 6a63fde2b36..561df6b1c69 100644
--- a/build-logic/src/main/kotlin/terasology-module.gradle.kts
+++ b/build-logic/src/main/kotlin/terasology-module.gradle.kts
@@ -67,8 +67,14 @@ dependencies {
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 
     testImplementation("org.mockito:mockito-junit-jupiter:3.7.7")
+
+    annotationProcessor("org.terasology.gestalt:gestalt-inject-java:8.0.0-SNAPSHOT")
 }
 
+tasks.withType<JavaCompile> {
+    inputs.files(sourceSets.main.get().resources.srcDirs)
+    options.compilerArgs.add("-Aresource=${sourceSets.main.get().resources.srcDirs.joinToString(File.pathSeparator)}")
+}
 
 if (project.name == "ModuleTestingEnvironment") {
     dependencies {
diff --git a/engine-tests/src/main/java/org/terasology/unittest/ExampleClass.java b/engine-tests/src/main/java/org/terasology/unittest/ExampleClass.java
index a1421dc1626..20a50b9b8dc 100644
--- a/engine-tests/src/main/java/org/terasology/unittest/ExampleClass.java
+++ b/engine-tests/src/main/java/org/terasology/unittest/ExampleClass.java
@@ -3,7 +3,7 @@
 
 package org.terasology.unittest;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 @API
 public class ExampleClass implements ExampleInterface {
diff --git a/engine-tests/src/main/java/org/terasology/unittest/ExampleInterface.java b/engine-tests/src/main/java/org/terasology/unittest/ExampleInterface.java
index 64c7872f905..89a7fa1d83b 100644
--- a/engine-tests/src/main/java/org/terasology/unittest/ExampleInterface.java
+++ b/engine-tests/src/main/java/org/terasology/unittest/ExampleInterface.java
@@ -3,7 +3,7 @@
 
 package org.terasology.unittest;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 @API
 public interface ExampleInterface {
diff --git a/engine-tests/src/main/java/org/terasology/unittest/stubs/package-info.java b/engine-tests/src/main/java/org/terasology/unittest/stubs/package-info.java
index dd313465fa0..7bae2a8971f 100644
--- a/engine-tests/src/main/java/org/terasology/unittest/stubs/package-info.java
+++ b/engine-tests/src/main/java/org/terasology/unittest/stubs/package-info.java
@@ -4,4 +4,4 @@
 @API
 package org.terasology.unittest.stubs;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine-tests/src/test/java/org/terasology/documentation/ApiScraper.java b/engine-tests/src/test/java/org/terasology/documentation/ApiScraper.java
index 880a5a83538..6096dee4ddb 100644
--- a/engine-tests/src/test/java/org/terasology/documentation/ApiScraper.java
+++ b/engine-tests/src/test/java/org/terasology/documentation/ApiScraper.java
@@ -20,7 +20,7 @@
 import org.terasology.engine.core.module.ExternalApiWhitelist;
 import org.terasology.engine.core.module.ModuleManager;
 import org.terasology.gestalt.module.ModuleEnvironment;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.engine.testUtil.ModuleManagerFactory;
 
 import java.net.URL;
diff --git a/engine-tests/src/test/java/org/terasology/documentation/apiScraper/CompleteApiScraper.java b/engine-tests/src/test/java/org/terasology/documentation/apiScraper/CompleteApiScraper.java
index 96812acd58b..997b3193deb 100644
--- a/engine-tests/src/test/java/org/terasology/documentation/apiScraper/CompleteApiScraper.java
+++ b/engine-tests/src/test/java/org/terasology/documentation/apiScraper/CompleteApiScraper.java
@@ -22,7 +22,7 @@
 import org.terasology.engine.core.module.ExternalApiWhitelist;
 import org.terasology.engine.core.module.ModuleManager;
 import org.terasology.gestalt.module.ModuleEnvironment;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.engine.testUtil.ModuleManagerFactory;
 
 import java.lang.reflect.Constructor;
diff --git a/engine-tests/src/test/java/org/terasology/engine/core/module/ClasspathCompromisingModuleFactoryTest.java b/engine-tests/src/test/java/org/terasology/engine/core/module/ClasspathCompromisingModuleFactoryTest.java
index 79309c1c0b5..9dc9e380dac 100644
--- a/engine-tests/src/test/java/org/terasology/engine/core/module/ClasspathCompromisingModuleFactoryTest.java
+++ b/engine-tests/src/test/java/org/terasology/engine/core/module/ClasspathCompromisingModuleFactoryTest.java
@@ -8,7 +8,7 @@
 import org.terasology.gestalt.module.Module;
 import org.terasology.gestalt.module.ModuleFactory;
 import org.terasology.gestalt.module.ModuleMetadata;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.gestalt.naming.Name;
 import org.terasology.gestalt.naming.Version;
 import org.terasology.unittest.ExampleClass;
@@ -18,6 +18,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 public class ClasspathCompromisingModuleFactoryTest {
     final static Class<?> someClassOutsideTheModule = ClasspathCompromisingModuleFactory.class;
@@ -46,10 +47,14 @@ public void archiveModuleContainsClass() throws IOException {
 
         Module module = factory.createArchiveModule(new File("FIXME.jar"));
 
-        Class<?> someClassInTheModule = module.getModuleManifest().getTypesAnnotatedWith(API.class).iterator().next();
+        try {
+            Class<?> someClassInTheModule = Class.forName(module.getClassIndex().getTypesAnnotatedWith(API.class.getName()).iterator().next());
 
-        assertTrue(module.getClassPredicate().test(someClassInTheModule));
-        assertFalse(module.getClassPredicate().test(someClassOutsideTheModule));
+            assertTrue(module.getClassPredicate().test(someClassInTheModule));
+            assertFalse(module.getClassPredicate().test(someClassOutsideTheModule));
+        } catch (ClassNotFoundException ignore) {
+            fail();
+        }
     }
 
     @Test
diff --git a/engine-tests/src/test/java/org/terasology/engine/core/module/ModuleDownloadListGeneratorTest.java b/engine-tests/src/test/java/org/terasology/engine/core/module/ModuleDownloadListGeneratorTest.java
index 82b93db423a..841154daf7f 100644
--- a/engine-tests/src/test/java/org/terasology/engine/core/module/ModuleDownloadListGeneratorTest.java
+++ b/engine-tests/src/test/java/org/terasology/engine/core/module/ModuleDownloadListGeneratorTest.java
@@ -6,6 +6,7 @@
 import org.junit.jupiter.api.Test;
 import org.reflections.Reflections;
 import org.terasology.engine.core.TerasologyConstants;
+import org.terasology.gestalt.di.index.UrlClassIndex;
 import org.terasology.gestalt.module.Module;
 import org.terasology.gestalt.module.ModuleMetadata;
 import org.terasology.gestalt.module.ModuleRegistry;
@@ -86,7 +87,7 @@ private Module buildSimpleModule(String id, String version) {
         if (version != null) {
             metadata.setVersion(new Version(version));
         }
-        return new Module(metadata, new EmptyFileSource(), Collections.emptyList(), new Reflections(), (c) -> false);
+        return new Module(metadata, new EmptyFileSource(), Collections.emptyList(), UrlClassIndex.byClassLoader(), (c) -> false);
     }
     private Module buildEngineModule(String version) {
         return buildSimpleModule(TerasologyConstants.ENGINE_MODULE.toString(), version);
diff --git a/engine/build.gradle b/engine/build.gradle
index 13613706e7e..bfe27605f6e 100644
--- a/engine/build.gradle
+++ b/engine/build.gradle
@@ -103,18 +103,20 @@ dependencies {
     implementation group: 'net.logstash.logback', name: 'logstash-logback-encoder', version: '4.10'
 
     // Our developed libs
-    api group: 'org.terasology.gestalt', name: 'gestalt-asset-core', version: '7.1.0-SNAPSHOT'
-    api group: 'org.terasology.gestalt', name: 'gestalt-module', version: '7.1.0-SNAPSHOT'
-    api group: 'org.terasology.gestalt', name: 'gestalt-util', version: '7.1.0-SNAPSHOT'
+    api group: 'org.terasology.gestalt', name: 'gestalt-asset-core', version: '8.0.0-SNAPSHOT'
+    api group: 'org.terasology.gestalt', name: 'gestalt-module', version: '8.0.0-SNAPSHOT'
+    api group: 'org.terasology.gestalt', name: 'gestalt-util', version: '8.0.0-SNAPSHOT'
     api "com.github.zafarkhaja:java-semver:0.10.0"  // ASAP: Remove after https://github.com/MovingBlocks/gestalt/pull/110
 
+    annotationProcessor "org.terasology.gestalt:gestalt-inject-java:8.0.0-SNAPSHOT"
+
     api group: 'org.terasology', name: 'TeraMath', version: '1.5.0'
     api group: 'org.terasology', name: 'splash-screen', version: '1.1.1'
     api group: 'org.terasology.jnlua', name: 'JNLua', version: '0.1.0-SNAPSHOT'
     api group: 'org.terasology.jnbullet', name: 'JNBullet', version: '1.0.2'
     api group: 'org.terasology.nui', name: 'nui', version: '3.0.0-SNAPSHOT'
     api group: 'org.terasology.nui', name: 'nui-reflect', version: '3.0.0-SNAPSHOT'
-    api group: 'org.terasology.nui', name: 'nui-gestalt7', version: '3.0.0-SNAPSHOT'
+    api group: 'org.terasology.nui', name: 'nui-gestalt', version: '3.0.0-SNAPSHOT'
 
 
     // Wildcard dependency to catch any libs provided with the project (remote repo preferred instead)
@@ -129,6 +131,11 @@ dependencies {
     api(project(":subsystems:TypeHandlerLibrary"))
 }
 
+compileJava {
+    inputs.files sourceSets.main.resources.srcDirs
+    options.compilerArgs = ["-Aresource=${sourceSets.main.resources.srcDirs.join(File.pathSeparator)}"]
+}
+
 // Instructions for packaging a jar file for the engine
 jar {
     // Unlike the content modules Gradle grabs the assets as they're in a resources directory. Need to avoid dupes tho
diff --git a/engine/src/main/java/org/terasology/engine/audio/events/package-info.java b/engine/src/main/java/org/terasology/engine/audio/events/package-info.java
index bccae5c27e7..28465d3ffaa 100644
--- a/engine/src/main/java/org/terasology/engine/audio/events/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/audio/events/package-info.java
@@ -29,4 +29,4 @@
  */
 @API package org.terasology.engine.audio.events;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/audio/package-info.java b/engine/src/main/java/org/terasology/engine/audio/package-info.java
index 63b3ef3f995..d5a3c02b4e2 100644
--- a/engine/src/main/java/org/terasology/engine/audio/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/audio/package-info.java
@@ -16,4 +16,4 @@
 
 @API package org.terasology.engine.audio;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/config/Config.java b/engine/src/main/java/org/terasology/engine/config/Config.java
index 958c6976e34..75726d844c9 100644
--- a/engine/src/main/java/org/terasology/engine/config/Config.java
+++ b/engine/src/main/java/org/terasology/engine/config/Config.java
@@ -18,17 +18,17 @@
 import org.terasology.engine.core.TerasologyConstants;
 import org.terasology.engine.core.subsystem.Resolution;
 import org.terasology.engine.entitySystem.Component;
+import org.terasology.gestalt.naming.Version;
+import org.terasology.gestalt.naming.gson.NameTypeAdapter;
+import org.terasology.gestalt.naming.gson.VersionTypeAdapter;
+import org.terasology.input.Input;
+import org.terasology.context.annotation.API;
+import org.terasology.gestalt.naming.Name;
 import org.terasology.engine.utilities.gson.CaseInsensitiveEnumTypeAdapterFactory;
 import org.terasology.engine.utilities.gson.InputHandler;
 import org.terasology.engine.utilities.gson.ResolutionHandler;
 import org.terasology.engine.utilities.gson.SetMultimapTypeAdapter;
 import org.terasology.engine.utilities.gson.UriTypeAdapterFactory;
-import org.terasology.gestalt.module.sandbox.API;
-import org.terasology.gestalt.naming.Name;
-import org.terasology.gestalt.naming.Version;
-import org.terasology.gestalt.naming.gson.NameTypeAdapter;
-import org.terasology.gestalt.naming.gson.VersionTypeAdapter;
-import org.terasology.input.Input;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
diff --git a/engine/src/main/java/org/terasology/engine/config/RenderingConfig.java b/engine/src/main/java/org/terasology/engine/config/RenderingConfig.java
index caa5daab62c..37de73f0a2f 100644
--- a/engine/src/main/java/org/terasology/engine/config/RenderingConfig.java
+++ b/engine/src/main/java/org/terasology/engine/config/RenderingConfig.java
@@ -17,7 +17,7 @@
 package org.terasology.engine.config;
 
 import org.terasology.engine.core.subsystem.Resolution;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.engine.rendering.cameras.PerspectiveCameraSettings;
 import org.terasology.engine.rendering.nui.layers.mainMenu.videoSettings.DisplayModeSetting;
 import org.terasology.engine.rendering.nui.layers.mainMenu.videoSettings.ScreenshotSize;
diff --git a/engine/src/main/java/org/terasology/engine/config/RenderingDebugConfig.java b/engine/src/main/java/org/terasology/engine/config/RenderingDebugConfig.java
index a740008ec88..def559452ee 100644
--- a/engine/src/main/java/org/terasology/engine/config/RenderingDebugConfig.java
+++ b/engine/src/main/java/org/terasology/engine/config/RenderingDebugConfig.java
@@ -19,7 +19,7 @@
 import java.beans.PropertyChangeListener;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.engine.rendering.world.WorldRendererImpl;
 import org.terasology.engine.utilities.subscribables.AbstractSubscribable;
 
diff --git a/engine/src/main/java/org/terasology/engine/config/facade/TelemetryConfiguration.java b/engine/src/main/java/org/terasology/engine/config/facade/TelemetryConfiguration.java
index ca3bd1ae44a..75898cad610 100644
--- a/engine/src/main/java/org/terasology/engine/config/facade/TelemetryConfiguration.java
+++ b/engine/src/main/java/org/terasology/engine/config/facade/TelemetryConfiguration.java
@@ -15,7 +15,7 @@
  */
 package org.terasology.engine.config.facade;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  * TelemetryConfiguration is a wrapper for {@link org.terasology.engine.config.TelemetryConfig}.
diff --git a/engine/src/main/java/org/terasology/engine/config/flexible/AutoConfig.java b/engine/src/main/java/org/terasology/engine/config/flexible/AutoConfig.java
index e3b3b19d86b..f986916aebf 100644
--- a/engine/src/main/java/org/terasology/engine/config/flexible/AutoConfig.java
+++ b/engine/src/main/java/org/terasology/engine/config/flexible/AutoConfig.java
@@ -4,6 +4,7 @@
 
 import com.google.common.collect.ImmutableList;
 import org.reflections.ReflectionUtils;
+import org.terasology.context.annotation.IndexInherited;
 import org.terasology.engine.config.flexible.internal.SettingBuilder;
 import org.terasology.engine.config.flexible.internal.SettingImplBuilder;
 import org.terasology.engine.core.SimpleUri;
@@ -18,6 +19,7 @@
  * Represents a config class that will be automatically initialized and rendered by the engine.
  * All settings must be contained in {@code public static} fields of type {@link Setting}.
  */
+@IndexInherited
 public abstract class AutoConfig {
     private SimpleUri id;
 
diff --git a/engine/src/main/java/org/terasology/engine/config/flexible/Setting.java b/engine/src/main/java/org/terasology/engine/config/flexible/Setting.java
index 4e1e7258ac1..1c6b7e40a29 100644
--- a/engine/src/main/java/org/terasology/engine/config/flexible/Setting.java
+++ b/engine/src/main/java/org/terasology/engine/config/flexible/Setting.java
@@ -16,7 +16,7 @@
 package org.terasology.engine.config.flexible;
 
 import org.terasology.engine.config.flexible.constraints.SettingConstraint;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.reflection.TypeInfo;
 
 /**
diff --git a/engine/src/main/java/org/terasology/engine/config/flexible/constraints/package-info.java b/engine/src/main/java/org/terasology/engine/config/flexible/constraints/package-info.java
index 2462ccdd1ec..c87f1bfd676 100644
--- a/engine/src/main/java/org/terasology/engine/config/flexible/constraints/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/config/flexible/constraints/package-info.java
@@ -15,4 +15,4 @@
  */
 @API package org.terasology.engine.config.flexible.constraints;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/config/flexible/ui/ConstraintWidgetFactory.java b/engine/src/main/java/org/terasology/engine/config/flexible/ui/ConstraintWidgetFactory.java
index f3d3d902b04..110ae27876a 100644
--- a/engine/src/main/java/org/terasology/engine/config/flexible/ui/ConstraintWidgetFactory.java
+++ b/engine/src/main/java/org/terasology/engine/config/flexible/ui/ConstraintWidgetFactory.java
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.engine.config.flexible.ui;
 
+import org.terasology.context.annotation.IndexInherited;
 import org.terasology.engine.config.flexible.Setting;
 import org.terasology.engine.config.flexible.constraints.SettingConstraint;
 import org.terasology.nui.UIWidget;
@@ -16,6 +17,7 @@
  * @param <T> type of setting
  * @param <C> concrete type of {@link SettingConstraint}
  */
+@IndexInherited
 public abstract class ConstraintWidgetFactory<T, C extends SettingConstraint<T>> {
     private Setting<T> setting;
 
diff --git a/engine/src/main/java/org/terasology/engine/context/Context.java b/engine/src/main/java/org/terasology/engine/context/Context.java
index 390c7f9baa7..9c6d9917ec3 100644
--- a/engine/src/main/java/org/terasology/engine/context/Context.java
+++ b/engine/src/main/java/org/terasology/engine/context/Context.java
@@ -15,7 +15,7 @@
  */
 package org.terasology.engine.context;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  * Provides classes with the utility objects that belong to the context they are running in.
diff --git a/engine/src/main/java/org/terasology/engine/core/ComponentFieldUri.java b/engine/src/main/java/org/terasology/engine/core/ComponentFieldUri.java
index 98ac34e66ce..6509be0066e 100644
--- a/engine/src/main/java/org/terasology/engine/core/ComponentFieldUri.java
+++ b/engine/src/main/java/org/terasology/engine/core/ComponentFieldUri.java
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.engine.core;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.gestalt.naming.Name;
 
 import java.util.Objects;
diff --git a/engine/src/main/java/org/terasology/engine/core/ComponentSystemManager.java b/engine/src/main/java/org/terasology/engine/core/ComponentSystemManager.java
index 5c75d6b630f..ab5fcbb812c 100644
--- a/engine/src/main/java/org/terasology/engine/core/ComponentSystemManager.java
+++ b/engine/src/main/java/org/terasology/engine/core/ComponentSystemManager.java
@@ -21,7 +21,7 @@
 import org.terasology.engine.registry.InjectionHelper;
 import org.terasology.gestalt.module.Module;
 import org.terasology.gestalt.module.ModuleEnvironment;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.gestalt.naming.Name;
 
 import java.util.List;
diff --git a/engine/src/main/java/org/terasology/engine/core/Observer.java b/engine/src/main/java/org/terasology/engine/core/Observer.java
index 21aff61dd48..31412f133aa 100644
--- a/engine/src/main/java/org/terasology/engine/core/Observer.java
+++ b/engine/src/main/java/org/terasology/engine/core/Observer.java
@@ -3,7 +3,7 @@
 
 package org.terasology.engine.core;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  * A general interface for observers
diff --git a/engine/src/main/java/org/terasology/engine/core/SimpleUri.java b/engine/src/main/java/org/terasology/engine/core/SimpleUri.java
index 2179bb550e1..94c3bb59211 100644
--- a/engine/src/main/java/org/terasology/engine/core/SimpleUri.java
+++ b/engine/src/main/java/org/terasology/engine/core/SimpleUri.java
@@ -4,7 +4,7 @@
 
 import com.google.common.base.Objects;
 import com.google.common.base.Preconditions;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.gestalt.naming.Name;
 
 /**
diff --git a/engine/src/main/java/org/terasology/engine/core/Time.java b/engine/src/main/java/org/terasology/engine/core/Time.java
index 229492359cd..4ced3575730 100644
--- a/engine/src/main/java/org/terasology/engine/core/Time.java
+++ b/engine/src/main/java/org/terasology/engine/core/Time.java
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.engine.core;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  * The timer manages all time in the game.
diff --git a/engine/src/main/java/org/terasology/engine/core/Uri.java b/engine/src/main/java/org/terasology/engine/core/Uri.java
index ff2b9c5e071..05a12cd79cb 100644
--- a/engine/src/main/java/org/terasology/engine/core/Uri.java
+++ b/engine/src/main/java/org/terasology/engine/core/Uri.java
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.engine.core;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.gestalt.naming.Name;
 
 /**
diff --git a/engine/src/main/java/org/terasology/engine/core/bootstrap/ClassMetaLibrary.java b/engine/src/main/java/org/terasology/engine/core/bootstrap/ClassMetaLibrary.java
index fb4e6e81a70..c9c224cd25d 100644
--- a/engine/src/main/java/org/terasology/engine/core/bootstrap/ClassMetaLibrary.java
+++ b/engine/src/main/java/org/terasology/engine/core/bootstrap/ClassMetaLibrary.java
@@ -16,7 +16,7 @@
 
 package org.terasology.engine.core.bootstrap;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.gestalt.naming.Name;
 
 import java.lang.annotation.Annotation;
diff --git a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/AwaitedLocalCharacterSpawnEvent.java b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/AwaitedLocalCharacterSpawnEvent.java
index fe641205bae..69f739353e8 100644
--- a/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/AwaitedLocalCharacterSpawnEvent.java
+++ b/engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/AwaitedLocalCharacterSpawnEvent.java
@@ -17,7 +17,7 @@
 
 import org.terasology.engine.entitySystem.event.Event;
 import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  * Event which is triggered when LocalPlayer is setup with a character entity. Allows for detection of when LocalPlayer is
diff --git a/engine/src/main/java/org/terasology/engine/core/module/ClasspathCompromisingModuleFactory.java b/engine/src/main/java/org/terasology/engine/core/module/ClasspathCompromisingModuleFactory.java
index 2c268541299..76d9155cc8a 100644
--- a/engine/src/main/java/org/terasology/engine/core/module/ClasspathCompromisingModuleFactory.java
+++ b/engine/src/main/java/org/terasology/engine/core/module/ClasspathCompromisingModuleFactory.java
@@ -39,7 +39,7 @@ public Module createDirectoryModule(ModuleMetadata metadata, File directory) {
         Module module = super.createDirectoryModule(metadata, directory);
         return new Module(
                 module.getMetadata(), module.getResources(),
-                module.getClasspaths(), module.getModuleManifest(),
+                module.getClasspaths(), module.getClassIndex(),
                 new ClassesInModule(module));
     }
 
@@ -48,7 +48,7 @@ public Module createArchiveModule(ModuleMetadata metadata, File archive) throws
         Module module = super.createArchiveModule(metadata, archive);
         return new Module(
                 module.getMetadata(), module.getResources(),
-                module.getClasspaths(), module.getModuleManifest(),
+                module.getClasspaths(), module.getClassIndex(),
                 new ClassesInModule(module));
     }
 
@@ -71,7 +71,8 @@ static class ClassesInModule implements Predicate<Class<?>> {
                     throw new RuntimeException(e);
                 }
             }).collect(ImmutableSet.toImmutableSet());
-            classLoaders = module.getModuleManifest().getConfiguration().getClassLoaders();
+            //classLoaders = module.getModuleManifest().getConfiguration().getClassLoaders();
+            classLoaders = new ClassLoader[0]; // TODO
             name = module.getId().toString();
         }
 
diff --git a/engine/src/main/java/org/terasology/engine/core/module/ModuleInputStream.java b/engine/src/main/java/org/terasology/engine/core/module/ModuleInputStream.java
index ebf08c196c3..891c7bc08f6 100644
--- a/engine/src/main/java/org/terasology/engine/core/module/ModuleInputStream.java
+++ b/engine/src/main/java/org/terasology/engine/core/module/ModuleInputStream.java
@@ -15,7 +15,7 @@
  */
 package org.terasology.engine.core.module;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/engine/src/main/java/org/terasology/engine/core/module/ModuleListDownloader.java b/engine/src/main/java/org/terasology/engine/core/module/ModuleListDownloader.java
index 7bf974fcd59..fb1e99f980a 100644
--- a/engine/src/main/java/org/terasology/engine/core/module/ModuleListDownloader.java
+++ b/engine/src/main/java/org/terasology/engine/core/module/ModuleListDownloader.java
@@ -23,6 +23,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.terasology.engine.core.TerasologyConstants;
+import org.terasology.gestalt.di.index.UrlClassIndex;
 import org.terasology.gestalt.module.Module;
 import org.terasology.gestalt.module.ModuleMetadata;
 import org.terasology.gestalt.module.ModuleMetadataJsonAdapter;
@@ -73,7 +74,7 @@ public ModuleRegistry call() throws IOException {
 
                 ModuleMetadata meta = metaReader.read(new StringReader(json));
                 logger.debug("Read module {} - {}", meta.getId(), meta.getVersion());
-                modules.add(new Module(meta, new EmptyFileSource(), Collections.emptyList(), new Reflections(),
+                modules.add(new Module(meta, new EmptyFileSource(), Collections.emptyList(), UrlClassIndex.byClassLoader(),
                         (c) -> false));
             }
 
diff --git a/engine/src/main/java/org/terasology/engine/core/module/ModuleManager.java b/engine/src/main/java/org/terasology/engine/core/module/ModuleManager.java
index 989abddb411..5f8be917e85 100644
--- a/engine/src/main/java/org/terasology/engine/core/module/ModuleManager.java
+++ b/engine/src/main/java/org/terasology/engine/core/module/ModuleManager.java
@@ -13,6 +13,10 @@
 import org.terasology.engine.config.SystemConfig;
 import org.terasology.engine.core.PathManager;
 import org.terasology.engine.core.TerasologyConstants;
+import org.terasology.gestalt.di.DefaultBeanContext;
+import org.terasology.gestalt.di.index.ClassIndex;
+import org.terasology.gestalt.di.index.CompoundClassIndex;
+import org.terasology.gestalt.di.index.UrlClassIndex;
 import org.terasology.gestalt.module.Module;
 import org.terasology.gestalt.module.ModuleEnvironment;
 import org.terasology.gestalt.module.ModuleFactory;
@@ -125,18 +129,21 @@ private Module loadEngineModule(List<Class<?>> classesOnClasspathsToAddToEngine)
         Module packageModule = moduleFactory.createPackageModule("org.terasology.engine");
 
         // We need to add reflections from our subsystems and other classes.
-        ConfigurationBuilder config = new ConfigurationBuilder();
-        Reflections packageReflections = packageModule.getModuleManifest();
-        Set<Scanner> scanners = packageReflections.getConfiguration().getScanners();
-        config.setScanners(scanners.toArray(new Scanner[0]));
+        //ConfigurationBuilder config = new ConfigurationBuilder();
+        ClassIndex packageReflections = packageModule.getClassIndex();
+        //Set<Scanner> scanners = packageReflections.getConfiguration().getScanners();
+        //config.setScanners(scanners.toArray(new Scanner[0]));
 
+        CompoundClassIndex compoundIndex = new CompoundClassIndex();
+        compoundIndex.add(packageReflections);
         for (Class<?> aClass : classesOnClasspathsToAddToEngine) {
-            config.addUrls(ClasspathHelper.forClass(aClass));
+            //config.addUrls(ClasspathHelper.forClass(aClass));
+            compoundIndex.add(UrlClassIndex.byClassLoader(aClass.getClassLoader()));
         }
 
         // TODO: is this using reflections.cache?
-        Reflections reflectionsWithSubsystems = new Reflections(config);
-        packageReflections.merge(reflectionsWithSubsystems);
+        //Reflections reflectionsWithSubsystems = new Reflections(config);
+        //packageReflections.merge(reflectionsWithSubsystems);
 
         // We need the class predicate to include classes in subsystems and whatnot. We can't change it in an
         // existing module, so make a new one based on the one from the moduleFactory.
@@ -144,10 +151,10 @@ private Module loadEngineModule(List<Class<?>> classesOnClasspathsToAddToEngine)
                 packageModule.getMetadata(),
                 packageModule.getResources(),
                 Collections.emptyList(),
-                packageReflections,
-                packageModule.getClassPredicate().or(clazz ->
-                        reflectionsWithSubsystems.getConfiguration()
-                                .getUrls().contains(ClasspathHelper.forClass(clazz)))
+                compoundIndex,
+                x -> true//packageModule.getClassPredicate().or(clazz ->
+                //        reflectionsWithSubsystems.getConfiguration()
+                //                .getUrls().contains(ClasspathHelper.forClass(clazz)))
         );
 
         registry.add(engine);
@@ -179,8 +186,8 @@ private void setupSandbox() {
         ExternalApiWhitelist.PACKAGES.stream().forEach(packagee ->
                 permissionProviderFactory.getBasePermissionSet().addAPIPackage(packagee));
 
-        APIScanner apiScanner = new APIScanner(permissionProviderFactory);
-        registry.stream().map(Module::getModuleManifest).forEach(apiScanner::scan);
+        //APIScanner apiScanner = new APIScanner(permissionProviderFactory);
+        //registry.stream().map(Module::getModuleManifest).forEach(apiScanner::scan);
 
         permissionProviderFactory.getBasePermissionSet().grantPermission("com.google.gson", ReflectPermission.class);
         permissionProviderFactory.getBasePermissionSet().grantPermission("com.google.gson.internal", ReflectPermission.class);
@@ -246,9 +253,9 @@ public ModuleEnvironment loadEnvironment(Set<Module> modules, boolean asPrimary)
         ModuleEnvironment newEnvironment;
         boolean permissiveSecurityEnabled = Boolean.parseBoolean(System.getProperty(SystemConfig.PERMISSIVE_SECURITY_ENABLED_PROPERTY));
         if (permissiveSecurityEnabled) {
-            newEnvironment = new ModuleEnvironment(finalModules, wrappingPermissionProviderFactory);
+            newEnvironment = new ModuleEnvironment(new DefaultBeanContext(), finalModules, wrappingPermissionProviderFactory);
         } else {
-            newEnvironment = new ModuleEnvironment(finalModules, permissionProviderFactory);
+            newEnvironment = new ModuleEnvironment(new DefaultBeanContext(), finalModules, permissionProviderFactory);
         }
         if (asPrimary) {
             environment = newEnvironment;
diff --git a/engine/src/main/java/org/terasology/engine/core/module/ModuleOutputStream.java b/engine/src/main/java/org/terasology/engine/core/module/ModuleOutputStream.java
index a6354466850..5fcc35139f0 100644
--- a/engine/src/main/java/org/terasology/engine/core/module/ModuleOutputStream.java
+++ b/engine/src/main/java/org/terasology/engine/core/module/ModuleOutputStream.java
@@ -15,7 +15,7 @@
  */
 package org.terasology.engine.core.module;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/engine/src/main/java/org/terasology/engine/core/module/SandboxFileManager.java b/engine/src/main/java/org/terasology/engine/core/module/SandboxFileManager.java
index a8db9819174..f5574301876 100644
--- a/engine/src/main/java/org/terasology/engine/core/module/SandboxFileManager.java
+++ b/engine/src/main/java/org/terasology/engine/core/module/SandboxFileManager.java
@@ -5,7 +5,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.terasology.engine.core.PathManager;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
diff --git a/engine/src/main/java/org/terasology/engine/core/module/rendering/RenderingModuleRegistry.java b/engine/src/main/java/org/terasology/engine/core/module/rendering/RenderingModuleRegistry.java
index 5045c94c31f..80b4f08523a 100644
--- a/engine/src/main/java/org/terasology/engine/core/module/rendering/RenderingModuleRegistry.java
+++ b/engine/src/main/java/org/terasology/engine/core/module/rendering/RenderingModuleRegistry.java
@@ -18,7 +18,7 @@
 import org.terasology.engine.context.Context;
 import org.terasology.engine.rendering.dag.ModuleRendering;
 import org.terasology.gestalt.module.ModuleEnvironment;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.gestalt.naming.Name;
 
 import javax.annotation.Nullable;
diff --git a/engine/src/main/java/org/terasology/engine/core/module/rendering/package-info.java b/engine/src/main/java/org/terasology/engine/core/module/rendering/package-info.java
index 7dfcd1db390..9bc7a1093cd 100644
--- a/engine/src/main/java/org/terasology/engine/core/module/rendering/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/core/module/rendering/package-info.java
@@ -17,4 +17,4 @@
 @API
 package org.terasology.engine.core.module.rendering;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/DisplayDevice.java b/engine/src/main/java/org/terasology/engine/core/subsystem/DisplayDevice.java
index b4522d5abf7..0b4c78884a0 100644
--- a/engine/src/main/java/org/terasology/engine/core/subsystem/DisplayDevice.java
+++ b/engine/src/main/java/org/terasology/engine/core/subsystem/DisplayDevice.java
@@ -17,7 +17,7 @@
 
 import org.terasology.engine.rendering.nui.layers.mainMenu.videoSettings.DisplayModeSetting;
 import org.terasology.engine.utilities.subscribables.Subscribable;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 import java.util.List;
 
diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/common/ThreadManager.java b/engine/src/main/java/org/terasology/engine/core/subsystem/common/ThreadManager.java
index 842a5a725c4..e3a5d6c28d5 100644
--- a/engine/src/main/java/org/terasology/engine/core/subsystem/common/ThreadManager.java
+++ b/engine/src/main/java/org/terasology/engine/core/subsystem/common/ThreadManager.java
@@ -15,7 +15,7 @@
  */
 package org.terasology.engine.core.subsystem.common;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 @API
 @FunctionalInterface
diff --git a/engine/src/main/java/org/terasology/engine/core/subsystem/common/hibernation/HibernationManager.java b/engine/src/main/java/org/terasology/engine/core/subsystem/common/hibernation/HibernationManager.java
index 7feacafb514..e077c485071 100644
--- a/engine/src/main/java/org/terasology/engine/core/subsystem/common/hibernation/HibernationManager.java
+++ b/engine/src/main/java/org/terasology/engine/core/subsystem/common/hibernation/HibernationManager.java
@@ -15,7 +15,7 @@
  */
 package org.terasology.engine.core.subsystem.common.hibernation;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  *
diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/Component.java b/engine/src/main/java/org/terasology/engine/entitySystem/Component.java
index 66dc9f8fdc6..7c5bd807ccf 100644
--- a/engine/src/main/java/org/terasology/engine/entitySystem/Component.java
+++ b/engine/src/main/java/org/terasology/engine/entitySystem/Component.java
@@ -15,6 +15,8 @@
  */
 package org.terasology.engine.entitySystem;
 
+import org.terasology.context.annotation.IndexInherited;
+
 /**
  * A Component is (a collection of) <b>data</b> that
  * <ul>
@@ -23,6 +25,7 @@
  * </ul>
  *
  */
+@IndexInherited
 public interface Component {
 
 }
diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EntityScope.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EntityScope.java
index 5a70c7c4f96..6daf81c0ee3 100644
--- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EntityScope.java
+++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/EntityScope.java
@@ -15,7 +15,7 @@
  */
 package org.terasology.engine.entitySystem.entity.internal;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 @API
 public enum EntityScope {
diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/package-info.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/package-info.java
index 73cbf571b2e..5b6e8024abf 100644
--- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/package-info.java
@@ -16,4 +16,4 @@
 
 @API package org.terasology.engine.entitySystem.entity.lifecycleEvents;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/entity/package-info.java b/engine/src/main/java/org/terasology/engine/entitySystem/entity/package-info.java
index 7e64f69c7d4..30beceb4532 100644
--- a/engine/src/main/java/org/terasology/engine/entitySystem/entity/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/entitySystem/entity/package-info.java
@@ -16,4 +16,4 @@
 
 @API package org.terasology.engine.entitySystem.entity;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/event/Event.java b/engine/src/main/java/org/terasology/engine/entitySystem/event/Event.java
index b6d3e1bece0..ff8a2163b6e 100644
--- a/engine/src/main/java/org/terasology/engine/entitySystem/event/Event.java
+++ b/engine/src/main/java/org/terasology/engine/entitySystem/event/Event.java
@@ -15,9 +15,12 @@
  */
 package org.terasology.engine.entitySystem.event;
 
+import org.terasology.context.annotation.IndexInherited;
+
 /**
  * Marker interface for classes that can be sent to entities as events
  *
  */
+@IndexInherited
 public interface Event {
 }
diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/event/package-info.java b/engine/src/main/java/org/terasology/engine/entitySystem/event/package-info.java
index 0d446cb5257..5685ee9fc50 100644
--- a/engine/src/main/java/org/terasology/engine/entitySystem/event/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/entitySystem/event/package-info.java
@@ -16,4 +16,4 @@
 
 @API package org.terasology.engine.entitySystem.event;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/metadata/package-info.java b/engine/src/main/java/org/terasology/engine/entitySystem/metadata/package-info.java
index 2725aec733b..6f90ba8924e 100644
--- a/engine/src/main/java/org/terasology/engine/entitySystem/metadata/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/entitySystem/metadata/package-info.java
@@ -21,4 +21,4 @@
 @API
 package org.terasology.engine.entitySystem.metadata;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/package-info.java b/engine/src/main/java/org/terasology/engine/entitySystem/package-info.java
index 831b2921779..9a5836801ca 100644
--- a/engine/src/main/java/org/terasology/engine/entitySystem/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/entitySystem/package-info.java
@@ -16,4 +16,4 @@
 
 @API package org.terasology.engine.entitySystem;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/prefab/package-info.java b/engine/src/main/java/org/terasology/engine/entitySystem/prefab/package-info.java
index 0aeb748522d..3a9e7c720b6 100644
--- a/engine/src/main/java/org/terasology/engine/entitySystem/prefab/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/entitySystem/prefab/package-info.java
@@ -16,4 +16,4 @@
 
 @API package org.terasology.engine.entitySystem.prefab;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/sectors/LoadedSectorUpdateEvent.java b/engine/src/main/java/org/terasology/engine/entitySystem/sectors/LoadedSectorUpdateEvent.java
index c166917a2d4..7e283bd7937 100644
--- a/engine/src/main/java/org/terasology/engine/entitySystem/sectors/LoadedSectorUpdateEvent.java
+++ b/engine/src/main/java/org/terasology/engine/entitySystem/sectors/LoadedSectorUpdateEvent.java
@@ -17,7 +17,7 @@
 
 import org.joml.Vector3i;
 import org.terasology.engine.entitySystem.event.Event;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 import java.util.Set;
 
diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorRegionComponent.java b/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorRegionComponent.java
index 620eaf455ad..f139ef88ade 100644
--- a/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorRegionComponent.java
+++ b/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorRegionComponent.java
@@ -17,7 +17,7 @@
 
 import org.joml.Vector3i;
 import org.terasology.engine.entitySystem.Component;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.engine.world.chunks.Chunk;
 
 import java.util.HashSet;
diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorSimulationComponent.java b/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorSimulationComponent.java
index d542644dcbb..bc00be2f0b0 100644
--- a/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorSimulationComponent.java
+++ b/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorSimulationComponent.java
@@ -19,7 +19,7 @@
 import org.terasology.engine.entitySystem.entity.EntityManager;
 import org.terasology.engine.entitySystem.entity.internal.BaseEntityRef;
 import org.terasology.engine.entitySystem.entity.internal.EntityScope;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  * The component that allows the {@link SectorSimulationSystem} to send simulation events to a sector-scope entity.
diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorSimulationEvent.java b/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorSimulationEvent.java
index 0a49f090c92..2a5ea22b938 100644
--- a/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorSimulationEvent.java
+++ b/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorSimulationEvent.java
@@ -17,7 +17,7 @@
 
 import org.terasology.engine.entitySystem.entity.EntityRef;
 import org.terasology.engine.entitySystem.event.Event;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  * This is the event sent to all sector-level entities by the {@link SectorSimulationSystem}, allowing them to do simulation. It
diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorUtil.java b/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorUtil.java
index b6ce3dc3cb7..2325bf9cb74 100644
--- a/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorUtil.java
+++ b/engine/src/main/java/org/terasology/engine/entitySystem/sectors/SectorUtil.java
@@ -20,7 +20,7 @@
 import org.joml.Vector3ic;
 import org.terasology.engine.entitySystem.entity.EntityRef;
 import org.terasology.engine.logic.location.LocationComponent;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.engine.world.chunks.Chunk;
 import org.terasology.engine.world.chunks.ChunkProvider;
 import org.terasology.engine.world.chunks.Chunks;
diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/systems/RegisterSystem.java b/engine/src/main/java/org/terasology/engine/entitySystem/systems/RegisterSystem.java
index a76c55fa44e..b85270625c3 100644
--- a/engine/src/main/java/org/terasology/engine/entitySystem/systems/RegisterSystem.java
+++ b/engine/src/main/java/org/terasology/engine/entitySystem/systems/RegisterSystem.java
@@ -16,6 +16,8 @@
 
 package org.terasology.engine.entitySystem.systems;
 
+import org.terasology.context.annotation.Index;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -35,6 +37,7 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
+@Index
 public @interface RegisterSystem {
 
     String[] requiresOptional() default {};
diff --git a/engine/src/main/java/org/terasology/engine/entitySystem/systems/package-info.java b/engine/src/main/java/org/terasology/engine/entitySystem/systems/package-info.java
index 32962c9f8d5..4e31d603953 100644
--- a/engine/src/main/java/org/terasology/engine/entitySystem/systems/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/entitySystem/systems/package-info.java
@@ -16,4 +16,4 @@
 
 @API package org.terasology.engine.entitySystem.systems;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/i18n/TranslationSystem.java b/engine/src/main/java/org/terasology/engine/i18n/TranslationSystem.java
index f9815818b9a..4f89ca93958 100644
--- a/engine/src/main/java/org/terasology/engine/i18n/TranslationSystem.java
+++ b/engine/src/main/java/org/terasology/engine/i18n/TranslationSystem.java
@@ -4,7 +4,7 @@
 package org.terasology.engine.i18n;
 
 import org.terasology.engine.core.Uri;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.nui.translate.Translator;
 
 import java.util.Locale;
diff --git a/engine/src/main/java/org/terasology/engine/i18n/assets/package-info.java b/engine/src/main/java/org/terasology/engine/i18n/assets/package-info.java
index c6ffc21565a..9e37841c851 100644
--- a/engine/src/main/java/org/terasology/engine/i18n/assets/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/i18n/assets/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.i18n.assets;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/input/RegisterBindAxis.java b/engine/src/main/java/org/terasology/engine/input/RegisterBindAxis.java
index 864f58de6e3..7c8892308ad 100644
--- a/engine/src/main/java/org/terasology/engine/input/RegisterBindAxis.java
+++ b/engine/src/main/java/org/terasology/engine/input/RegisterBindAxis.java
@@ -3,6 +3,8 @@
 
 package org.terasology.engine.input;
 
+import org.terasology.context.annotation.Index;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -12,6 +14,7 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
+@Index
 public @interface RegisterBindAxis {
     String id();
 
diff --git a/engine/src/main/java/org/terasology/engine/input/RegisterBindButton.java b/engine/src/main/java/org/terasology/engine/input/RegisterBindButton.java
index 4b40efb00d7..c3239dea704 100644
--- a/engine/src/main/java/org/terasology/engine/input/RegisterBindButton.java
+++ b/engine/src/main/java/org/terasology/engine/input/RegisterBindButton.java
@@ -3,6 +3,7 @@
 
 package org.terasology.engine.input;
 
+import org.terasology.context.annotation.Index;
 import org.terasology.input.ActivateMode;
 
 import java.lang.annotation.ElementType;
@@ -14,6 +15,7 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
+@Index
 public @interface RegisterBindButton {
     String id();
 
diff --git a/engine/src/main/java/org/terasology/engine/input/RegisterRealBindAxis.java b/engine/src/main/java/org/terasology/engine/input/RegisterRealBindAxis.java
index 217ae68c467..761b48602b6 100644
--- a/engine/src/main/java/org/terasology/engine/input/RegisterRealBindAxis.java
+++ b/engine/src/main/java/org/terasology/engine/input/RegisterRealBindAxis.java
@@ -3,6 +3,8 @@
 
 package org.terasology.engine.input;
 
+import org.terasology.context.annotation.Index;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -12,6 +14,7 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
+@Index
 public @interface RegisterRealBindAxis {
     String id();
 
diff --git a/engine/src/main/java/org/terasology/engine/input/binds/general/package-info.java b/engine/src/main/java/org/terasology/engine/input/binds/general/package-info.java
index f039df4753b..86c1df73679 100644
--- a/engine/src/main/java/org/terasology/engine/input/binds/general/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/input/binds/general/package-info.java
@@ -7,5 +7,5 @@
         displayName = "${engine:menu#category-general}"
         ) package org.terasology.engine.input.binds.general;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.input.InputCategory;
diff --git a/engine/src/main/java/org/terasology/engine/input/binds/interaction/package-info.java b/engine/src/main/java/org/terasology/engine/input/binds/interaction/package-info.java
index 0b82d3cc2cb..1497a4ca1fe 100644
--- a/engine/src/main/java/org/terasology/engine/input/binds/interaction/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/input/binds/interaction/package-info.java
@@ -10,5 +10,5 @@
                 "engine:frob"
         }) package org.terasology.engine.input.binds.interaction;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.input.InputCategory;
diff --git a/engine/src/main/java/org/terasology/engine/input/binds/inventory/UseItemButton.java b/engine/src/main/java/org/terasology/engine/input/binds/inventory/UseItemButton.java
index 99d7348966f..7c9a2dc074c 100644
--- a/engine/src/main/java/org/terasology/engine/input/binds/inventory/UseItemButton.java
+++ b/engine/src/main/java/org/terasology/engine/input/binds/inventory/UseItemButton.java
@@ -6,7 +6,7 @@
 import org.terasology.engine.input.BindButtonEvent;
 import org.terasology.engine.input.DefaultBinding;
 import org.terasology.engine.input.RegisterBindButton;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.input.ControllerId;
 import org.terasology.input.InputType;
 
diff --git a/engine/src/main/java/org/terasology/engine/input/binds/movement/package-info.java b/engine/src/main/java/org/terasology/engine/input/binds/movement/package-info.java
index 7bc87772582..256bdaba8cd 100644
--- a/engine/src/main/java/org/terasology/engine/input/binds/movement/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/input/binds/movement/package-info.java
@@ -18,5 +18,5 @@
                 "engine:crouch"
         }) package org.terasology.engine.input.binds.movement;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.input.InputCategory;
diff --git a/engine/src/main/java/org/terasology/engine/input/cameraTarget/package-info.java b/engine/src/main/java/org/terasology/engine/input/cameraTarget/package-info.java
index e719e54cedd..331e480925b 100644
--- a/engine/src/main/java/org/terasology/engine/input/cameraTarget/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/input/cameraTarget/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.input.cameraTarget;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/input/events/package-info.java b/engine/src/main/java/org/terasology/engine/input/events/package-info.java
index bc07ea79358..450590c8e95 100644
--- a/engine/src/main/java/org/terasology/engine/input/events/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/input/events/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.input.events;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/input/package-info.java b/engine/src/main/java/org/terasology/engine/input/package-info.java
index 487b1ea7f11..1f8af538f16 100644
--- a/engine/src/main/java/org/terasology/engine/input/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/input/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.input;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/logic/actions/package-info.java b/engine/src/main/java/org/terasology/engine/logic/actions/package-info.java
index 10e698325ca..d9b2347f161 100644
--- a/engine/src/main/java/org/terasology/engine/logic/actions/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/logic/actions/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.logic.actions;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/logic/ai/package-info.java b/engine/src/main/java/org/terasology/engine/logic/ai/package-info.java
index 99ced52762d..3055227ed6f 100644
--- a/engine/src/main/java/org/terasology/engine/logic/ai/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/logic/ai/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.logic.ai;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/logic/autoCreate/AutoCreateComponent.java b/engine/src/main/java/org/terasology/engine/logic/autoCreate/AutoCreateComponent.java
index f06bc369625..1f9a4138c47 100644
--- a/engine/src/main/java/org/terasology/engine/logic/autoCreate/AutoCreateComponent.java
+++ b/engine/src/main/java/org/terasology/engine/logic/autoCreate/AutoCreateComponent.java
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.engine.logic.autoCreate;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.engine.entitySystem.Component;
 
 /**
diff --git a/engine/src/main/java/org/terasology/engine/logic/behavior/BehaviorAction.java b/engine/src/main/java/org/terasology/engine/logic/behavior/BehaviorAction.java
index 356332ce294..d96a6f9f7d4 100644
--- a/engine/src/main/java/org/terasology/engine/logic/behavior/BehaviorAction.java
+++ b/engine/src/main/java/org/terasology/engine/logic/behavior/BehaviorAction.java
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.engine.logic.behavior;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/engine/src/main/java/org/terasology/engine/logic/behavior/BehaviorComponent.java b/engine/src/main/java/org/terasology/engine/logic/behavior/BehaviorComponent.java
index 79fece522cb..2ded7695da5 100644
--- a/engine/src/main/java/org/terasology/engine/logic/behavior/BehaviorComponent.java
+++ b/engine/src/main/java/org/terasology/engine/logic/behavior/BehaviorComponent.java
@@ -4,7 +4,7 @@
 
 import org.terasology.engine.entitySystem.Component;
 import org.terasology.engine.logic.behavior.asset.BehaviorTree;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  * Entities with this component are handled by a behavior tree. Default tree to fetch may be set.
diff --git a/engine/src/main/java/org/terasology/engine/logic/behavior/CollectiveBehaviorComponent.java b/engine/src/main/java/org/terasology/engine/logic/behavior/CollectiveBehaviorComponent.java
index 160c47d361a..84958501337 100644
--- a/engine/src/main/java/org/terasology/engine/logic/behavior/CollectiveBehaviorComponent.java
+++ b/engine/src/main/java/org/terasology/engine/logic/behavior/CollectiveBehaviorComponent.java
@@ -4,7 +4,7 @@
 
 import org.terasology.engine.entitySystem.Component;
 import org.terasology.engine.logic.behavior.asset.BehaviorTree;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  * Entities with this component are handled by a behavior tree. Default tree to fetch may be set.
diff --git a/engine/src/main/java/org/terasology/engine/logic/behavior/CollectiveInterpreter.java b/engine/src/main/java/org/terasology/engine/logic/behavior/CollectiveInterpreter.java
index c34d2f6fec1..25cb5b945e1 100644
--- a/engine/src/main/java/org/terasology/engine/logic/behavior/CollectiveInterpreter.java
+++ b/engine/src/main/java/org/terasology/engine/logic/behavior/CollectiveInterpreter.java
@@ -6,7 +6,7 @@
 import org.terasology.engine.logic.behavior.core.Actor;
 import org.terasology.engine.logic.behavior.core.CollectiveBehaviorTreeRunner;
 import org.terasology.engine.logic.common.DisplayNameComponent;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 import java.util.Set;
 
diff --git a/engine/src/main/java/org/terasology/engine/logic/behavior/Interpreter.java b/engine/src/main/java/org/terasology/engine/logic/behavior/Interpreter.java
index 848df2fba86..33048ee6200 100644
--- a/engine/src/main/java/org/terasology/engine/logic/behavior/Interpreter.java
+++ b/engine/src/main/java/org/terasology/engine/logic/behavior/Interpreter.java
@@ -6,7 +6,7 @@
 import org.terasology.engine.logic.behavior.core.Actor;
 import org.terasology.engine.logic.behavior.core.BehaviorTreeRunner;
 import org.terasology.engine.logic.common.DisplayNameComponent;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  * An interpreter evaluates a behavior tree. Uses BehaviorTreeRunner to actually evaluate the tree. The runner
diff --git a/engine/src/main/java/org/terasology/engine/logic/behavior/actions/CounterAction.java b/engine/src/main/java/org/terasology/engine/logic/behavior/actions/CounterAction.java
index c9fb23f167e..2390031ed48 100644
--- a/engine/src/main/java/org/terasology/engine/logic/behavior/actions/CounterAction.java
+++ b/engine/src/main/java/org/terasology/engine/logic/behavior/actions/CounterAction.java
@@ -6,7 +6,7 @@
 import org.terasology.engine.logic.behavior.core.Actor;
 import org.terasology.engine.logic.behavior.core.BaseAction;
 import org.terasology.engine.logic.behavior.core.BehaviorState;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.nui.properties.Range;
 
 /**
diff --git a/engine/src/main/java/org/terasology/engine/logic/behavior/actions/InvertAction.java b/engine/src/main/java/org/terasology/engine/logic/behavior/actions/InvertAction.java
index 5846287ebee..0b8e4759baa 100644
--- a/engine/src/main/java/org/terasology/engine/logic/behavior/actions/InvertAction.java
+++ b/engine/src/main/java/org/terasology/engine/logic/behavior/actions/InvertAction.java
@@ -6,7 +6,7 @@
 import org.terasology.engine.logic.behavior.core.Actor;
 import org.terasology.engine.logic.behavior.core.BaseAction;
 import org.terasology.engine.logic.behavior.core.BehaviorState;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  * Inverts the child's return value. Doesn't change RUNNING.
diff --git a/engine/src/main/java/org/terasology/engine/logic/behavior/actions/LookupAction.java b/engine/src/main/java/org/terasology/engine/logic/behavior/actions/LookupAction.java
index 7d7001357c7..4a186916275 100644
--- a/engine/src/main/java/org/terasology/engine/logic/behavior/actions/LookupAction.java
+++ b/engine/src/main/java/org/terasology/engine/logic/behavior/actions/LookupAction.java
@@ -8,7 +8,7 @@
 import org.terasology.engine.logic.behavior.core.BaseAction;
 import org.terasology.engine.logic.behavior.core.BehaviorNode;
 import org.terasology.engine.logic.behavior.core.BehaviorState;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.nui.properties.OneOf;
 
 /**
diff --git a/engine/src/main/java/org/terasology/engine/logic/behavior/actions/LoopAction.java b/engine/src/main/java/org/terasology/engine/logic/behavior/actions/LoopAction.java
index e5bdd81bb66..e4d19c93937 100644
--- a/engine/src/main/java/org/terasology/engine/logic/behavior/actions/LoopAction.java
+++ b/engine/src/main/java/org/terasology/engine/logic/behavior/actions/LoopAction.java
@@ -6,7 +6,7 @@
 import org.terasology.engine.logic.behavior.core.Actor;
 import org.terasology.engine.logic.behavior.core.BaseAction;
 import org.terasology.engine.logic.behavior.core.BehaviorState;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  * Node, that loops its child forever
diff --git a/engine/src/main/java/org/terasology/engine/logic/behavior/actions/SleepAction.java b/engine/src/main/java/org/terasology/engine/logic/behavior/actions/SleepAction.java
index e72d6e1468c..53b3d1d85ad 100644
--- a/engine/src/main/java/org/terasology/engine/logic/behavior/actions/SleepAction.java
+++ b/engine/src/main/java/org/terasology/engine/logic/behavior/actions/SleepAction.java
@@ -6,7 +6,7 @@
 import org.terasology.engine.logic.behavior.core.Actor;
 import org.terasology.engine.logic.behavior.core.BaseAction;
 import org.terasology.engine.logic.behavior.core.BehaviorState;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.nui.properties.Range;
 
 /**
diff --git a/engine/src/main/java/org/terasology/engine/logic/behavior/actions/TimeoutAction.java b/engine/src/main/java/org/terasology/engine/logic/behavior/actions/TimeoutAction.java
index 332bce5df38..b6cb6bdd6d2 100644
--- a/engine/src/main/java/org/terasology/engine/logic/behavior/actions/TimeoutAction.java
+++ b/engine/src/main/java/org/terasology/engine/logic/behavior/actions/TimeoutAction.java
@@ -8,7 +8,7 @@
 import org.terasology.engine.logic.behavior.core.Actor;
 import org.terasology.engine.logic.behavior.core.BaseAction;
 import org.terasology.engine.logic.behavior.core.BehaviorState;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.nui.properties.Range;
 
 /**
diff --git a/engine/src/main/java/org/terasology/engine/logic/behavior/actions/package-info.java b/engine/src/main/java/org/terasology/engine/logic/behavior/actions/package-info.java
index 9dcc4acf620..aceafdd4790 100644
--- a/engine/src/main/java/org/terasology/engine/logic/behavior/actions/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/logic/behavior/actions/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.logic.behavior.actions;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/logic/behavior/asset/BehaviorTree.java b/engine/src/main/java/org/terasology/engine/logic/behavior/asset/BehaviorTree.java
index 6702766133d..c4f078a3b68 100644
--- a/engine/src/main/java/org/terasology/engine/logic/behavior/asset/BehaviorTree.java
+++ b/engine/src/main/java/org/terasology/engine/logic/behavior/asset/BehaviorTree.java
@@ -6,7 +6,7 @@
 import org.terasology.gestalt.assets.AssetType;
 import org.terasology.gestalt.assets.ResourceUrn;
 import org.terasology.engine.logic.behavior.core.BehaviorNode;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  * Behavior tree asset. Can be loaded and saved into json. Actors should never run the nodes behind a asset directly.
diff --git a/engine/src/main/java/org/terasology/engine/logic/behavior/asset/GroupBuilder.java b/engine/src/main/java/org/terasology/engine/logic/behavior/asset/GroupBuilder.java
index 70f5366ad90..f8b455d6a89 100644
--- a/engine/src/main/java/org/terasology/engine/logic/behavior/asset/GroupBuilder.java
+++ b/engine/src/main/java/org/terasology/engine/logic/behavior/asset/GroupBuilder.java
@@ -5,7 +5,7 @@
 import com.google.gson.Gson;
 import com.google.gson.JsonIOException;
 import com.google.gson.JsonSyntaxException;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.engine.registry.In;
 
 import java.io.InputStream;
diff --git a/engine/src/main/java/org/terasology/engine/logic/behavior/asset/package-info.java b/engine/src/main/java/org/terasology/engine/logic/behavior/asset/package-info.java
index 14438185b6d..78c887b37f9 100644
--- a/engine/src/main/java/org/terasology/engine/logic/behavior/asset/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/logic/behavior/asset/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.logic.behavior.asset;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/logic/behavior/core/Action.java b/engine/src/main/java/org/terasology/engine/logic/behavior/core/Action.java
index 640cd66a4b9..f68f2121fa3 100644
--- a/engine/src/main/java/org/terasology/engine/logic/behavior/core/Action.java
+++ b/engine/src/main/java/org/terasology/engine/logic/behavior/core/Action.java
@@ -2,7 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.engine.logic.behavior.core;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
+import org.terasology.context.annotation.IndexInherited;
 
 /**
  * The action that is used by an action or decorator node. Every action node of a behavior tree has its own action
@@ -12,6 +13,7 @@
  * Action instances are shown in the property panel of the behavior editor.
  */
 @API
+@IndexInherited
 public interface Action {
 
     /**
diff --git a/engine/src/main/java/org/terasology/engine/logic/behavior/core/Actor.java b/engine/src/main/java/org/terasology/engine/logic/behavior/core/Actor.java
index d1fb89d8144..a144fbff485 100644
--- a/engine/src/main/java/org/terasology/engine/logic/behavior/core/Actor.java
+++ b/engine/src/main/java/org/terasology/engine/logic/behavior/core/Actor.java
@@ -12,7 +12,7 @@
 import org.terasology.engine.entitySystem.metadata.ComponentLibrary;
 import org.terasology.engine.entitySystem.metadata.ComponentMetadata;
 import org.terasology.engine.entitySystem.metadata.EntitySystemLibrary;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.reflection.metadata.FieldMetadata;
 import org.terasology.engine.registry.CoreRegistry;
 
diff --git a/engine/src/main/java/org/terasology/engine/logic/behavior/core/BaseAction.java b/engine/src/main/java/org/terasology/engine/logic/behavior/core/BaseAction.java
index b46b5c3c288..55bd932a8d6 100644
--- a/engine/src/main/java/org/terasology/engine/logic/behavior/core/BaseAction.java
+++ b/engine/src/main/java/org/terasology/engine/logic/behavior/core/BaseAction.java
@@ -3,7 +3,7 @@
 package org.terasology.engine.logic.behavior.core;
 
 import org.terasology.engine.logic.behavior.BehaviorAction;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  * BaseAction that uses BehaviorAction annotation as its name.
diff --git a/engine/src/main/java/org/terasology/engine/logic/behavior/core/package-info.java b/engine/src/main/java/org/terasology/engine/logic/behavior/core/package-info.java
index 987f21fa31b..564dffb4094 100644
--- a/engine/src/main/java/org/terasology/engine/logic/behavior/core/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/logic/behavior/core/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.logic.behavior.core;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/logic/behavior/nui/BehaviorNodeComponent.java b/engine/src/main/java/org/terasology/engine/logic/behavior/nui/BehaviorNodeComponent.java
index d1f92392906..f6a22a30d26 100644
--- a/engine/src/main/java/org/terasology/engine/logic/behavior/nui/BehaviorNodeComponent.java
+++ b/engine/src/main/java/org/terasology/engine/logic/behavior/nui/BehaviorNodeComponent.java
@@ -3,7 +3,7 @@
 package org.terasology.engine.logic.behavior.nui;
 
 import org.terasology.engine.entitySystem.Component;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.nui.Color;
 
 /**
diff --git a/engine/src/main/java/org/terasology/engine/logic/behavior/nui/package-info.java b/engine/src/main/java/org/terasology/engine/logic/behavior/nui/package-info.java
index e23ba73a7e9..ea5f776ee4f 100644
--- a/engine/src/main/java/org/terasology/engine/logic/behavior/nui/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/logic/behavior/nui/package-info.java
@@ -6,5 +6,5 @@
         displayName = "${engine:menu#category-behavior}"
         ) package org.terasology.engine.logic.behavior.nui;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.input.InputCategory;
diff --git a/engine/src/main/java/org/terasology/engine/logic/behavior/package-info.java b/engine/src/main/java/org/terasology/engine/logic/behavior/package-info.java
index 9e0d426973e..08c5c925b02 100644
--- a/engine/src/main/java/org/terasology/engine/logic/behavior/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/logic/behavior/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.logic.behavior;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/logic/characters/events/package-info.java b/engine/src/main/java/org/terasology/engine/logic/characters/events/package-info.java
index 1b6b10cefff..117d9e89c2f 100644
--- a/engine/src/main/java/org/terasology/engine/logic/characters/events/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/logic/characters/events/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.logic.characters.events;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/logic/characters/interactions/InteractionEndPredicted.java b/engine/src/main/java/org/terasology/engine/logic/characters/interactions/InteractionEndPredicted.java
index 1969229ea66..616477d6ae3 100644
--- a/engine/src/main/java/org/terasology/engine/logic/characters/interactions/InteractionEndPredicted.java
+++ b/engine/src/main/java/org/terasology/engine/logic/characters/interactions/InteractionEndPredicted.java
@@ -4,7 +4,7 @@
 
 import org.terasology.engine.entitySystem.entity.EntityRef;
 import org.terasology.engine.entitySystem.event.Event;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  *
diff --git a/engine/src/main/java/org/terasology/engine/logic/characters/interactions/InteractionScreenComponent.java b/engine/src/main/java/org/terasology/engine/logic/characters/interactions/InteractionScreenComponent.java
index 856556022bf..c866b3bedc6 100644
--- a/engine/src/main/java/org/terasology/engine/logic/characters/interactions/InteractionScreenComponent.java
+++ b/engine/src/main/java/org/terasology/engine/logic/characters/interactions/InteractionScreenComponent.java
@@ -3,7 +3,7 @@
 package org.terasology.engine.logic.characters.interactions;
 
 import org.terasology.engine.entitySystem.Component;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  * Entities with this component will show an UI during interactions.
diff --git a/engine/src/main/java/org/terasology/engine/logic/characters/interactions/InteractionStartPredicted.java b/engine/src/main/java/org/terasology/engine/logic/characters/interactions/InteractionStartPredicted.java
index 60a2c8002e7..9665b947d7d 100644
--- a/engine/src/main/java/org/terasology/engine/logic/characters/interactions/InteractionStartPredicted.java
+++ b/engine/src/main/java/org/terasology/engine/logic/characters/interactions/InteractionStartPredicted.java
@@ -4,7 +4,7 @@
 
 import org.terasology.engine.entitySystem.entity.EntityRef;
 import org.terasology.engine.entitySystem.event.Event;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  * Sent to the client by itself at the start of an interaction between a character and a target.
diff --git a/engine/src/main/java/org/terasology/engine/logic/characters/interactions/InteractionUtil.java b/engine/src/main/java/org/terasology/engine/logic/characters/interactions/InteractionUtil.java
index 028c31c134e..ca5193fd0a3 100644
--- a/engine/src/main/java/org/terasology/engine/logic/characters/interactions/InteractionUtil.java
+++ b/engine/src/main/java/org/terasology/engine/logic/characters/interactions/InteractionUtil.java
@@ -8,7 +8,7 @@
 import org.terasology.gestalt.assets.ResourceUrn;
 import org.terasology.engine.entitySystem.entity.EntityRef;
 import org.terasology.engine.logic.characters.CharacterComponent;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  * Utility class for entities with the {@link CharacterComponent}.
diff --git a/engine/src/main/java/org/terasology/engine/logic/characters/package-info.java b/engine/src/main/java/org/terasology/engine/logic/characters/package-info.java
index e2e6f727604..0fa1f6d7799 100644
--- a/engine/src/main/java/org/terasology/engine/logic/characters/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/logic/characters/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.logic.characters;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/logic/chat/package-info.java b/engine/src/main/java/org/terasology/engine/logic/chat/package-info.java
index f409e7e7e6a..288eeafecfb 100644
--- a/engine/src/main/java/org/terasology/engine/logic/chat/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/logic/chat/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.logic.chat;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/logic/clipboard/ClipboardManager.java b/engine/src/main/java/org/terasology/engine/logic/clipboard/ClipboardManager.java
index 83a6e609e37..37e3e644a39 100644
--- a/engine/src/main/java/org/terasology/engine/logic/clipboard/ClipboardManager.java
+++ b/engine/src/main/java/org/terasology/engine/logic/clipboard/ClipboardManager.java
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.engine.logic.clipboard;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 @API // Temporarily in base permission set, until fixed - (permissionSet = "clipboard")
 public interface ClipboardManager {
diff --git a/engine/src/main/java/org/terasology/engine/logic/common/lifespan/package-info.java b/engine/src/main/java/org/terasology/engine/logic/common/lifespan/package-info.java
index 31cf6e37305..7a6ef5e968f 100644
--- a/engine/src/main/java/org/terasology/engine/logic/common/lifespan/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/logic/common/lifespan/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.logic.common.lifespan;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/logic/common/package-info.java b/engine/src/main/java/org/terasology/engine/logic/common/package-info.java
index 9b73e16c5dd..4340eae4ab4 100644
--- a/engine/src/main/java/org/terasology/engine/logic/common/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/logic/common/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.logic.common;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/logic/config/ModuleConfigManager.java b/engine/src/main/java/org/terasology/engine/logic/config/ModuleConfigManager.java
index dfb1a51b327..c6b944de54c 100644
--- a/engine/src/main/java/org/terasology/engine/logic/config/ModuleConfigManager.java
+++ b/engine/src/main/java/org/terasology/engine/logic/config/ModuleConfigManager.java
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.engine.logic.config;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 @API
 public interface ModuleConfigManager {
diff --git a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/CommandParameterSuggester.java b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/CommandParameterSuggester.java
index a864aa6bb45..fb1fe22adad 100644
--- a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/CommandParameterSuggester.java
+++ b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/CommandParameterSuggester.java
@@ -3,7 +3,7 @@
 package org.terasology.engine.logic.console.commandSystem;
 
 import org.terasology.engine.entitySystem.entity.EntityRef;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 import java.util.Set;
 
diff --git a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/ConsoleCommand.java b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/ConsoleCommand.java
index a8052121afe..6ce2c1639a3 100644
--- a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/ConsoleCommand.java
+++ b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/ConsoleCommand.java
@@ -7,7 +7,7 @@
 import org.terasology.engine.logic.console.Console;
 import org.terasology.engine.logic.console.commandSystem.exceptions.CommandExecutionException;
 import org.terasology.engine.logic.console.commandSystem.exceptions.CommandSuggestionException;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.gestalt.naming.Name;
 
 import java.util.Comparator;
diff --git a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/ParameterAdapter.java b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/ParameterAdapter.java
index 75e11983b97..e75886a4fc8 100644
--- a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/ParameterAdapter.java
+++ b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/ParameterAdapter.java
@@ -3,7 +3,7 @@
 package org.terasology.engine.logic.console.commandSystem.adapter;
 
 import org.terasology.engine.logic.console.commandSystem.AbstractCommand;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  * Used for providing parameters to {@code execute} and {@code suggest} methods of {@link AbstractCommand}
diff --git a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/ParameterAdapterManager.java b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/ParameterAdapterManager.java
index 6bd383e5abc..39155c9fa7b 100644
--- a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/ParameterAdapterManager.java
+++ b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/adapter/ParameterAdapterManager.java
@@ -5,7 +5,7 @@
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Maps;
 import org.terasology.engine.entitySystem.prefab.Prefab;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.gestalt.naming.Name;
 import org.terasology.engine.world.block.family.BlockFamily;
 
diff --git a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/annotations/package-info.java b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/annotations/package-info.java
index 75a348a2a07..7e9fa37995e 100644
--- a/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/annotations/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/logic/console/commandSystem/annotations/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.logic.console.commandSystem.annotations;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/logic/console/package-info.java b/engine/src/main/java/org/terasology/engine/logic/console/package-info.java
index 6336394652e..ec54bb9897b 100644
--- a/engine/src/main/java/org/terasology/engine/logic/console/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/logic/console/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.logic.console;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/logic/console/suggesters/package-info.java b/engine/src/main/java/org/terasology/engine/logic/console/suggesters/package-info.java
index 0917995b4d3..a3065cf26d6 100644
--- a/engine/src/main/java/org/terasology/engine/logic/console/suggesters/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/logic/console/suggesters/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.logic.console.suggesters;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/logic/delay/package-info.java b/engine/src/main/java/org/terasology/engine/logic/delay/package-info.java
index cac41d224af..c71d022ebe2 100644
--- a/engine/src/main/java/org/terasology/engine/logic/delay/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/logic/delay/package-info.java
@@ -2,4 +2,4 @@
 // SPDX-License-Identifier: Apache-2.0
 @API package org.terasology.engine.logic.delay;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/logic/health/package-info.java b/engine/src/main/java/org/terasology/engine/logic/health/package-info.java
index cb9bdf71d40..0cc153342e9 100644
--- a/engine/src/main/java/org/terasology/engine/logic/health/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/logic/health/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.logic.health;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/logic/inventory/events/package-info.java b/engine/src/main/java/org/terasology/engine/logic/inventory/events/package-info.java
index 856707bcbd9..6d1a9fce20c 100644
--- a/engine/src/main/java/org/terasology/engine/logic/inventory/events/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/logic/inventory/events/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.logic.inventory.events;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/logic/inventory/package-info.java b/engine/src/main/java/org/terasology/engine/logic/inventory/package-info.java
index e6cc4f76a6a..588fb1a99e9 100644
--- a/engine/src/main/java/org/terasology/engine/logic/inventory/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/logic/inventory/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.logic.inventory;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/logic/location/package-info.java b/engine/src/main/java/org/terasology/engine/logic/location/package-info.java
index ea4fcf1ea0e..e01e478227a 100644
--- a/engine/src/main/java/org/terasology/engine/logic/location/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/logic/location/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.logic.location;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/logic/nameTags/NameTagComponent.java b/engine/src/main/java/org/terasology/engine/logic/nameTags/NameTagComponent.java
index 565a3aa6192..3052a098e1a 100644
--- a/engine/src/main/java/org/terasology/engine/logic/nameTags/NameTagComponent.java
+++ b/engine/src/main/java/org/terasology/engine/logic/nameTags/NameTagComponent.java
@@ -4,7 +4,7 @@
 
 import org.terasology.engine.entitySystem.Component;
 import org.terasology.engine.logic.common.DisplayNameComponent;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.engine.network.Replicate;
 import org.terasology.nui.Color;
 
diff --git a/engine/src/main/java/org/terasology/engine/logic/notifications/NotificationMessageEvent.java b/engine/src/main/java/org/terasology/engine/logic/notifications/NotificationMessageEvent.java
index 2cac9da1511..c67d4a626b2 100644
--- a/engine/src/main/java/org/terasology/engine/logic/notifications/NotificationMessageEvent.java
+++ b/engine/src/main/java/org/terasology/engine/logic/notifications/NotificationMessageEvent.java
@@ -8,7 +8,7 @@
 import org.terasology.engine.logic.console.Message;
 import org.terasology.engine.logic.console.MessageEvent;
 import org.terasology.engine.logic.players.PlayerUtil;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.engine.network.OwnerEvent;
 
 /**
diff --git a/engine/src/main/java/org/terasology/engine/logic/permission/PermissionManager.java b/engine/src/main/java/org/terasology/engine/logic/permission/PermissionManager.java
index 9047a26451d..05897da00ad 100644
--- a/engine/src/main/java/org/terasology/engine/logic/permission/PermissionManager.java
+++ b/engine/src/main/java/org/terasology/engine/logic/permission/PermissionManager.java
@@ -4,7 +4,7 @@
 
 import com.google.common.base.Predicate;
 import org.terasology.engine.entitySystem.entity.EntityRef;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 @API
 public interface PermissionManager {
diff --git a/engine/src/main/java/org/terasology/engine/logic/players/event/package-info.java b/engine/src/main/java/org/terasology/engine/logic/players/event/package-info.java
index 1e4be5a9832..4ba0f9abaa8 100644
--- a/engine/src/main/java/org/terasology/engine/logic/players/event/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/logic/players/event/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.logic.players.event;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/logic/players/package-info.java b/engine/src/main/java/org/terasology/engine/logic/players/package-info.java
index 35f7e19a8b9..01a81c0b329 100644
--- a/engine/src/main/java/org/terasology/engine/logic/players/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/logic/players/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.logic.players;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/logic/selection/ApplyBlockSelectionEvent.java b/engine/src/main/java/org/terasology/engine/logic/selection/ApplyBlockSelectionEvent.java
index 49665743211..b5f65cc6b1a 100644
--- a/engine/src/main/java/org/terasology/engine/logic/selection/ApplyBlockSelectionEvent.java
+++ b/engine/src/main/java/org/terasology/engine/logic/selection/ApplyBlockSelectionEvent.java
@@ -4,7 +4,7 @@
 
 import org.terasology.engine.entitySystem.entity.EntityRef;
 import org.terasology.engine.entitySystem.event.Event;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.engine.world.block.BlockRegion;
 
 /**
diff --git a/engine/src/main/java/org/terasology/engine/logic/selection/MovableSelectionEndEvent.java b/engine/src/main/java/org/terasology/engine/logic/selection/MovableSelectionEndEvent.java
index cf8a59878aa..0a522f51056 100644
--- a/engine/src/main/java/org/terasology/engine/logic/selection/MovableSelectionEndEvent.java
+++ b/engine/src/main/java/org/terasology/engine/logic/selection/MovableSelectionEndEvent.java
@@ -3,7 +3,7 @@
 package org.terasology.engine.logic.selection;
 
 import org.terasology.engine.entitySystem.event.Event;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.engine.world.block.BlockRegion;
 
 /**
diff --git a/engine/src/main/java/org/terasology/engine/logic/selection/MovableSelectionStartEvent.java b/engine/src/main/java/org/terasology/engine/logic/selection/MovableSelectionStartEvent.java
index 662e8a28e3e..f799529b246 100644
--- a/engine/src/main/java/org/terasology/engine/logic/selection/MovableSelectionStartEvent.java
+++ b/engine/src/main/java/org/terasology/engine/logic/selection/MovableSelectionStartEvent.java
@@ -3,7 +3,7 @@
 package org.terasology.engine.logic.selection;
 
 import org.terasology.engine.world.selection.BlockSelectionComponent;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.engine.entitySystem.event.Event;
 
 /**
diff --git a/engine/src/main/java/org/terasology/engine/logic/spawner/package-info.java b/engine/src/main/java/org/terasology/engine/logic/spawner/package-info.java
index 7793ac2e0ca..b69ff64bd4c 100644
--- a/engine/src/main/java/org/terasology/engine/logic/spawner/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/logic/spawner/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.logic.spawner;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/math/package-info.java b/engine/src/main/java/org/terasology/engine/math/package-info.java
index 2529c52c079..5a9030b4351 100644
--- a/engine/src/main/java/org/terasology/engine/math/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/math/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.math;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/monitoring/package-info.java b/engine/src/main/java/org/terasology/engine/monitoring/package-info.java
index 6843c0c8232..b8c60452e49 100644
--- a/engine/src/main/java/org/terasology/engine/monitoring/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/monitoring/package-info.java
@@ -16,4 +16,4 @@
 
 @API package org.terasology.engine.monitoring;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/network/events/package-info.java b/engine/src/main/java/org/terasology/engine/network/events/package-info.java
index 549e1e4e049..9e5de0ec90c 100644
--- a/engine/src/main/java/org/terasology/engine/network/events/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/network/events/package-info.java
@@ -16,4 +16,4 @@
 
 @API package org.terasology.engine.network.events;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/network/package-info.java b/engine/src/main/java/org/terasology/engine/network/package-info.java
index cbf8acdc68f..a47ac9caec4 100644
--- a/engine/src/main/java/org/terasology/engine/network/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/network/package-info.java
@@ -16,4 +16,4 @@
 
 @API package org.terasology.engine.network;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/particles/ParticleData.java b/engine/src/main/java/org/terasology/engine/particles/ParticleData.java
index ffd499a3f77..47235f6075c 100644
--- a/engine/src/main/java/org/terasology/engine/particles/ParticleData.java
+++ b/engine/src/main/java/org/terasology/engine/particles/ParticleData.java
@@ -18,7 +18,7 @@
 import org.joml.Vector2f;
 import org.joml.Vector3f;
 import org.joml.Vector4f;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  * Data object to store the data of a single particle.
diff --git a/engine/src/main/java/org/terasology/engine/particles/ParticleDataMask.java b/engine/src/main/java/org/terasology/engine/particles/ParticleDataMask.java
index a3253d82cfb..45875fdeb69 100644
--- a/engine/src/main/java/org/terasology/engine/particles/ParticleDataMask.java
+++ b/engine/src/main/java/org/terasology/engine/particles/ParticleDataMask.java
@@ -15,7 +15,7 @@
  */
 package org.terasology.engine.particles;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  * Data mask used internally by the particle system.
diff --git a/engine/src/main/java/org/terasology/engine/particles/ParticleSystemManager.java b/engine/src/main/java/org/terasology/engine/particles/ParticleSystemManager.java
index 7735dc3bd17..d9cd801cfd7 100644
--- a/engine/src/main/java/org/terasology/engine/particles/ParticleSystemManager.java
+++ b/engine/src/main/java/org/terasology/engine/particles/ParticleSystemManager.java
@@ -16,7 +16,7 @@
 package org.terasology.engine.particles;
 
 import org.terasology.engine.entitySystem.Component;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.engine.particles.rendering.ParticleRenderingData;
 
 import java.util.stream.Stream;
diff --git a/engine/src/main/java/org/terasology/engine/particles/ParticleSystemManagerImpl.java b/engine/src/main/java/org/terasology/engine/particles/ParticleSystemManagerImpl.java
index aad482cfa47..2f578ac0d53 100644
--- a/engine/src/main/java/org/terasology/engine/particles/ParticleSystemManagerImpl.java
+++ b/engine/src/main/java/org/terasology/engine/particles/ParticleSystemManagerImpl.java
@@ -26,7 +26,7 @@
 import org.terasology.engine.entitySystem.systems.RegisterSystem;
 import org.terasology.engine.entitySystem.systems.UpdateSubscriberSystem;
 import org.terasology.engine.logic.location.LocationComponent;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.engine.particles.components.ParticleEmitterComponent;
 import org.terasology.engine.particles.events.ParticleSystemUpdateEvent;
 import org.terasology.engine.particles.rendering.ParticleRenderingData;
diff --git a/engine/src/main/java/org/terasology/engine/particles/components/ParticleDataSpriteComponent.java b/engine/src/main/java/org/terasology/engine/particles/components/ParticleDataSpriteComponent.java
index ad8256cf6db..33fa83ab850 100644
--- a/engine/src/main/java/org/terasology/engine/particles/components/ParticleDataSpriteComponent.java
+++ b/engine/src/main/java/org/terasology/engine/particles/components/ParticleDataSpriteComponent.java
@@ -17,7 +17,7 @@
 
 import org.joml.Vector2f;
 import org.terasology.engine.entitySystem.Component;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.engine.rendering.assets.texture.Texture;
 
 /**
diff --git a/engine/src/main/java/org/terasology/engine/particles/components/ParticleEmitterComponent.java b/engine/src/main/java/org/terasology/engine/particles/components/ParticleEmitterComponent.java
index 65e7a34ee7d..b4fba3b0c7d 100644
--- a/engine/src/main/java/org/terasology/engine/particles/components/ParticleEmitterComponent.java
+++ b/engine/src/main/java/org/terasology/engine/particles/components/ParticleEmitterComponent.java
@@ -18,7 +18,7 @@
 import org.terasology.engine.entitySystem.Component;
 import org.terasology.engine.entitySystem.entity.EntityRef;
 import org.terasology.engine.logic.location.LocationComponent;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.engine.particles.ParticlePool;
 import org.terasology.engine.particles.functions.affectors.AffectorFunction;
 import org.terasology.engine.particles.functions.generators.GeneratorFunction;
diff --git a/engine/src/main/java/org/terasology/engine/particles/components/affectors/AccelerationAffectorComponent.java b/engine/src/main/java/org/terasology/engine/particles/components/affectors/AccelerationAffectorComponent.java
index da730374bd4..548ccc4e284 100644
--- a/engine/src/main/java/org/terasology/engine/particles/components/affectors/AccelerationAffectorComponent.java
+++ b/engine/src/main/java/org/terasology/engine/particles/components/affectors/AccelerationAffectorComponent.java
@@ -17,7 +17,7 @@
 
 import org.joml.Vector3f;
 import org.terasology.engine.entitySystem.Component;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.engine.network.Replicate;
 
 /**
diff --git a/engine/src/main/java/org/terasology/engine/particles/components/affectors/VelocityAffectorComponent.java b/engine/src/main/java/org/terasology/engine/particles/components/affectors/VelocityAffectorComponent.java
index 121407c5ed9..5cc416b856a 100644
--- a/engine/src/main/java/org/terasology/engine/particles/components/affectors/VelocityAffectorComponent.java
+++ b/engine/src/main/java/org/terasology/engine/particles/components/affectors/VelocityAffectorComponent.java
@@ -16,7 +16,7 @@
 package org.terasology.engine.particles.components.affectors;
 
 import org.terasology.engine.entitySystem.Component;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  *
diff --git a/engine/src/main/java/org/terasology/engine/particles/components/generators/ColorRangeGeneratorComponent.java b/engine/src/main/java/org/terasology/engine/particles/components/generators/ColorRangeGeneratorComponent.java
index 4cb06c0ca61..1204e3b1c90 100644
--- a/engine/src/main/java/org/terasology/engine/particles/components/generators/ColorRangeGeneratorComponent.java
+++ b/engine/src/main/java/org/terasology/engine/particles/components/generators/ColorRangeGeneratorComponent.java
@@ -17,7 +17,7 @@
 
 import org.joml.Vector4f;
 import org.terasology.engine.entitySystem.Component;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  *
diff --git a/engine/src/main/java/org/terasology/engine/particles/components/generators/EnergyRangeGeneratorComponent.java b/engine/src/main/java/org/terasology/engine/particles/components/generators/EnergyRangeGeneratorComponent.java
index 9f7b957b703..760df9d2649 100644
--- a/engine/src/main/java/org/terasology/engine/particles/components/generators/EnergyRangeGeneratorComponent.java
+++ b/engine/src/main/java/org/terasology/engine/particles/components/generators/EnergyRangeGeneratorComponent.java
@@ -16,7 +16,7 @@
 package org.terasology.engine.particles.components.generators;
 
 import org.terasology.engine.entitySystem.Component;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  *
diff --git a/engine/src/main/java/org/terasology/engine/particles/components/generators/PositionRangeGeneratorComponent.java b/engine/src/main/java/org/terasology/engine/particles/components/generators/PositionRangeGeneratorComponent.java
index 86240ad26fc..4ea47e15341 100644
--- a/engine/src/main/java/org/terasology/engine/particles/components/generators/PositionRangeGeneratorComponent.java
+++ b/engine/src/main/java/org/terasology/engine/particles/components/generators/PositionRangeGeneratorComponent.java
@@ -17,7 +17,7 @@
 
 import org.joml.Vector3f;
 import org.terasology.engine.entitySystem.Component;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  *
diff --git a/engine/src/main/java/org/terasology/engine/particles/components/generators/ScaleRangeGeneratorComponent.java b/engine/src/main/java/org/terasology/engine/particles/components/generators/ScaleRangeGeneratorComponent.java
index fe34a146e1a..7375f20803d 100644
--- a/engine/src/main/java/org/terasology/engine/particles/components/generators/ScaleRangeGeneratorComponent.java
+++ b/engine/src/main/java/org/terasology/engine/particles/components/generators/ScaleRangeGeneratorComponent.java
@@ -17,7 +17,7 @@
 
 import org.joml.Vector3f;
 import org.terasology.engine.entitySystem.Component;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  *
diff --git a/engine/src/main/java/org/terasology/engine/particles/components/generators/TextureOffsetGeneratorComponent.java b/engine/src/main/java/org/terasology/engine/particles/components/generators/TextureOffsetGeneratorComponent.java
index 7b32f400742..430372df746 100644
--- a/engine/src/main/java/org/terasology/engine/particles/components/generators/TextureOffsetGeneratorComponent.java
+++ b/engine/src/main/java/org/terasology/engine/particles/components/generators/TextureOffsetGeneratorComponent.java
@@ -18,7 +18,7 @@
 import org.joml.Vector2f;
 import org.joml.Vector2i;
 import org.terasology.engine.entitySystem.Component;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.engine.rendering.assets.texture.Texture;
 
 import java.util.LinkedList;
diff --git a/engine/src/main/java/org/terasology/engine/particles/components/generators/VelocityRangeGeneratorComponent.java b/engine/src/main/java/org/terasology/engine/particles/components/generators/VelocityRangeGeneratorComponent.java
index 1cbb6cde742..12d3ed6fabb 100644
--- a/engine/src/main/java/org/terasology/engine/particles/components/generators/VelocityRangeGeneratorComponent.java
+++ b/engine/src/main/java/org/terasology/engine/particles/components/generators/VelocityRangeGeneratorComponent.java
@@ -17,7 +17,7 @@
 
 import org.joml.Vector3f;
 import org.terasology.engine.entitySystem.Component;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  * Generator for a particle's velocity.
diff --git a/engine/src/main/java/org/terasology/engine/particles/events/ParticleSystemUpdateEvent.java b/engine/src/main/java/org/terasology/engine/particles/events/ParticleSystemUpdateEvent.java
index 9079ff06ba0..50e16a0dfcf 100644
--- a/engine/src/main/java/org/terasology/engine/particles/events/ParticleSystemUpdateEvent.java
+++ b/engine/src/main/java/org/terasology/engine/particles/events/ParticleSystemUpdateEvent.java
@@ -16,7 +16,7 @@
 package org.terasology.engine.particles.events;
 
 import org.terasology.engine.entitySystem.event.Event;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  * Fired to notify the ParticleSystemManager that a system needs to be reconfigured.
diff --git a/engine/src/main/java/org/terasology/engine/particles/functions/RegisterParticleSystemFunction.java b/engine/src/main/java/org/terasology/engine/particles/functions/RegisterParticleSystemFunction.java
index 801cd79c2a5..25acebc5146 100644
--- a/engine/src/main/java/org/terasology/engine/particles/functions/RegisterParticleSystemFunction.java
+++ b/engine/src/main/java/org/terasology/engine/particles/functions/RegisterParticleSystemFunction.java
@@ -15,7 +15,8 @@
  */
 package org.terasology.engine.particles.functions;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
+import org.terasology.context.annotation.Index;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -28,4 +29,5 @@
 @API
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
+@Index
 public @interface RegisterParticleSystemFunction {}
diff --git a/engine/src/main/java/org/terasology/engine/particles/functions/affectors/AffectorFunction.java b/engine/src/main/java/org/terasology/engine/particles/functions/affectors/AffectorFunction.java
index 05eb138dc31..7103310664e 100644
--- a/engine/src/main/java/org/terasology/engine/particles/functions/affectors/AffectorFunction.java
+++ b/engine/src/main/java/org/terasology/engine/particles/functions/affectors/AffectorFunction.java
@@ -16,7 +16,7 @@
 package org.terasology.engine.particles.functions.affectors;
 
 import org.terasology.engine.entitySystem.Component;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.engine.particles.ParticleData;
 import org.terasology.engine.particles.ParticleDataMask;
 import org.terasology.engine.particles.functions.ParticleSystemFunction;
diff --git a/engine/src/main/java/org/terasology/engine/particles/functions/generators/GeneratorFunction.java b/engine/src/main/java/org/terasology/engine/particles/functions/generators/GeneratorFunction.java
index f857708e1f5..3f008457fdf 100644
--- a/engine/src/main/java/org/terasology/engine/particles/functions/generators/GeneratorFunction.java
+++ b/engine/src/main/java/org/terasology/engine/particles/functions/generators/GeneratorFunction.java
@@ -16,7 +16,7 @@
 package org.terasology.engine.particles.functions.generators;
 
 import org.terasology.engine.entitySystem.Component;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.engine.particles.ParticleData;
 import org.terasology.engine.particles.ParticleDataMask;
 import org.terasology.engine.particles.functions.ParticleSystemFunction;
diff --git a/engine/src/main/java/org/terasology/engine/particles/rendering/ParticleRenderingData.java b/engine/src/main/java/org/terasology/engine/particles/rendering/ParticleRenderingData.java
index c8578e2826b..a412697e67d 100644
--- a/engine/src/main/java/org/terasology/engine/particles/rendering/ParticleRenderingData.java
+++ b/engine/src/main/java/org/terasology/engine/particles/rendering/ParticleRenderingData.java
@@ -16,7 +16,7 @@
 package org.terasology.engine.particles.rendering;
 
 import org.terasology.engine.entitySystem.Component;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.engine.particles.ParticlePool;
 
 /**
diff --git a/engine/src/main/java/org/terasology/engine/persistence/TemplateEngine.java b/engine/src/main/java/org/terasology/engine/persistence/TemplateEngine.java
index aa59669fc1e..be9de005e24 100644
--- a/engine/src/main/java/org/terasology/engine/persistence/TemplateEngine.java
+++ b/engine/src/main/java/org/terasology/engine/persistence/TemplateEngine.java
@@ -16,7 +16,7 @@
 
 package org.terasology.engine.persistence;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  * Transforms the input text that contains markers (e.g. <code>${text}</code> expressions).
diff --git a/engine/src/main/java/org/terasology/engine/persistence/TemplateEngineImpl.java b/engine/src/main/java/org/terasology/engine/persistence/TemplateEngineImpl.java
index 7b2b78e14fe..fbdedfc7f84 100644
--- a/engine/src/main/java/org/terasology/engine/persistence/TemplateEngineImpl.java
+++ b/engine/src/main/java/org/terasology/engine/persistence/TemplateEngineImpl.java
@@ -20,7 +20,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  * A simple template engine that replaces <code>${text}<code> expressions
diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/RegisterTypeHandler.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/RegisterTypeHandler.java
index 600553cf880..6a8b5854d2e 100644
--- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/RegisterTypeHandler.java
+++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/RegisterTypeHandler.java
@@ -16,7 +16,7 @@
 
 package org.terasology.engine.persistence.typeHandling;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/RegisterTypeHandlerFactory.java b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/RegisterTypeHandlerFactory.java
index f70856f15ad..3c952d3297a 100644
--- a/engine/src/main/java/org/terasology/engine/persistence/typeHandling/RegisterTypeHandlerFactory.java
+++ b/engine/src/main/java/org/terasology/engine/persistence/typeHandling/RegisterTypeHandlerFactory.java
@@ -16,7 +16,7 @@
 package org.terasology.engine.persistence.typeHandling;
 
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/engine/src/main/java/org/terasology/engine/physics/components/package-info.java b/engine/src/main/java/org/terasology/engine/physics/components/package-info.java
index 6243f441afc..b5460be0441 100644
--- a/engine/src/main/java/org/terasology/engine/physics/components/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/physics/components/package-info.java
@@ -16,4 +16,4 @@
 
 @API package org.terasology.engine.physics.components;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/physics/components/shapes/package-info.java b/engine/src/main/java/org/terasology/engine/physics/components/shapes/package-info.java
index d6441987f60..288a3a7c45c 100644
--- a/engine/src/main/java/org/terasology/engine/physics/components/shapes/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/physics/components/shapes/package-info.java
@@ -16,4 +16,4 @@
 
 @API package org.terasology.engine.physics.components.shapes;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/physics/events/package-info.java b/engine/src/main/java/org/terasology/engine/physics/events/package-info.java
index b698739d0e1..dd45d8ecc5c 100644
--- a/engine/src/main/java/org/terasology/engine/physics/events/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/physics/events/package-info.java
@@ -16,4 +16,4 @@
 
 @API package org.terasology.engine.physics.events;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/physics/package-info.java b/engine/src/main/java/org/terasology/engine/physics/package-info.java
index 6f720b194f0..2c0b1870a58 100644
--- a/engine/src/main/java/org/terasology/engine/physics/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/physics/package-info.java
@@ -44,4 +44,4 @@
  */
 @API package org.terasology.engine.physics;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/physics/shapes/package-info.java b/engine/src/main/java/org/terasology/engine/physics/shapes/package-info.java
index 1ec5923920b..6e694152945 100644
--- a/engine/src/main/java/org/terasology/engine/physics/shapes/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/physics/shapes/package-info.java
@@ -16,4 +16,4 @@
 
 @API package org.terasology.engine.physics.shapes;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/registry/package-info.java b/engine/src/main/java/org/terasology/engine/registry/package-info.java
index f2df01300b0..17ac90d7760 100644
--- a/engine/src/main/java/org/terasology/engine/registry/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/registry/package-info.java
@@ -16,4 +16,4 @@
 
 @API package org.terasology.engine.registry;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/rendering/AABBRenderer.java b/engine/src/main/java/org/terasology/engine/rendering/AABBRenderer.java
index 50b2133c9bb..5741c3ccd09 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/AABBRenderer.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/AABBRenderer.java
@@ -9,7 +9,7 @@
 import org.terasology.joml.geom.AABBf;
 import org.terasology.joml.geom.AABBfc;
 import org.terasology.engine.logic.players.LocalPlayer;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.engine.registry.CoreRegistry;
 
 import static org.lwjgl.opengl.GL11.GL_BLEND;
diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/animation/package-info.java b/engine/src/main/java/org/terasology/engine/rendering/assets/animation/package-info.java
index 4ab058af621..a941823495e 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/assets/animation/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/assets/animation/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.rendering.assets.animation;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/font/package-info.java b/engine/src/main/java/org/terasology/engine/rendering/assets/font/package-info.java
index 44af06691e2..c57d6b48edc 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/assets/font/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/assets/font/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.rendering.assets.font;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/material/package-info.java b/engine/src/main/java/org/terasology/engine/rendering/assets/material/package-info.java
index b98f8e35fd3..2ad07e9b5ee 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/assets/material/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/assets/material/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.rendering.assets.material;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/mesh/MeshBuilder.java b/engine/src/main/java/org/terasology/engine/rendering/assets/mesh/MeshBuilder.java
index 86833761fde..312b427ee81 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/assets/mesh/MeshBuilder.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/assets/mesh/MeshBuilder.java
@@ -6,7 +6,7 @@
 import org.joml.Vector3f;
 import org.joml.Vector3fc;
 import org.terasology.gestalt.assets.ResourceUrn;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.nui.Colorc;
 import org.terasology.engine.utilities.Assets;
 
diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/mesh/ScreenQuadMeshProducer.java b/engine/src/main/java/org/terasology/engine/rendering/assets/mesh/ScreenQuadMeshProducer.java
index f1aa617ef68..5c585b8ab02 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/assets/mesh/ScreenQuadMeshProducer.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/assets/mesh/ScreenQuadMeshProducer.java
@@ -9,7 +9,7 @@
 import org.terasology.gestalt.assets.AssetDataProducer;
 import org.terasology.gestalt.assets.ResourceUrn;
 import org.terasology.gestalt.assets.module.annotations.RegisterAssetDataProducer;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.gestalt.naming.Name;
 
 import java.io.IOException;
diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/mesh/package-info.java b/engine/src/main/java/org/terasology/engine/rendering/assets/mesh/package-info.java
index f7223de5562..dd56f8b3e85 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/assets/mesh/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/assets/mesh/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.rendering.assets.mesh;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/shader/package-info.java b/engine/src/main/java/org/terasology/engine/rendering/assets/shader/package-info.java
index 013ec216b2d..908eee31447 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/assets/shader/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/assets/shader/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.rendering.assets.shader;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/skeletalmesh/package-info.java b/engine/src/main/java/org/terasology/engine/rendering/assets/skeletalmesh/package-info.java
index 210326e910d..1524625b6d8 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/assets/skeletalmesh/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/assets/skeletalmesh/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.rendering.assets.skeletalmesh;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/texture/package-info.java b/engine/src/main/java/org/terasology/engine/rendering/assets/texture/package-info.java
index 2891cb7a287..e829f355266 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/assets/texture/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/assets/texture/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.rendering.assets.texture;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/rendering/assets/texture/subtexture/package-info.java b/engine/src/main/java/org/terasology/engine/rendering/assets/texture/subtexture/package-info.java
index 7352d5838f3..91b0dfdb4fa 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/assets/texture/subtexture/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/assets/texture/subtexture/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.rendering.assets.texture.subtexture;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/rendering/backdrop/package-info.java b/engine/src/main/java/org/terasology/engine/rendering/backdrop/package-info.java
index f815bcbf902..4bb0884c202 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/backdrop/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/backdrop/package-info.java
@@ -4,4 +4,4 @@
 @API
 package org.terasology.engine.rendering.backdrop;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/rendering/cameras/package-info.java b/engine/src/main/java/org/terasology/engine/rendering/cameras/package-info.java
index fce825770c6..4d1aa3d1050 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/cameras/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/cameras/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.rendering.cameras;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/rendering/dag/ModuleRendering.java b/engine/src/main/java/org/terasology/engine/rendering/dag/ModuleRendering.java
index 711c059329b..897327e1aed 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/dag/ModuleRendering.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/dag/ModuleRendering.java
@@ -4,6 +4,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.terasology.context.annotation.IndexInherited;
 import org.terasology.engine.context.Context;
 import org.terasology.engine.core.SimpleUri;
 import org.terasology.engine.core.module.ModuleManager;
@@ -17,6 +18,7 @@
 import org.terasology.nui.properties.Range;
 
 @RegisterSystem
+@IndexInherited
 public abstract class ModuleRendering {
     protected static final Logger logger = LoggerFactory.getLogger(ModuleRendering.class);
 
diff --git a/engine/src/main/java/org/terasology/engine/rendering/dag/dependencyConnections/package-info.java b/engine/src/main/java/org/terasology/engine/rendering/dag/dependencyConnections/package-info.java
index 8156ea661d2..6cea3e243fd 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/dag/dependencyConnections/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/dag/dependencyConnections/package-info.java
@@ -3,4 +3,4 @@
 @API
  package org.terasology.engine.rendering.dag.dependencyConnections;
 
- import org.terasology.gestalt.module.sandbox.API;
+ import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/rendering/dag/nodes/package-info.java b/engine/src/main/java/org/terasology/engine/rendering/dag/nodes/package-info.java
index 4c240ada941..89f41669e31 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/dag/nodes/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/dag/nodes/package-info.java
@@ -3,4 +3,4 @@
 @API
 package org.terasology.engine.rendering.dag.nodes;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/rendering/dag/package-info.java b/engine/src/main/java/org/terasology/engine/rendering/dag/package-info.java
index f40f7875d38..dad9943922b 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/dag/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/dag/package-info.java
@@ -21,4 +21,4 @@
 @API
 package org.terasology.engine.rendering.dag;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/rendering/dag/stateChanges/package-info.java b/engine/src/main/java/org/terasology/engine/rendering/dag/stateChanges/package-info.java
index 5f9420c835f..24f2fac5156 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/dag/stateChanges/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/dag/stateChanges/package-info.java
@@ -11,4 +11,4 @@
 @API
 package org.terasology.engine.rendering.dag.stateChanges;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/rendering/iconmesh/IconMeshFactory.java b/engine/src/main/java/org/terasology/engine/rendering/iconmesh/IconMeshFactory.java
index 4fbe11fd220..010f81e3acc 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/iconmesh/IconMeshFactory.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/iconmesh/IconMeshFactory.java
@@ -8,7 +8,7 @@
 import org.terasology.engine.rendering.primitives.Tessellator;
 import org.terasology.engine.rendering.primitives.TessellatorHelper;
 import org.terasology.joml.geom.Rectanglei;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.gestalt.naming.Name;
 import org.terasology.engine.rendering.assets.mesh.Mesh;
 import org.terasology.engine.rendering.assets.mesh.MeshData;
diff --git a/engine/src/main/java/org/terasology/engine/rendering/logic/package-info.java b/engine/src/main/java/org/terasology/engine/rendering/logic/package-info.java
index 81de14d6493..0a6e581f824 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/logic/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/logic/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.rendering.logic;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/ScreenLayerClosedEvent.java b/engine/src/main/java/org/terasology/engine/rendering/nui/ScreenLayerClosedEvent.java
index a9b0db9b8a4..e2064b82635 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/nui/ScreenLayerClosedEvent.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/nui/ScreenLayerClosedEvent.java
@@ -4,7 +4,7 @@
 
 import org.terasology.gestalt.assets.ResourceUrn;
 import org.terasology.engine.entitySystem.event.Event;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.engine.network.OwnerEvent;
 
 /**
diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/contextMenu/ContextMenuUtils.java b/engine/src/main/java/org/terasology/engine/rendering/nui/contextMenu/ContextMenuUtils.java
index 1f93adc1cd2..019bce8fe11 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/nui/contextMenu/ContextMenuUtils.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/nui/contextMenu/ContextMenuUtils.java
@@ -4,7 +4,7 @@
 
 import com.google.common.collect.Lists;
 import org.joml.Vector2i;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.nui.databinding.Binding;
 import org.terasology.nui.databinding.ReadOnlyBinding;
 import org.terasology.nui.widgets.UIList;
diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/contextMenu/MenuTree.java b/engine/src/main/java/org/terasology/engine/rendering/nui/contextMenu/MenuTree.java
index b663aaf7758..43d56c4802f 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/nui/contextMenu/MenuTree.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/nui/contextMenu/MenuTree.java
@@ -3,7 +3,7 @@
 package org.terasology.engine.rendering.nui.contextMenu;
 
 import com.google.common.collect.Lists;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 import java.util.List;
 import java.util.function.Consumer;
diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/editor/binds/package-info.java b/engine/src/main/java/org/terasology/engine/rendering/nui/editor/binds/package-info.java
index 0c429dfe274..d7128768c3e 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/nui/editor/binds/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/nui/editor/binds/package-info.java
@@ -5,4 +5,4 @@
 package org.terasology.engine.rendering.nui.editor.binds;
 
 import org.terasology.input.InputCategory;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/internal/NUIManagerInternal.java b/engine/src/main/java/org/terasology/engine/rendering/nui/internal/NUIManagerInternal.java
index 529bf44b93f..3a8b8185de4 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/nui/internal/NUIManagerInternal.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/nui/internal/NUIManagerInternal.java
@@ -193,6 +193,9 @@ public void refreshWidgetsLibrary() {
             Name module = verifyNotNull(environment.getModuleProviding(type), "No module provides %s", type);
             widgetsLibrary.register(new ResourceUrn(module.toString(), type.getSimpleName()), type);
         }
+
+        // HACK: Interfaces are not registered in gestalt-8 as subtypes. Bug?
+        widgetsLibrary.register(new ResourceUrn(environment.getModuleProviding(UIScreenLayer.class).toString(), UIScreenLayer.class.getSimpleName()), UIScreenLayer.class);
     }
 
     @Override
diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/hud/package-info.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/hud/package-info.java
index 2c286a9aa8a..ab53aa15ab2 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/hud/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/hud/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.rendering.nui.layers.hud;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/DebugMetricsSystem.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/DebugMetricsSystem.java
index 4a82c26ba37..a20c81d6adf 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/DebugMetricsSystem.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/DebugMetricsSystem.java
@@ -5,7 +5,7 @@
 import com.google.common.base.Preconditions;
 import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
 import org.terasology.engine.entitySystem.systems.RegisterSystem;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.engine.registry.Share;
 
 import java.util.ArrayList;
diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/MetricsMode.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/MetricsMode.java
index 9925418814d..809e10b1113 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/MetricsMode.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/metrics/MetricsMode.java
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.engine.rendering.nui.layers.ingame.metrics;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  * A metrics mode is a named entry in the {@link DebugOverlay}.
diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/package-info.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/package-info.java
index aed51ddb9f0..41f776c01f4 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/ingame/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.rendering.nui.layers.ingame;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/MessagePopup.java b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/MessagePopup.java
index 66a8a949dde..cc0e89663a9 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/MessagePopup.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/nui/layers/mainMenu/MessagePopup.java
@@ -3,7 +3,7 @@
 package org.terasology.engine.rendering.nui.layers.mainMenu;
 
 import org.terasology.gestalt.assets.ResourceUrn;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.nui.WidgetUtil;
 import org.terasology.nui.widgets.ActivateEventListener;
 import org.terasology.nui.widgets.UILabel;
diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/package-info.java b/engine/src/main/java/org/terasology/engine/rendering/nui/package-info.java
index 10c55f52574..23e6d05d076 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/nui/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/nui/package-info.java
@@ -16,4 +16,4 @@
  */
 @API package org.terasology.engine.rendering.nui;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/skin/package-info.java b/engine/src/main/java/org/terasology/engine/rendering/nui/skin/package-info.java
index 6f9320dc76f..cdce5476c6d 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/nui/skin/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/nui/skin/package-info.java
@@ -6,4 +6,4 @@
  */
 @API package org.terasology.engine.rendering.nui.skin;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/basic/flow/package-info.java b/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/basic/flow/package-info.java
index cc61d7cbd9b..5fd6e0c7963 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/basic/flow/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/basic/flow/package-info.java
@@ -6,4 +6,4 @@
  */
 @API package org.terasology.engine.rendering.nui.widgets.browser.data.basic.flow;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/basic/package-info.java b/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/basic/package-info.java
index 55a988127d8..837b41dfd71 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/basic/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/basic/package-info.java
@@ -6,4 +6,4 @@
  */
 @API package org.terasology.engine.rendering.nui.widgets.browser.data.basic;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/html/basic/list/package-info.java b/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/html/basic/list/package-info.java
index 7a28c65130f..8e5bc7caad5 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/html/basic/list/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/html/basic/list/package-info.java
@@ -6,4 +6,4 @@
  */
 @API package org.terasology.engine.rendering.nui.widgets.browser.data.html.basic.list;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/html/basic/package-info.java b/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/html/basic/package-info.java
index 74dac4c8c85..44076f82453 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/html/basic/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/html/basic/package-info.java
@@ -6,4 +6,4 @@
  */
 @API package org.terasology.engine.rendering.nui.widgets.browser.data.html.basic;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/html/package-info.java b/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/html/package-info.java
index 972bc93f407..64e3f9d1b76 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/html/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/html/package-info.java
@@ -6,4 +6,4 @@
  */
 @API package org.terasology.engine.rendering.nui.widgets.browser.data.html;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/package-info.java b/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/package-info.java
index 4c07730fbf2..8fe92c4cdb4 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/data/package-info.java
@@ -6,4 +6,4 @@
  */
 @API package org.terasology.engine.rendering.nui.widgets.browser.data;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/ui/package-info.java b/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/ui/package-info.java
index d7a2624fa1d..b184f366ee5 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/ui/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/ui/package-info.java
@@ -6,4 +6,4 @@
  */
 @API package org.terasology.engine.rendering.nui.widgets.browser.ui;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/ui/style/package-info.java b/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/ui/style/package-info.java
index 3f502999319..1c74774eb2a 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/ui/style/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/browser/ui/style/package-info.java
@@ -6,4 +6,4 @@
  */
 @API package org.terasology.engine.rendering.nui.widgets.browser.ui.style;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/package-info.java b/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/package-info.java
index d0f497af672..0d6a316a08e 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/nui/widgets/package-info.java
@@ -6,4 +6,4 @@
  */
 @API package org.terasology.engine.rendering.nui.widgets;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/rendering/opengl/fbms/package-info.java b/engine/src/main/java/org/terasology/engine/rendering/opengl/fbms/package-info.java
index 7c8f0350a7f..f36365a12ac 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/opengl/fbms/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/opengl/fbms/package-info.java
@@ -16,4 +16,4 @@
 @API
 package org.terasology.engine.rendering.opengl.fbms;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/rendering/opengl/package-info.java b/engine/src/main/java/org/terasology/engine/rendering/opengl/package-info.java
index 70911100b7e..a8c5844c647 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/opengl/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/opengl/package-info.java
@@ -4,4 +4,4 @@
 @API
 package org.terasology.engine.rendering.opengl;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/rendering/openvrprovider/package-info.java b/engine/src/main/java/org/terasology/engine/rendering/openvrprovider/package-info.java
index ef8dfad121a..a71c7260c9e 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/openvrprovider/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/openvrprovider/package-info.java
@@ -3,4 +3,4 @@
 @API
 package org.terasology.engine.rendering.openvrprovider;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/rendering/primitives/BlockMeshGenerator.java b/engine/src/main/java/org/terasology/engine/rendering/primitives/BlockMeshGenerator.java
index 12425cbee9d..8e0390d5c44 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/primitives/BlockMeshGenerator.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/primitives/BlockMeshGenerator.java
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.engine.rendering.primitives;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.engine.rendering.assets.mesh.Mesh;
 import org.terasology.engine.world.ChunkView;
 
diff --git a/engine/src/main/java/org/terasology/engine/rendering/primitives/ChunkMesh.java b/engine/src/main/java/org/terasology/engine/rendering/primitives/ChunkMesh.java
index 4f8751aeb1e..e07617c4fa5 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/primitives/ChunkMesh.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/primitives/ChunkMesh.java
@@ -12,7 +12,7 @@
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL13;
 import org.lwjgl.opengl.GL15;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.engine.rendering.VertexBufferObjectUtil;
 import org.terasology.engine.rendering.assets.material.Material;
 
diff --git a/engine/src/main/java/org/terasology/engine/rendering/primitives/ChunkVertexFlag.java b/engine/src/main/java/org/terasology/engine/rendering/primitives/ChunkVertexFlag.java
index 9989a9a739b..02288367f48 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/primitives/ChunkVertexFlag.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/primitives/ChunkVertexFlag.java
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.engine.rendering.primitives;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  */
diff --git a/engine/src/main/java/org/terasology/engine/rendering/primitives/Tessellator.java b/engine/src/main/java/org/terasology/engine/rendering/primitives/Tessellator.java
index ab75f8da62a..5c414ed68ff 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/primitives/Tessellator.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/primitives/Tessellator.java
@@ -10,7 +10,7 @@
 import org.joml.Vector4f;
 import org.terasology.gestalt.assets.ResourceUrn;
 import org.terasology.engine.rendering.assets.mesh.StandardMeshData;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.engine.rendering.assets.mesh.Mesh;
 import org.terasology.engine.rendering.assets.mesh.MeshData;
 import org.terasology.engine.utilities.Assets;
diff --git a/engine/src/main/java/org/terasology/engine/rendering/primitives/TessellatorHelper.java b/engine/src/main/java/org/terasology/engine/rendering/primitives/TessellatorHelper.java
index 2aeac7b1938..32dd4a27911 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/primitives/TessellatorHelper.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/primitives/TessellatorHelper.java
@@ -5,7 +5,7 @@
 import org.joml.Vector2f;
 import org.joml.Vector3f;
 import org.joml.Vector4f;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 @API
 public final class TessellatorHelper {
diff --git a/engine/src/main/java/org/terasology/engine/rendering/primitives/package-info.java b/engine/src/main/java/org/terasology/engine/rendering/primitives/package-info.java
index b00a0084d40..e6405336666 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/primitives/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/primitives/package-info.java
@@ -3,4 +3,4 @@
 @API
 package org.terasology.engine.rendering.primitives;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/rendering/world/WorldRenderer.java b/engine/src/main/java/org/terasology/engine/rendering/world/WorldRenderer.java
index 5b8a126ee84..1652b8c0bd0 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/world/WorldRenderer.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/world/WorldRenderer.java
@@ -8,7 +8,7 @@
 import org.terasology.engine.rendering.cameras.SubmersibleCamera;
 import org.terasology.engine.rendering.world.viewDistance.ViewDistance;
 import org.terasology.engine.rendering.dag.RenderGraph;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  * Implementations of this class are responsible for rendering the whole 3D world,
diff --git a/engine/src/main/java/org/terasology/engine/rendering/world/package-info.java b/engine/src/main/java/org/terasology/engine/rendering/world/package-info.java
index 3b7a15eaf9d..a1bd9c3774e 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/world/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/world/package-info.java
@@ -3,4 +3,4 @@
 @API
 package org.terasology.engine.rendering.world;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/rendering/world/selection/BlockSelectionRenderer.java b/engine/src/main/java/org/terasology/engine/rendering/world/selection/BlockSelectionRenderer.java
index 396e20048c0..cfefb775aa7 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/world/selection/BlockSelectionRenderer.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/world/selection/BlockSelectionRenderer.java
@@ -17,7 +17,7 @@
 import org.terasology.engine.rendering.primitives.Tessellator;
 import org.terasology.engine.rendering.primitives.TessellatorHelper;
 import org.terasology.joml.geom.Rectanglef;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.engine.registry.CoreRegistry;
 import org.terasology.engine.rendering.assets.mesh.Mesh;
 import org.terasology.engine.rendering.world.WorldRenderer;
diff --git a/engine/src/main/java/org/terasology/engine/rendering/world/viewDistance/package-info.java b/engine/src/main/java/org/terasology/engine/rendering/world/viewDistance/package-info.java
index 26cd93ad2ad..a0af308a615 100644
--- a/engine/src/main/java/org/terasology/engine/rendering/world/viewDistance/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/rendering/world/viewDistance/package-info.java
@@ -3,4 +3,4 @@
 @API
 package org.terasology.engine.rendering.world.viewDistance;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/telemetry/Metrics.java b/engine/src/main/java/org/terasology/engine/telemetry/Metrics.java
index 59fa8c7fbb4..be9db7d9338 100644
--- a/engine/src/main/java/org/terasology/engine/telemetry/Metrics.java
+++ b/engine/src/main/java/org/terasology/engine/telemetry/Metrics.java
@@ -25,7 +25,7 @@
 import org.terasology.gestalt.module.dependencyresolution.ResolutionResult;
 import org.terasology.gestalt.module.predicates.FromModule;
 import org.terasology.gestalt.module.resources.DirectoryFileSource;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.gestalt.naming.Name;
 import org.terasology.engine.telemetry.metrics.Metric;
 
diff --git a/engine/src/main/java/org/terasology/engine/telemetry/TelemetryCategory.java b/engine/src/main/java/org/terasology/engine/telemetry/TelemetryCategory.java
index e5694c4a1ad..f862e9bd84f 100644
--- a/engine/src/main/java/org/terasology/engine/telemetry/TelemetryCategory.java
+++ b/engine/src/main/java/org/terasology/engine/telemetry/TelemetryCategory.java
@@ -15,7 +15,8 @@
  */
 package org.terasology.engine.telemetry;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
+import org.terasology.context.annotation.Index;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -27,6 +28,7 @@
  * The {@link org.terasology.engine.telemetry.TelemetryScreen} find telemetry information via this annotation.
  */
 @API
+@Index
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
 public @interface TelemetryCategory {
diff --git a/engine/src/main/java/org/terasology/engine/telemetry/TelemetryField.java b/engine/src/main/java/org/terasology/engine/telemetry/TelemetryField.java
index 34379ccec60..f1dff00aba6 100644
--- a/engine/src/main/java/org/terasology/engine/telemetry/TelemetryField.java
+++ b/engine/src/main/java/org/terasology/engine/telemetry/TelemetryField.java
@@ -15,7 +15,7 @@
  */
 package org.terasology.engine.telemetry;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/engine/src/main/java/org/terasology/engine/telemetry/TelemetryParams.java b/engine/src/main/java/org/terasology/engine/telemetry/TelemetryParams.java
index febb4ac1d25..b43b2098f3f 100644
--- a/engine/src/main/java/org/terasology/engine/telemetry/TelemetryParams.java
+++ b/engine/src/main/java/org/terasology/engine/telemetry/TelemetryParams.java
@@ -18,7 +18,7 @@
 import com.snowplowanalytics.snowplow.tracker.DevicePlatform;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 import java.net.InetAddress;
 import java.net.NetworkInterface;
diff --git a/engine/src/main/java/org/terasology/engine/telemetry/TelemetryUtils.java b/engine/src/main/java/org/terasology/engine/telemetry/TelemetryUtils.java
index 1f9aa9d0230..b8e44b51bab 100644
--- a/engine/src/main/java/org/terasology/engine/telemetry/TelemetryUtils.java
+++ b/engine/src/main/java/org/terasology/engine/telemetry/TelemetryUtils.java
@@ -25,7 +25,7 @@
 import org.terasology.engine.config.facade.TelemetryConfiguration;
 import org.terasology.engine.context.Context;
 import org.terasology.engine.core.subsystem.DisplayDevice;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.engine.registry.CoreRegistry;
 import org.terasology.engine.telemetry.logstash.TelemetryLogstashAppender;
 import org.terasology.engine.telemetry.metrics.Metric;
diff --git a/engine/src/main/java/org/terasology/engine/telemetry/metrics/Metric.java b/engine/src/main/java/org/terasology/engine/telemetry/metrics/Metric.java
index 129da58ace0..a9701b877f8 100644
--- a/engine/src/main/java/org/terasology/engine/telemetry/metrics/Metric.java
+++ b/engine/src/main/java/org/terasology/engine/telemetry/metrics/Metric.java
@@ -23,7 +23,7 @@
 import org.terasology.engine.config.facade.TelemetryConfiguration;
 import org.terasology.engine.context.Context;
 import org.terasology.engine.core.subsystem.DisplayDevice;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.engine.registry.CoreRegistry;
 import org.terasology.engine.telemetry.Metrics;
 import org.terasology.engine.telemetry.TelemetryCategory;
diff --git a/engine/src/main/java/org/terasology/engine/utilities/Assets.java b/engine/src/main/java/org/terasology/engine/utilities/Assets.java
index 6acda811d94..b5c016dc4a2 100644
--- a/engine/src/main/java/org/terasology/engine/utilities/Assets.java
+++ b/engine/src/main/java/org/terasology/engine/utilities/Assets.java
@@ -13,7 +13,7 @@
 import org.terasology.engine.audio.StaticSound;
 import org.terasology.engine.audio.StreamingSound;
 import org.terasology.engine.entitySystem.prefab.Prefab;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.gestalt.naming.Name;
 import org.terasology.nui.asset.UIElement;
 import org.terasology.engine.registry.CoreRegistry;
diff --git a/engine/src/main/java/org/terasology/engine/utilities/collection/package-info.java b/engine/src/main/java/org/terasology/engine/utilities/collection/package-info.java
index 1235abe09ec..e63a82c9b0c 100644
--- a/engine/src/main/java/org/terasology/engine/utilities/collection/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/utilities/collection/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.utilities.collection;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/utilities/concurrency/package-info.java b/engine/src/main/java/org/terasology/engine/utilities/concurrency/package-info.java
index bf54dda3866..54cee8ea146 100644
--- a/engine/src/main/java/org/terasology/engine/utilities/concurrency/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/utilities/concurrency/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.utilities.concurrency;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/utilities/modifiable/ModifiableValue.java b/engine/src/main/java/org/terasology/engine/utilities/modifiable/ModifiableValue.java
index 7bd9b756372..27bb70dcc62 100644
--- a/engine/src/main/java/org/terasology/engine/utilities/modifiable/ModifiableValue.java
+++ b/engine/src/main/java/org/terasology/engine/utilities/modifiable/ModifiableValue.java
@@ -3,7 +3,7 @@
 
 package org.terasology.engine.utilities.modifiable;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  * A helper type to get and modify the value of a component without changing its actual value.
diff --git a/engine/src/main/java/org/terasology/engine/utilities/procedural/package-info.java b/engine/src/main/java/org/terasology/engine/utilities/procedural/package-info.java
index 05a3d626de8..a1c70b5a6a3 100644
--- a/engine/src/main/java/org/terasology/engine/utilities/procedural/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/utilities/procedural/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.utilities.procedural;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/utilities/random/FastRandom.java b/engine/src/main/java/org/terasology/engine/utilities/random/FastRandom.java
index 4a8ca0fbdf1..6b91faaae96 100644
--- a/engine/src/main/java/org/terasology/engine/utilities/random/FastRandom.java
+++ b/engine/src/main/java/org/terasology/engine/utilities/random/FastRandom.java
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.engine.utilities.random;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  * Random number generator based on the Xorshift generator by George Marsaglia.
diff --git a/engine/src/main/java/org/terasology/engine/utilities/random/MersenneRandom.java b/engine/src/main/java/org/terasology/engine/utilities/random/MersenneRandom.java
index 05687b81b02..071e00366c9 100644
--- a/engine/src/main/java/org/terasology/engine/utilities/random/MersenneRandom.java
+++ b/engine/src/main/java/org/terasology/engine/utilities/random/MersenneRandom.java
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.engine.utilities.random;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 import ec.util.MersenneTwisterFast;
 
diff --git a/engine/src/main/java/org/terasology/engine/utilities/random/Random.java b/engine/src/main/java/org/terasology/engine/utilities/random/Random.java
index 806d8acc196..b25e0ab94b6 100644
--- a/engine/src/main/java/org/terasology/engine/utilities/random/Random.java
+++ b/engine/src/main/java/org/terasology/engine/utilities/random/Random.java
@@ -5,7 +5,7 @@
 
 import org.joml.Vector3f;
 import org.terasology.math.TeraMath;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 import java.util.List;
 
diff --git a/engine/src/main/java/org/terasology/engine/world/block/Blocks.java b/engine/src/main/java/org/terasology/engine/world/block/Blocks.java
index dbcdf9e8b86..8b156d72ce8 100644
--- a/engine/src/main/java/org/terasology/engine/world/block/Blocks.java
+++ b/engine/src/main/java/org/terasology/engine/world/block/Blocks.java
@@ -6,7 +6,7 @@
 import org.joml.Vector3fc;
 import org.joml.Vector3i;
 import org.terasology.math.TeraMath;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  * Utility class for common block-related operations.
diff --git a/engine/src/main/java/org/terasology/engine/world/block/entity/damage/package-info.java b/engine/src/main/java/org/terasology/engine/world/block/entity/damage/package-info.java
index 2adef5036ff..dd3ca32236c 100644
--- a/engine/src/main/java/org/terasology/engine/world/block/entity/damage/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/world/block/entity/damage/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.world.block.entity.damage;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/world/block/entity/neighbourUpdate/package-info.java b/engine/src/main/java/org/terasology/engine/world/block/entity/neighbourUpdate/package-info.java
index 026e5dd9c54..65348787a1b 100644
--- a/engine/src/main/java/org/terasology/engine/world/block/entity/neighbourUpdate/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/world/block/entity/neighbourUpdate/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.world.block.entity.neighbourUpdate;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/world/block/entity/package-info.java b/engine/src/main/java/org/terasology/engine/world/block/entity/package-info.java
index fba92d9d0d3..4b418d5f85c 100644
--- a/engine/src/main/java/org/terasology/engine/world/block/entity/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/world/block/entity/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.world.block.entity;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/world/block/entity/placement/package-info.java b/engine/src/main/java/org/terasology/engine/world/block/entity/placement/package-info.java
index 7e51d8a9519..0fbe6e32fb9 100644
--- a/engine/src/main/java/org/terasology/engine/world/block/entity/placement/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/world/block/entity/placement/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.world.block.entity.placement;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/world/block/family/RegisterBlockFamily.java b/engine/src/main/java/org/terasology/engine/world/block/family/RegisterBlockFamily.java
index b9ef9a8a8c2..53fdfbc1327 100644
--- a/engine/src/main/java/org/terasology/engine/world/block/family/RegisterBlockFamily.java
+++ b/engine/src/main/java/org/terasology/engine/world/block/family/RegisterBlockFamily.java
@@ -3,6 +3,8 @@
 package org.terasology.engine.world.block.family;
 
 
+import org.terasology.context.annotation.Index;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -18,6 +20,7 @@
  * <code>@BlockSections({"first", "second", "third"})</code><br>
  * In this case, a block family named "painting" which has three different sections named "first, "second" and "third" will be registered.
  */
+@Index
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
 public @interface RegisterBlockFamily {
diff --git a/engine/src/main/java/org/terasology/engine/world/block/family/package-info.java b/engine/src/main/java/org/terasology/engine/world/block/family/package-info.java
index 9e1b82a3e54..d2563b6a50c 100644
--- a/engine/src/main/java/org/terasology/engine/world/block/family/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/world/block/family/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.world.block.family;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/world/block/items/package-info.java b/engine/src/main/java/org/terasology/engine/world/block/items/package-info.java
index d1e85d8136b..08ccab16e86 100644
--- a/engine/src/main/java/org/terasology/engine/world/block/items/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/world/block/items/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.world.block.items;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/world/block/loader/BlockFamilyDefinition.java b/engine/src/main/java/org/terasology/engine/world/block/loader/BlockFamilyDefinition.java
index 3cb463a6927..ab9cc9aaf34 100644
--- a/engine/src/main/java/org/terasology/engine/world/block/loader/BlockFamilyDefinition.java
+++ b/engine/src/main/java/org/terasology/engine/world/block/loader/BlockFamilyDefinition.java
@@ -7,7 +7,7 @@
 import org.terasology.gestalt.assets.AssetType;
 import org.terasology.gestalt.assets.ResourceUrn;
 import org.terasology.engine.world.block.shapes.BlockShape;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.engine.world.block.BlockBuilderHelper;
 import org.terasology.engine.world.block.family.BlockFamily;
 import org.terasology.engine.world.block.family.BlockFamilyLibrary;
diff --git a/engine/src/main/java/org/terasology/engine/world/block/loader/BlockFamilyDefinitionData.java b/engine/src/main/java/org/terasology/engine/world/block/loader/BlockFamilyDefinitionData.java
index 14a8f7a91e3..4ac3ddb9668 100644
--- a/engine/src/main/java/org/terasology/engine/world/block/loader/BlockFamilyDefinitionData.java
+++ b/engine/src/main/java/org/terasology/engine/world/block/loader/BlockFamilyDefinitionData.java
@@ -5,7 +5,7 @@
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import org.terasology.gestalt.assets.AssetData;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.engine.world.block.family.AbstractBlockFamily;
 
 import java.util.List;
diff --git a/engine/src/main/java/org/terasology/engine/world/block/loader/EntityData.java b/engine/src/main/java/org/terasology/engine/world/block/loader/EntityData.java
index bc8d88c91bc..125d07919fc 100644
--- a/engine/src/main/java/org/terasology/engine/world/block/loader/EntityData.java
+++ b/engine/src/main/java/org/terasology/engine/world/block/loader/EntityData.java
@@ -3,7 +3,7 @@
 package org.terasology.engine.world.block.loader;
 
 import org.terasology.engine.entitySystem.prefab.Prefab;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  */
diff --git a/engine/src/main/java/org/terasology/engine/world/block/loader/InventoryData.java b/engine/src/main/java/org/terasology/engine/world/block/loader/InventoryData.java
index d74ff14d0c4..71c95229cbc 100644
--- a/engine/src/main/java/org/terasology/engine/world/block/loader/InventoryData.java
+++ b/engine/src/main/java/org/terasology/engine/world/block/loader/InventoryData.java
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.engine.world.block.loader;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  */
diff --git a/engine/src/main/java/org/terasology/engine/world/block/loader/SectionDefinitionData.java b/engine/src/main/java/org/terasology/engine/world/block/loader/SectionDefinitionData.java
index b0c0f8d15d6..9af144acd97 100644
--- a/engine/src/main/java/org/terasology/engine/world/block/loader/SectionDefinitionData.java
+++ b/engine/src/main/java/org/terasology/engine/world/block/loader/SectionDefinitionData.java
@@ -6,7 +6,7 @@
 import org.joml.Vector3f;
 import org.terasology.engine.world.block.shapes.BlockShape;
 import org.terasology.engine.world.block.sounds.BlockSounds;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.engine.world.block.BlockPart;
 import org.terasology.engine.world.block.tiles.BlockTile;
 
diff --git a/engine/src/main/java/org/terasology/engine/world/block/package-info.java b/engine/src/main/java/org/terasology/engine/world/block/package-info.java
index 0a9525d8431..93d2f7e4b9c 100644
--- a/engine/src/main/java/org/terasology/engine/world/block/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/world/block/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.world.block;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/world/block/regions/package-info.java b/engine/src/main/java/org/terasology/engine/world/block/regions/package-info.java
index 20c5d7d091f..5efb9da0631 100644
--- a/engine/src/main/java/org/terasology/engine/world/block/regions/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/world/block/regions/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.world.block.regions;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/world/block/shapes/package-info.java b/engine/src/main/java/org/terasology/engine/world/block/shapes/package-info.java
index 95dbee7ab4e..77a382d23ef 100644
--- a/engine/src/main/java/org/terasology/engine/world/block/shapes/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/world/block/shapes/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.world.block.shapes;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/world/block/sounds/BlockSounds.java b/engine/src/main/java/org/terasology/engine/world/block/sounds/BlockSounds.java
index be9c8c80c67..25406607a39 100644
--- a/engine/src/main/java/org/terasology/engine/world/block/sounds/BlockSounds.java
+++ b/engine/src/main/java/org/terasology/engine/world/block/sounds/BlockSounds.java
@@ -6,7 +6,7 @@
 import org.terasology.gestalt.assets.AssetType;
 import org.terasology.gestalt.assets.ResourceUrn;
 import org.terasology.engine.audio.StaticSound;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/engine/src/main/java/org/terasology/engine/world/block/sounds/BlockSoundsData.java b/engine/src/main/java/org/terasology/engine/world/block/sounds/BlockSoundsData.java
index e7c5d58d918..cf26433e358 100644
--- a/engine/src/main/java/org/terasology/engine/world/block/sounds/BlockSoundsData.java
+++ b/engine/src/main/java/org/terasology/engine/world/block/sounds/BlockSoundsData.java
@@ -4,7 +4,7 @@
 
 import org.terasology.gestalt.assets.AssetData;
 import org.terasology.engine.audio.StaticSound;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/engine/src/main/java/org/terasology/engine/world/block/tiles/BlockTile.java b/engine/src/main/java/org/terasology/engine/world/block/tiles/BlockTile.java
index 39f3f61f29a..67ca358c40d 100644
--- a/engine/src/main/java/org/terasology/engine/world/block/tiles/BlockTile.java
+++ b/engine/src/main/java/org/terasology/engine/world/block/tiles/BlockTile.java
@@ -6,7 +6,7 @@
 import org.terasology.gestalt.assets.Asset;
 import org.terasology.gestalt.assets.AssetType;
 import org.terasology.gestalt.assets.ResourceUrn;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 import java.awt.image.BufferedImage;
 import java.util.Collections;
diff --git a/engine/src/main/java/org/terasology/engine/world/block/tiles/WorldAtlas.java b/engine/src/main/java/org/terasology/engine/world/block/tiles/WorldAtlas.java
index b152bd2cdb9..e0e9967b517 100644
--- a/engine/src/main/java/org/terasology/engine/world/block/tiles/WorldAtlas.java
+++ b/engine/src/main/java/org/terasology/engine/world/block/tiles/WorldAtlas.java
@@ -5,7 +5,7 @@
 
 import org.joml.Vector2f;
 import org.terasology.gestalt.assets.ResourceUrn;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  */
diff --git a/engine/src/main/java/org/terasology/engine/world/block/typeEntity/package-info.java b/engine/src/main/java/org/terasology/engine/world/block/typeEntity/package-info.java
index 3c517815d0e..9e4de7286e9 100644
--- a/engine/src/main/java/org/terasology/engine/world/block/typeEntity/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/world/block/typeEntity/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.world.block.typeEntity;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/world/chunks/Chunk.java b/engine/src/main/java/org/terasology/engine/world/chunks/Chunk.java
index 9e19bf58ecc..ae5c8141720 100644
--- a/engine/src/main/java/org/terasology/engine/world/chunks/Chunk.java
+++ b/engine/src/main/java/org/terasology/engine/world/chunks/Chunk.java
@@ -10,7 +10,7 @@
 import org.terasology.engine.world.block.Block;
 import org.terasology.engine.world.block.BlockRegionc;
 import org.terasology.protobuf.EntityData;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  * Chunks are a box-shaped logical grouping of Terasology's blocks, for performance reasons. 
diff --git a/engine/src/main/java/org/terasology/engine/world/chunks/ChunkBlockIterator.java b/engine/src/main/java/org/terasology/engine/world/chunks/ChunkBlockIterator.java
index dfc2a4111a9..de545ccf41f 100644
--- a/engine/src/main/java/org/terasology/engine/world/chunks/ChunkBlockIterator.java
+++ b/engine/src/main/java/org/terasology/engine/world/chunks/ChunkBlockIterator.java
@@ -3,7 +3,7 @@
 package org.terasology.engine.world.chunks;
 
 import org.joml.Vector3ic;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.engine.world.block.Block;
 
 /**
diff --git a/engine/src/main/java/org/terasology/engine/world/chunks/Chunks.java b/engine/src/main/java/org/terasology/engine/world/chunks/Chunks.java
index e791555e10a..6bfd56fcf28 100644
--- a/engine/src/main/java/org/terasology/engine/world/chunks/Chunks.java
+++ b/engine/src/main/java/org/terasology/engine/world/chunks/Chunks.java
@@ -8,7 +8,7 @@
 import org.joml.Vector3fc;
 import org.joml.Vector3i;
 import org.joml.Vector3ic;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.engine.world.block.BlockRegion;
 import org.terasology.engine.world.block.BlockRegionc;
 
diff --git a/engine/src/main/java/org/terasology/engine/world/chunks/RenderableChunk.java b/engine/src/main/java/org/terasology/engine/world/chunks/RenderableChunk.java
index 0391d6f0556..b93fdd4c71f 100644
--- a/engine/src/main/java/org/terasology/engine/world/chunks/RenderableChunk.java
+++ b/engine/src/main/java/org/terasology/engine/world/chunks/RenderableChunk.java
@@ -4,7 +4,7 @@
 
 import org.joml.Vector3f;
 import org.terasology.joml.geom.AABBfc;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.engine.rendering.primitives.ChunkMesh;
 
 /**
diff --git a/engine/src/main/java/org/terasology/engine/world/chunks/blockdata/ExtraBlockDataManager.java b/engine/src/main/java/org/terasology/engine/world/chunks/blockdata/ExtraBlockDataManager.java
index 1420c704253..1b695a3a458 100644
--- a/engine/src/main/java/org/terasology/engine/world/chunks/blockdata/ExtraBlockDataManager.java
+++ b/engine/src/main/java/org/terasology/engine/world/chunks/blockdata/ExtraBlockDataManager.java
@@ -8,7 +8,7 @@
 import org.terasology.engine.context.Context;
 import org.terasology.engine.core.module.ModuleManager;
 import org.terasology.gestalt.module.ModuleEnvironment;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.engine.world.block.Block;
 import org.terasology.engine.world.block.BlockManager;
 
diff --git a/engine/src/main/java/org/terasology/engine/world/chunks/blockdata/ExtraDataSystem.java b/engine/src/main/java/org/terasology/engine/world/chunks/blockdata/ExtraDataSystem.java
index 3d2ed2024c7..bb45d504d73 100644
--- a/engine/src/main/java/org/terasology/engine/world/chunks/blockdata/ExtraDataSystem.java
+++ b/engine/src/main/java/org/terasology/engine/world/chunks/blockdata/ExtraDataSystem.java
@@ -3,7 +3,8 @@
 
 package org.terasology.engine.world.chunks.blockdata;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
+import org.terasology.context.annotation.Index;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -15,6 +16,7 @@
  * Methods for this purpose must also be annotated with {@link RegisterExtraData}.
  */
 @API
+@Index
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
 public @interface ExtraDataSystem {
diff --git a/engine/src/main/java/org/terasology/engine/world/chunks/blockdata/RegisterExtraData.java b/engine/src/main/java/org/terasology/engine/world/chunks/blockdata/RegisterExtraData.java
index 063e2d6b43f..d962117d607 100644
--- a/engine/src/main/java/org/terasology/engine/world/chunks/blockdata/RegisterExtraData.java
+++ b/engine/src/main/java/org/terasology/engine/world/chunks/blockdata/RegisterExtraData.java
@@ -3,7 +3,7 @@
 
 package org.terasology.engine.world.chunks.blockdata;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/engine/src/main/java/org/terasology/engine/world/chunks/event/package-info.java b/engine/src/main/java/org/terasology/engine/world/chunks/event/package-info.java
index 1663c200805..c79b21fe958 100644
--- a/engine/src/main/java/org/terasology/engine/world/chunks/event/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/world/chunks/event/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.world.chunks.event;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/world/generation/facets/base/package-info.java b/engine/src/main/java/org/terasology/engine/world/generation/facets/base/package-info.java
index 5efb0955df7..18db9c893b9 100644
--- a/engine/src/main/java/org/terasology/engine/world/generation/facets/base/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/world/generation/facets/base/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.world.generation.facets.base;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/world/generation/facets/package-info.java b/engine/src/main/java/org/terasology/engine/world/generation/facets/package-info.java
index 651f52311e6..046371a9b52 100644
--- a/engine/src/main/java/org/terasology/engine/world/generation/facets/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/world/generation/facets/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.world.generation.facets;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/world/generation/package-info.java b/engine/src/main/java/org/terasology/engine/world/generation/package-info.java
index 7bb422aa5c3..cdc376f4668 100644
--- a/engine/src/main/java/org/terasology/engine/world/generation/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/world/generation/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.world.generation;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/world/generator/RegisterWorldGenerator.java b/engine/src/main/java/org/terasology/engine/world/generator/RegisterWorldGenerator.java
index 50295a1e430..86ba8f9635d 100644
--- a/engine/src/main/java/org/terasology/engine/world/generator/RegisterWorldGenerator.java
+++ b/engine/src/main/java/org/terasology/engine/world/generator/RegisterWorldGenerator.java
@@ -2,6 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.engine.world.generator;
 
+import org.terasology.context.annotation.Index;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -13,6 +15,7 @@
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
+@Index
 public @interface RegisterWorldGenerator {
     String id();
 
diff --git a/engine/src/main/java/org/terasology/engine/world/generator/package-info.java b/engine/src/main/java/org/terasology/engine/world/generator/package-info.java
index d942cdf8467..10860f2d7a2 100644
--- a/engine/src/main/java/org/terasology/engine/world/generator/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/world/generator/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.world.generator;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/world/generator/plugin/RegisterPlugin.java b/engine/src/main/java/org/terasology/engine/world/generator/plugin/RegisterPlugin.java
index f6af70b2e56..8d5427af1eb 100644
--- a/engine/src/main/java/org/terasology/engine/world/generator/plugin/RegisterPlugin.java
+++ b/engine/src/main/java/org/terasology/engine/world/generator/plugin/RegisterPlugin.java
@@ -2,6 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.engine.world.generator.plugin;
 
+import org.terasology.context.annotation.Index;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -9,6 +11,7 @@
 
 /**
  */
+@Index
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
 public @interface RegisterPlugin {
diff --git a/engine/src/main/java/org/terasology/engine/world/generator/plugin/package-info.java b/engine/src/main/java/org/terasology/engine/world/generator/plugin/package-info.java
index da073ff36cf..43ec5b79aa6 100644
--- a/engine/src/main/java/org/terasology/engine/world/generator/plugin/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/world/generator/plugin/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.world.generator.plugin;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/world/package-info.java b/engine/src/main/java/org/terasology/engine/world/package-info.java
index 83df44b6af1..c8e5ffc38a9 100644
--- a/engine/src/main/java/org/terasology/engine/world/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/world/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.world;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/world/selection/BlockSelectionComponent.java b/engine/src/main/java/org/terasology/engine/world/selection/BlockSelectionComponent.java
index 125539df133..467f0104cd9 100644
--- a/engine/src/main/java/org/terasology/engine/world/selection/BlockSelectionComponent.java
+++ b/engine/src/main/java/org/terasology/engine/world/selection/BlockSelectionComponent.java
@@ -5,7 +5,7 @@
 import org.joml.Vector3i;
 import org.terasology.engine.entitySystem.Component;
 import org.terasology.engine.logic.selection.MovableSelectionStartEvent;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.engine.rendering.assets.texture.Texture;
 import org.terasology.engine.world.block.BlockRegion;
 
diff --git a/engine/src/main/java/org/terasology/engine/world/selection/event/package-info.java b/engine/src/main/java/org/terasology/engine/world/selection/event/package-info.java
index cddf691e75f..4ab769a88a3 100644
--- a/engine/src/main/java/org/terasology/engine/world/selection/event/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/world/selection/event/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.world.selection.event;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/world/sun/package-info.java b/engine/src/main/java/org/terasology/engine/world/sun/package-info.java
index f13614ef44b..d2eb1deb1dd 100644
--- a/engine/src/main/java/org/terasology/engine/world/sun/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/world/sun/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.world.sun;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/world/time/package-info.java b/engine/src/main/java/org/terasology/engine/world/time/package-info.java
index 34f81b4336f..bf0d2d752a4 100644
--- a/engine/src/main/java/org/terasology/engine/world/time/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/world/time/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.world.time;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/world/viewer/color/package-info.java b/engine/src/main/java/org/terasology/engine/world/viewer/color/package-info.java
index 0c9f795a4f4..c5894c6d4bd 100644
--- a/engine/src/main/java/org/terasology/engine/world/viewer/color/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/world/viewer/color/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.world.viewer.color;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/world/viewer/layers/FacetLayer.java b/engine/src/main/java/org/terasology/engine/world/viewer/layers/FacetLayer.java
index 4a9059d4274..b7637b81b61 100644
--- a/engine/src/main/java/org/terasology/engine/world/viewer/layers/FacetLayer.java
+++ b/engine/src/main/java/org/terasology/engine/world/viewer/layers/FacetLayer.java
@@ -3,6 +3,7 @@
 
 package org.terasology.engine.world.viewer.layers;
 
+import org.terasology.context.annotation.IndexInherited;
 import org.terasology.engine.core.Observer;
 import org.terasology.engine.world.generation.Region;
 import org.terasology.nui.Color;
@@ -12,6 +13,7 @@
 /**
  * A visual representation of a facet class
  */
+@IndexInherited
 public interface FacetLayer  {
 
     /**
diff --git a/engine/src/main/java/org/terasology/engine/world/viewer/layers/FacetLayerConfig.java b/engine/src/main/java/org/terasology/engine/world/viewer/layers/FacetLayerConfig.java
index d1d803a873e..54b77b1b5c3 100644
--- a/engine/src/main/java/org/terasology/engine/world/viewer/layers/FacetLayerConfig.java
+++ b/engine/src/main/java/org/terasology/engine/world/viewer/layers/FacetLayerConfig.java
@@ -3,7 +3,7 @@
 
 package org.terasology.engine.world.viewer.layers;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 @API
 public interface FacetLayerConfig {
diff --git a/engine/src/main/java/org/terasology/engine/world/viewer/layers/engine/package-info.java b/engine/src/main/java/org/terasology/engine/world/viewer/layers/engine/package-info.java
index f616cb92f96..d9a1f228bf8 100644
--- a/engine/src/main/java/org/terasology/engine/world/viewer/layers/engine/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/world/viewer/layers/engine/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.world.viewer.layers.engine;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/world/viewer/layers/package-info.java b/engine/src/main/java/org/terasology/engine/world/viewer/layers/package-info.java
index f33be3df83f..89f3ce105e6 100644
--- a/engine/src/main/java/org/terasology/engine/world/viewer/layers/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/world/viewer/layers/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.world.viewer.layers;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/world/viewer/picker/package-info.java b/engine/src/main/java/org/terasology/engine/world/viewer/picker/package-info.java
index 75b76f13e97..3dbb1d27dd7 100644
--- a/engine/src/main/java/org/terasology/engine/world/viewer/picker/package-info.java
+++ b/engine/src/main/java/org/terasology/engine/world/viewer/picker/package-info.java
@@ -3,4 +3,4 @@
 
 @API package org.terasology.engine.world.viewer.picker;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
diff --git a/engine/src/main/java/org/terasology/engine/world/zones/ConstantLayerThickness.java b/engine/src/main/java/org/terasology/engine/world/zones/ConstantLayerThickness.java
index 6eab0c92798..d8887205aa8 100644
--- a/engine/src/main/java/org/terasology/engine/world/zones/ConstantLayerThickness.java
+++ b/engine/src/main/java/org/terasology/engine/world/zones/ConstantLayerThickness.java
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.engine.world.zones;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  * This is a {@link LayerThickness} for a layer that has a constant, predetermined thickness at all paints.
diff --git a/engine/src/main/java/org/terasology/engine/world/zones/LayerThickness.java b/engine/src/main/java/org/terasology/engine/world/zones/LayerThickness.java
index e6a0b4333a3..966d649b2e0 100644
--- a/engine/src/main/java/org/terasology/engine/world/zones/LayerThickness.java
+++ b/engine/src/main/java/org/terasology/engine/world/zones/LayerThickness.java
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.engine.world.zones;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  * This function is used to determine the thickness of a {@link LayeredZoneRegionFunction} at each point on the layer.
diff --git a/engine/src/main/java/org/terasology/engine/world/zones/LayeredZoneRegionFunction.java b/engine/src/main/java/org/terasology/engine/world/zones/LayeredZoneRegionFunction.java
index bb2c91e507b..88922108ed1 100644
--- a/engine/src/main/java/org/terasology/engine/world/zones/LayeredZoneRegionFunction.java
+++ b/engine/src/main/java/org/terasology/engine/world/zones/LayeredZoneRegionFunction.java
@@ -6,7 +6,7 @@
 import org.terasology.engine.world.chunks.Chunks;
 import org.terasology.engine.world.generation.Region;
 import org.terasology.engine.world.generation.facets.ElevationFacet;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 import java.util.Comparator;
 import java.util.List;
diff --git a/engine/src/main/java/org/terasology/engine/world/zones/MinMaxLayerThickness.java b/engine/src/main/java/org/terasology/engine/world/zones/MinMaxLayerThickness.java
index 6876ca09002..eda158330c7 100644
--- a/engine/src/main/java/org/terasology/engine/world/zones/MinMaxLayerThickness.java
+++ b/engine/src/main/java/org/terasology/engine/world/zones/MinMaxLayerThickness.java
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.engine.world.zones;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.engine.utilities.procedural.BrownianNoise;
 import org.terasology.engine.utilities.procedural.SimplexNoise;
 
diff --git a/engine/src/main/java/org/terasology/engine/world/zones/SeededNoiseLayerThickness.java b/engine/src/main/java/org/terasology/engine/world/zones/SeededNoiseLayerThickness.java
index bc76ac15d2d..b9fb901729e 100644
--- a/engine/src/main/java/org/terasology/engine/world/zones/SeededNoiseLayerThickness.java
+++ b/engine/src/main/java/org/terasology/engine/world/zones/SeededNoiseLayerThickness.java
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.engine.world.zones;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.engine.utilities.procedural.Noise;
 
 import java.util.function.LongFunction;
diff --git a/engine/src/main/java/org/terasology/engine/world/zones/SingleBlockRasterizer.java b/engine/src/main/java/org/terasology/engine/world/zones/SingleBlockRasterizer.java
index a14fbd10109..1aae3868560 100644
--- a/engine/src/main/java/org/terasology/engine/world/zones/SingleBlockRasterizer.java
+++ b/engine/src/main/java/org/terasology/engine/world/zones/SingleBlockRasterizer.java
@@ -5,7 +5,7 @@
 import org.terasology.engine.world.chunks.Chunk;
 import org.terasology.engine.world.generation.Region;
 import org.terasology.engine.world.generation.WorldRasterizer;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.engine.registry.CoreRegistry;
 import org.terasology.engine.world.block.Block;
 import org.terasology.engine.world.block.BlockManager;
diff --git a/engine/src/main/java/org/terasology/engine/world/zones/Zone.java b/engine/src/main/java/org/terasology/engine/world/zones/Zone.java
index 1f6577ad3f3..1b713213fa6 100644
--- a/engine/src/main/java/org/terasology/engine/world/zones/Zone.java
+++ b/engine/src/main/java/org/terasology/engine/world/zones/Zone.java
@@ -14,7 +14,7 @@
 import org.terasology.engine.world.generation.WorldRasterizer;
 import org.terasology.engine.world.generator.WorldGenerator;
 import org.terasology.engine.world.viewer.layers.FacetLayer;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 import org.terasology.engine.rendering.nui.layers.mainMenu.preview.FacetLayerPreview;
 import org.terasology.engine.rendering.nui.layers.mainMenu.preview.PreviewGenerator;
 import org.terasology.engine.world.block.Block;
diff --git a/engine/src/main/java/org/terasology/engine/world/zones/ZonePlugin.java b/engine/src/main/java/org/terasology/engine/world/zones/ZonePlugin.java
index ddec7ff1628..6514d095d04 100644
--- a/engine/src/main/java/org/terasology/engine/world/zones/ZonePlugin.java
+++ b/engine/src/main/java/org/terasology/engine/world/zones/ZonePlugin.java
@@ -5,7 +5,7 @@
 import org.joml.Vector3ic;
 import org.terasology.engine.world.generation.Region;
 import org.terasology.engine.world.generator.plugin.WorldGeneratorPlugin;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 import java.util.function.BiPredicate;
 import java.util.function.BooleanSupplier;
diff --git a/engine/src/main/java/org/terasology/engine/world/zones/ZoneRegionFunction.java b/engine/src/main/java/org/terasology/engine/world/zones/ZoneRegionFunction.java
index b949c8157a6..4888ba9a0f0 100644
--- a/engine/src/main/java/org/terasology/engine/world/zones/ZoneRegionFunction.java
+++ b/engine/src/main/java/org/terasology/engine/world/zones/ZoneRegionFunction.java
@@ -3,7 +3,7 @@
 package org.terasology.engine.world.zones;
 
 import org.terasology.engine.world.generation.Region;
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;
 
 /**
  * The ZoneRegionFunction determines which blocks are part of a given region.
diff --git a/subsystems/DiscordRPC/build.gradle.kts b/subsystems/DiscordRPC/build.gradle.kts
index e0d2b686125..d79fa3b8ff9 100644
--- a/subsystems/DiscordRPC/build.gradle.kts
+++ b/subsystems/DiscordRPC/build.gradle.kts
@@ -12,4 +12,6 @@ dependencies {
     implementation(project(":engine"))
     api("com.jagrosh:DiscordIPC:0.4")
     implementation("ch.qos.logback:logback-classic:1.2.3")
+
+    annotationProcessor("org.terasology.gestalt:gestalt-inject-java:8.0.0-SNAPSHOT")
 }
\ No newline at end of file
diff --git a/subsystems/TypeHandlerLibrary/build.gradle.kts b/subsystems/TypeHandlerLibrary/build.gradle.kts
index e94a48bdcc3..e644abfc473 100644
--- a/subsystems/TypeHandlerLibrary/build.gradle.kts
+++ b/subsystems/TypeHandlerLibrary/build.gradle.kts
@@ -17,8 +17,10 @@ dependencies {
 
     implementation("org.terasology:reflections:0.9.12-MB")
     implementation("org.terasology.nui:nui-reflect:3.0.0-SNAPSHOT")
-    implementation("org.terasology.gestalt:gestalt-module:7.0.6-SNAPSHOT")
-    implementation("org.terasology.gestalt:gestalt-asset-core:7.0.6-SNAPSHOT")
+    implementation("org.terasology.gestalt:gestalt-module:8.0.0-SNAPSHOT")
+    implementation("org.terasology.gestalt:gestalt-asset-core:8.0.0-SNAPSHOT")
+
+    annotationProcessor("org.terasology.gestalt:gestalt-inject-java:8.0.0-SNAPSHOT")
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.5.2")
     testImplementation("org.junit.jupiter:junit-jupiter-params:5.5.2")
diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/TypeHandler.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/TypeHandler.java
index 3302bed812c..8c25e38f4d0 100644
--- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/TypeHandler.java
+++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/TypeHandler.java
@@ -2,12 +2,15 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.persistence.typeHandling;
 
+import org.terasology.context.annotation.IndexInherited;
+
 import java.util.Optional;
 import java.util.function.Supplier;
 
 /**
  * Serializes objects of type {@link T} to and from a {@link PersistedData}.
  */
+@IndexInherited
 public abstract class TypeHandler<T> {
     /**
      * Serializes a single non-null value.
diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/TypeHandlerFactory.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/TypeHandlerFactory.java
index 32244257875..54dc2567f4f 100644
--- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/TypeHandlerFactory.java
+++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/TypeHandlerFactory.java
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.persistence.typeHandling;
 
+import org.terasology.context.annotation.IndexInherited;
 import org.terasology.reflection.TypeInfo;
 
 import java.util.Optional;
@@ -10,6 +11,7 @@
  * Creates type handlers for a set of types. Type handler factories are generally used when a set of types
  * are similar in serialization structure.
  */
+@IndexInherited
 public interface TypeHandlerFactory {
     /**
      * Creates a {@link TypeHandler} for the given type {@link T}. If the type is not supported by
diff --git a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/package-info.java b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/package-info.java
index 405e40af1e8..06c170b60b8 100644
--- a/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/package-info.java
+++ b/subsystems/TypeHandlerLibrary/src/main/java/org/terasology/persistence/typeHandling/package-info.java
@@ -9,4 +9,4 @@
 @API
 package org.terasology.persistence.typeHandling;
 
-import org.terasology.gestalt.module.sandbox.API;
+import org.terasology.context.annotation.API;