diff --git a/src/main/java/com/jozufozu/flywheel/backend/Backend.java b/src/main/java/com/jozufozu/flywheel/backend/Backend.java
index b365f2458..ec0d3d368 100644
--- a/src/main/java/com/jozufozu/flywheel/backend/Backend.java
+++ b/src/main/java/com/jozufozu/flywheel/backend/Backend.java
@@ -19,7 +19,7 @@ import com.jozufozu.flywheel.api.struct.StructType;
 import com.jozufozu.flywheel.backend.gl.versioned.GlCompat;
 import com.jozufozu.flywheel.config.FlwConfig;
 import com.jozufozu.flywheel.config.FlwEngine;
-import com.jozufozu.flywheel.core.shader.spec.ProgramSpec;
+import com.jozufozu.flywheel.core.shader.ProgramSpec;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.resources.ResourceLocation;
diff --git a/src/main/java/com/jozufozu/flywheel/backend/GameStateRegistry.java b/src/main/java/com/jozufozu/flywheel/backend/GameStateRegistry.java
index 04aa431e6..e0aa48885 100644
--- a/src/main/java/com/jozufozu/flywheel/backend/GameStateRegistry.java
+++ b/src/main/java/com/jozufozu/flywheel/backend/GameStateRegistry.java
@@ -3,7 +3,7 @@ package com.jozufozu.flywheel.backend;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.jozufozu.flywheel.core.shader.gamestate.GameStateProvider;
+import com.jozufozu.flywheel.core.shader.GameStateProvider;
 
 import net.minecraft.resources.ResourceLocation;
 
diff --git a/src/main/java/com/jozufozu/flywheel/backend/Loader.java b/src/main/java/com/jozufozu/flywheel/backend/Loader.java
index 188900381..b9d411025 100644
--- a/src/main/java/com/jozufozu/flywheel/backend/Loader.java
+++ b/src/main/java/com/jozufozu/flywheel/backend/Loader.java
@@ -10,7 +10,7 @@ import com.jozufozu.flywheel.backend.source.Resolver;
 import com.jozufozu.flywheel.backend.source.ShaderLoadingException;
 import com.jozufozu.flywheel.backend.source.ShaderSources;
 import com.jozufozu.flywheel.core.crumbling.CrumblingRenderer;
-import com.jozufozu.flywheel.core.shader.spec.ProgramSpec;
+import com.jozufozu.flywheel.core.shader.ProgramSpec;
 import com.jozufozu.flywheel.event.GatherContextEvent;
 import com.jozufozu.flywheel.util.ResourceUtil;
 import com.jozufozu.flywheel.util.StringUtil;
diff --git a/src/main/java/com/jozufozu/flywheel/core/Contexts.java b/src/main/java/com/jozufozu/flywheel/core/Contexts.java
index 0180f98a8..2d067a0b8 100644
--- a/src/main/java/com/jozufozu/flywheel/core/Contexts.java
+++ b/src/main/java/com/jozufozu/flywheel/core/Contexts.java
@@ -8,8 +8,8 @@ import com.jozufozu.flywheel.backend.source.Resolver;
 import com.jozufozu.flywheel.core.crumbling.CrumblingProgram;
 import com.jozufozu.flywheel.core.pipeline.PipelineCompiler;
 import com.jozufozu.flywheel.core.pipeline.WorldCompiler;
+import com.jozufozu.flywheel.core.shader.NormalDebugStateProvider;
 import com.jozufozu.flywheel.core.shader.WorldProgram;
-import com.jozufozu.flywheel.core.shader.gamestate.NormalDebugStateProvider;
 import com.jozufozu.flywheel.event.GatherContextEvent;
 import com.jozufozu.flywheel.util.ResourceUtil;
 
