diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/Instancer.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/Instancer.java
index 35d3c1e26..9505a9697 100644
--- a/src/main/java/com/jozufozu/flywheel/backend/instancing/Instancer.java
+++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/Instancer.java
@@ -10,7 +10,7 @@ import com.jozufozu.flywheel.backend.gl.attrib.VertexFormat;
 import com.jozufozu.flywheel.backend.gl.buffer.GlBuffer;
 import com.jozufozu.flywheel.backend.gl.buffer.GlBufferType;
 import com.jozufozu.flywheel.backend.gl.buffer.MappedBuffer;
-import com.jozufozu.flywheel.core.model.BufferedModel;
+import com.jozufozu.flywheel.backend.model.BufferedModel;
 import com.jozufozu.flywheel.util.AttribUtil;
 
 public class Instancer<D extends InstanceData> {
diff --git a/src/main/java/com/jozufozu/flywheel/backend/instancing/RenderMaterial.java b/src/main/java/com/jozufozu/flywheel/backend/instancing/RenderMaterial.java
index 39aa0ce31..434a04722 100644
--- a/src/main/java/com/jozufozu/flywheel/backend/instancing/RenderMaterial.java
+++ b/src/main/java/com/jozufozu/flywheel/backend/instancing/RenderMaterial.java
@@ -15,13 +15,13 @@ import com.google.common.cache.CacheBuilder;
 import com.jozufozu.flywheel.backend.RenderWork;
 import com.jozufozu.flywheel.backend.gl.GlPrimitive;
 import com.jozufozu.flywheel.backend.gl.attrib.VertexFormat;
+import com.jozufozu.flywheel.backend.model.BufferedModel;
+import com.jozufozu.flywheel.backend.model.IndexedModel;
 import com.jozufozu.flywheel.core.PartialModel;
-import com.jozufozu.flywheel.core.model.BufferedModel;
-import com.jozufozu.flywheel.core.model.IndexedModel;
+import com.jozufozu.flywheel.core.QuadConverter;
 import com.jozufozu.flywheel.core.shader.IProgramCallback;
 import com.jozufozu.flywheel.core.shader.WorldProgram;
 import com.jozufozu.flywheel.util.BufferBuilderReader;
-import com.jozufozu.flywheel.util.QuadConverter;
 import com.jozufozu.flywheel.util.RenderUtil;
 import com.jozufozu.flywheel.util.VirtualEmptyModelData;
 import com.mojang.blaze3d.matrix.MatrixStack;
diff --git a/src/main/java/com/jozufozu/flywheel/core/model/ArrayModelRenderer.java b/src/main/java/com/jozufozu/flywheel/backend/model/ArrayModelRenderer.java
similarity index 90%
rename from src/main/java/com/jozufozu/flywheel/core/model/ArrayModelRenderer.java
rename to src/main/java/com/jozufozu/flywheel/backend/model/ArrayModelRenderer.java
index d63907fda..5347e74d1 100644
--- a/src/main/java/com/jozufozu/flywheel/core/model/ArrayModelRenderer.java
+++ b/src/main/java/com/jozufozu/flywheel/backend/model/ArrayModelRenderer.java
@@ -1,4 +1,4 @@
-package com.jozufozu.flywheel.core.model;
+package com.jozufozu.flywheel.backend.model;
 
 import com.jozufozu.flywheel.backend.gl.GlVertexArray;
 
diff --git a/src/main/java/com/jozufozu/flywheel/core/model/BufferedModel.java b/src/main/java/com/jozufozu/flywheel/backend/model/BufferedModel.java
similarity index 98%
rename from src/main/java/com/jozufozu/flywheel/core/model/BufferedModel.java
rename to src/main/java/com/jozufozu/flywheel/backend/model/BufferedModel.java
index 1b415da33..633052620 100644
--- a/src/main/java/com/jozufozu/flywheel/core/model/BufferedModel.java
+++ b/src/main/java/com/jozufozu/flywheel/backend/model/BufferedModel.java
@@ -1,4 +1,4 @@
-package com.jozufozu.flywheel.core.model;
+package com.jozufozu.flywheel.backend.model;
 
 import static org.lwjgl.opengl.GL20.glDrawArrays;
 
diff --git a/src/main/java/com/jozufozu/flywheel/core/model/ElementBuffer.java b/src/main/java/com/jozufozu/flywheel/backend/model/ElementBuffer.java
similarity index 93%
rename from src/main/java/com/jozufozu/flywheel/core/model/ElementBuffer.java
rename to src/main/java/com/jozufozu/flywheel/backend/model/ElementBuffer.java
index f9dedeca1..8726f5c3e 100644
--- a/src/main/java/com/jozufozu/flywheel/core/model/ElementBuffer.java
+++ b/src/main/java/com/jozufozu/flywheel/backend/model/ElementBuffer.java
@@ -1,4 +1,4 @@
-package com.jozufozu.flywheel.core.model;
+package com.jozufozu.flywheel.backend.model;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/main/java/com/jozufozu/flywheel/core/model/IndexedModel.java b/src/main/java/com/jozufozu/flywheel/backend/model/IndexedModel.java
similarity index 96%
rename from src/main/java/com/jozufozu/flywheel/core/model/IndexedModel.java
rename to src/main/java/com/jozufozu/flywheel/backend/model/IndexedModel.java
index e88025d6b..ddc9737d3 100644
--- a/src/main/java/com/jozufozu/flywheel/core/model/IndexedModel.java
+++ b/src/main/java/com/jozufozu/flywheel/backend/model/IndexedModel.java
@@ -1,4 +1,4 @@
-package com.jozufozu.flywheel.core.model;
+package com.jozufozu.flywheel.backend.model;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/main/java/com/jozufozu/flywheel/core/model/ModelRenderer.java b/src/main/java/com/jozufozu/flywheel/backend/model/ModelRenderer.java
similarity index 89%
rename from src/main/java/com/jozufozu/flywheel/core/model/ModelRenderer.java
rename to src/main/java/com/jozufozu/flywheel/backend/model/ModelRenderer.java
index 97ed214cb..fd1efd896 100644
--- a/src/main/java/com/jozufozu/flywheel/core/model/ModelRenderer.java
+++ b/src/main/java/com/jozufozu/flywheel/backend/model/ModelRenderer.java
@@ -1,4 +1,4 @@
-package com.jozufozu.flywheel.core.model;
+package com.jozufozu.flywheel.backend.model;
 
 public class ModelRenderer {
 
diff --git a/src/main/java/com/jozufozu/flywheel/util/QuadConverter.java b/src/main/java/com/jozufozu/flywheel/core/QuadConverter.java
similarity index 95%
rename from src/main/java/com/jozufozu/flywheel/util/QuadConverter.java
rename to src/main/java/com/jozufozu/flywheel/core/QuadConverter.java
index 4340c99cd..648389385 100644
--- a/src/main/java/com/jozufozu/flywheel/util/QuadConverter.java
+++ b/src/main/java/com/jozufozu/flywheel/core/QuadConverter.java
@@ -1,10 +1,10 @@
-package com.jozufozu.flywheel.util;
+package com.jozufozu.flywheel.core;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
 import com.jozufozu.flywheel.backend.gl.GlNumericType;
-import com.jozufozu.flywheel.core.model.ElementBuffer;
+import com.jozufozu.flywheel.backend.model.ElementBuffer;
 
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/RenderedContraption.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/RenderedContraption.java
index 70c1db87c..86b7c67fc 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/RenderedContraption.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/RenderedContraption.java
@@ -14,13 +14,13 @@ import com.jozufozu.flywheel.backend.gl.GlPrimitive;
 import com.jozufozu.flywheel.backend.gl.attrib.CommonAttributes;
 import com.jozufozu.flywheel.backend.gl.attrib.VertexFormat;
 import com.jozufozu.flywheel.backend.instancing.IInstanceRendered;
-import com.jozufozu.flywheel.core.model.ArrayModelRenderer;
-import com.jozufozu.flywheel.core.model.BufferedModel;
-import com.jozufozu.flywheel.core.model.IndexedModel;
-import com.jozufozu.flywheel.core.model.ModelRenderer;
+import com.jozufozu.flywheel.backend.model.ArrayModelRenderer;
+import com.jozufozu.flywheel.backend.model.BufferedModel;
+import com.jozufozu.flywheel.backend.model.IndexedModel;
+import com.jozufozu.flywheel.backend.model.ModelRenderer;
+import com.jozufozu.flywheel.core.QuadConverter;
 import com.jozufozu.flywheel.light.GridAlignedBB;
 import com.jozufozu.flywheel.util.BufferBuilderReader;
-import com.jozufozu.flywheel.util.QuadConverter;
 import com.mojang.blaze3d.matrix.MatrixStack;
 import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
 import com.simibubi.create.content.contraptions.components.structureMovement.Contraption;