diff --git a/src/main/java/com/jozufozu/flywheel/core/WorldContext.java b/src/main/java/com/jozufozu/flywheel/core/WorldContext.java
index 85be2a530..fa56a87ba 100644
--- a/src/main/java/com/jozufozu/flywheel/core/WorldContext.java
+++ b/src/main/java/com/jozufozu/flywheel/core/WorldContext.java
@@ -15,8 +15,8 @@ import com.jozufozu.flywheel.backend.source.ShaderLoadingException;
 import com.jozufozu.flywheel.core.pipeline.CachingCompiler;
 import com.jozufozu.flywheel.core.pipeline.CompilationContext;
 import com.jozufozu.flywheel.core.pipeline.PipelineCompiler;
+import com.jozufozu.flywheel.core.shader.ProgramSpec;
 import com.jozufozu.flywheel.core.shader.WorldProgram;
-import com.jozufozu.flywheel.core.shader.spec.ProgramSpec;
 
 import net.minecraft.resources.ResourceLocation;
 
diff --git a/src/main/java/com/jozufozu/flywheel/core/pipeline/CompilationContext.java b/src/main/java/com/jozufozu/flywheel/core/pipeline/CompilationContext.java
index bc4469574..74cae594b 100644
--- a/src/main/java/com/jozufozu/flywheel/core/pipeline/CompilationContext.java
+++ b/src/main/java/com/jozufozu/flywheel/core/pipeline/CompilationContext.java
@@ -5,7 +5,7 @@ import java.util.Objects;
 import com.jozufozu.flywheel.api.vertex.VertexType;
 import com.jozufozu.flywheel.backend.RenderLayer;
 import com.jozufozu.flywheel.backend.source.SourceFile;
-import com.jozufozu.flywheel.core.shader.spec.ProgramSpec;
+import com.jozufozu.flywheel.core.shader.ProgramSpec;
 
 /**
  * Represents the entire context of a program's usage.
diff --git a/src/main/java/com/jozufozu/flywheel/core/shader/ExtensibleGlProgram.java b/src/main/java/com/jozufozu/flywheel/core/shader/ExtensibleGlProgram.java
index 05ef8dc73..927092e9b 100644
--- a/src/main/java/com/jozufozu/flywheel/core/shader/ExtensibleGlProgram.java
+++ b/src/main/java/com/jozufozu/flywheel/core/shader/ExtensibleGlProgram.java
@@ -7,7 +7,6 @@ import javax.annotation.Nonnull;
 
 import com.jozufozu.flywheel.backend.ShaderContext;
 import com.jozufozu.flywheel.backend.gl.shader.GlProgram;
-import com.jozufozu.flywheel.core.shader.extension.ExtensionInstance;
 
 import net.minecraft.resources.ResourceLocation;
 
diff --git a/src/main/java/com/jozufozu/flywheel/core/shader/extension/ExtensionInstance.java b/src/main/java/com/jozufozu/flywheel/core/shader/ExtensionInstance.java
similarity index 82%
rename from src/main/java/com/jozufozu/flywheel/core/shader/extension/ExtensionInstance.java
rename to src/main/java/com/jozufozu/flywheel/core/shader/ExtensionInstance.java
index 6499820c9..4875df7bf 100644
--- a/src/main/java/com/jozufozu/flywheel/core/shader/extension/ExtensionInstance.java
+++ b/src/main/java/com/jozufozu/flywheel/core/shader/ExtensionInstance.java
@@ -1,4 +1,4 @@
-package com.jozufozu.flywheel.core.shader.extension;
+package com.jozufozu.flywheel.core.shader;
 
 import net.minecraft.resources.ResourceLocation;
 
diff --git a/src/main/java/com/jozufozu/flywheel/core/shader/gamestate/GameStateProvider.java b/src/main/java/com/jozufozu/flywheel/core/shader/GameStateProvider.java
similarity index 87%
rename from src/main/java/com/jozufozu/flywheel/core/shader/gamestate/GameStateProvider.java
rename to src/main/java/com/jozufozu/flywheel/core/shader/GameStateProvider.java
index 152ee113d..fc9fe728d 100644
--- a/src/main/java/com/jozufozu/flywheel/core/shader/gamestate/GameStateProvider.java
+++ b/src/main/java/com/jozufozu/flywheel/core/shader/GameStateProvider.java
@@ -1,4 +1,4 @@
-package com.jozufozu.flywheel.core.shader.gamestate;
+package com.jozufozu.flywheel.core.shader;
 
 import com.jozufozu.flywheel.backend.GameStateRegistry;
 import com.mojang.serialization.Codec;
diff --git a/src/main/java/com/jozufozu/flywheel/core/shader/gamestate/NormalDebugStateProvider.java b/src/main/java/com/jozufozu/flywheel/core/shader/NormalDebugStateProvider.java
similarity index 80%
rename from src/main/java/com/jozufozu/flywheel/core/shader/gamestate/NormalDebugStateProvider.java
rename to src/main/java/com/jozufozu/flywheel/core/shader/NormalDebugStateProvider.java
index 73b0a2f9b..61f0e50ac 100644
--- a/src/main/java/com/jozufozu/flywheel/core/shader/gamestate/NormalDebugStateProvider.java
+++ b/src/main/java/com/jozufozu/flywheel/core/shader/NormalDebugStateProvider.java
@@ -1,11 +1,11 @@
-package com.jozufozu.flywheel.core.shader.gamestate;
+package com.jozufozu.flywheel.core.shader;
 
 import com.jozufozu.flywheel.Flywheel;
 import com.jozufozu.flywheel.config.FlwConfig;
 
 import net.minecraft.resources.ResourceLocation;
 
-public class NormalDebugStateProvider implements IGameStateProvider {
+public class NormalDebugStateProvider implements GameStateProvider {
 
 	public static final NormalDebugStateProvider INSTANCE = new NormalDebugStateProvider();
 	public static final ResourceLocation NAME = Flywheel.rl("normal_debug");
diff --git a/src/main/java/com/jozufozu/flywheel/core/shader/spec/ProgramSpec.java b/src/main/java/com/jozufozu/flywheel/core/shader/ProgramSpec.java
similarity index 98%
rename from src/main/java/com/jozufozu/flywheel/core/shader/spec/ProgramSpec.java
rename to src/main/java/com/jozufozu/flywheel/core/shader/ProgramSpec.java
index f79169806..d0ffe8068 100644
--- a/src/main/java/com/jozufozu/flywheel/core/shader/spec/ProgramSpec.java
+++ b/src/main/java/com/jozufozu/flywheel/core/shader/ProgramSpec.java
@@ -1,4 +1,4 @@
-package com.jozufozu.flywheel.core.shader.spec;
+package com.jozufozu.flywheel.core.shader;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/main/java/com/jozufozu/flywheel/core/shader/spec/ProgramState.java b/src/main/java/com/jozufozu/flywheel/core/shader/ProgramState.java
similarity index 63%
rename from src/main/java/com/jozufozu/flywheel/core/shader/spec/ProgramState.java
rename to src/main/java/com/jozufozu/flywheel/core/shader/ProgramState.java
index 6f2b08bd9..ae8d00248 100644
--- a/src/main/java/com/jozufozu/flywheel/core/shader/spec/ProgramState.java
+++ b/src/main/java/com/jozufozu/flywheel/core/shader/ProgramState.java
@@ -1,16 +1,15 @@
-package com.jozufozu.flywheel.core.shader.spec;
+package com.jozufozu.flywheel.core.shader;
 
 import java.util.Collections;
 import java.util.List;
 
-import com.jozufozu.flywheel.core.shader.gamestate.IGameStateProvider;
 import com.jozufozu.flywheel.util.CodecUtil;
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 
-public record ProgramState(IGameStateProvider context, List<String> defines) {
+public record ProgramState(GameStateProvider context, List<String> defines) {
 
-	public static final Codec<ProgramState> CODEC = RecordCodecBuilder.create(state -> state.group(IGameStateProvider.CODEC.fieldOf("when")
+	public static final Codec<ProgramState> CODEC = RecordCodecBuilder.create(state -> state.group(GameStateProvider.CODEC.fieldOf("when")
 					.forGetter(ProgramState::context), CodecUtil.oneOrMore(Codec.STRING)
 					.optionalFieldOf("define", Collections.emptyList())
 					.forGetter(ProgramState::defines))
diff --git a/src/main/java/com/jozufozu/flywheel/core/shader/extension/WorldFog.java b/src/main/java/com/jozufozu/flywheel/core/shader/WorldFog.java
similarity index 94%
rename from src/main/java/com/jozufozu/flywheel/core/shader/extension/WorldFog.java
rename to src/main/java/com/jozufozu/flywheel/core/shader/WorldFog.java
index dd371debd..b6aa01a11 100644
--- a/src/main/java/com/jozufozu/flywheel/core/shader/extension/WorldFog.java
+++ b/src/main/java/com/jozufozu/flywheel/core/shader/WorldFog.java
@@ -1,4 +1,4 @@
-package com.jozufozu.flywheel.core.shader.extension;
+package com.jozufozu.flywheel.core.shader;
 
 import org.lwjgl.opengl.GL20;
 
diff --git a/src/main/java/com/jozufozu/flywheel/core/shader/WorldProgram.java b/src/main/java/com/jozufozu/flywheel/core/shader/WorldProgram.java
index 226fbd28e..3754969b8 100644
--- a/src/main/java/com/jozufozu/flywheel/core/shader/WorldProgram.java
+++ b/src/main/java/com/jozufozu/flywheel/core/shader/WorldProgram.java
@@ -4,7 +4,6 @@ import static org.lwjgl.opengl.GL20.glUniform1f;
 import static org.lwjgl.opengl.GL20.glUniform2f;
 import static org.lwjgl.opengl.GL20.glUniform3f;
 
-import com.jozufozu.flywheel.core.shader.extension.WorldFog;
 import com.jozufozu.flywheel.util.AnimationTickHolder;
 import com.mojang.blaze3d.platform.Window;
 import com.mojang.math.Matrix4f;
diff --git a/src/main/java/com/jozufozu/flywheel/core/shader/extension/UnitExtensionInstance.java b/src/main/java/com/jozufozu/flywheel/core/shader/extension/UnitExtensionInstance.java
deleted file mode 100644
index 70d1bff4b..000000000
--- a/src/main/java/com/jozufozu/flywheel/core/shader/extension/UnitExtensionInstance.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.jozufozu.flywheel.core.shader.extension;
-
-import com.jozufozu.flywheel.Flywheel;
-import com.jozufozu.flywheel.backend.gl.shader.GlProgram;
-
-import net.minecraft.resources.ResourceLocation;
-
-public class UnitExtensionInstance implements ExtensionInstance {
-
-	public static final ResourceLocation NAME = Flywheel.rl("unit");
-
-	public UnitExtensionInstance(GlProgram program) {
-	}
-
-	@Override
-	public void bind() {
-
-	}
-
-	@Override
-	public ResourceLocation name() {
-		return NAME;
-	}
-}
diff --git a/src/main/java/com/jozufozu/flywheel/core/shader/spec/BooleanStateProvider.java b/src/main/java/com/jozufozu/flywheel/core/shader/spec/BooleanStateProvider.java
deleted file mode 100644
index 1cf0b1da2..000000000
--- a/src/main/java/com/jozufozu/flywheel/core/shader/spec/BooleanStateProvider.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.jozufozu.flywheel.core.shader.spec;
-
-import com.jozufozu.flywheel.core.shader.gamestate.GameStateProvider;
-
-public interface BooleanStateProvider extends GameStateProvider {
-
-	boolean isTrue();
-
-	@Override
-	default Boolean getValue() {
-		return isTrue();
-	}
-}