diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearchType.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearchType.kt
index 592b73257..f4eb7a76a 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearchType.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearchType.kt
@@ -19,8 +19,8 @@ import net.minecraft.world.item.ItemStack
 import net.minecraft.world.item.crafting.Ingredient
 import net.minecraft.world.level.ItemLike
 import net.minecraftforge.registries.ForgeRegistries
-import ru.dbotthepony.mc.otm.client.render.AbstractMatterySprite
-import ru.dbotthepony.mc.otm.client.render.SpriteType
+import ru.dbotthepony.mc.otm.client.render.sprites.AbstractMatterySprite
+import ru.dbotthepony.mc.otm.client.render.sprites.SpriteType
 import ru.dbotthepony.mc.otm.core.collect.ListSet
 import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.core.isActuallyEmpty
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/android/feature/EnderTeleporterFeature.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/android/feature/EnderTeleporterFeature.kt
index e8a417e10..aa8778995 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/android/feature/EnderTeleporterFeature.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/android/feature/EnderTeleporterFeature.kt
@@ -33,7 +33,7 @@ import ru.dbotthepony.mc.otm.capability.matteryPlayer
 import ru.dbotthepony.mc.otm.client.render.DynamicBufferSource
 import ru.dbotthepony.mc.otm.client.render.ResearchIcons
 import ru.dbotthepony.mc.otm.client.render.linesIgnoreZRenderType
-import ru.dbotthepony.mc.otm.client.render.sprite
+import ru.dbotthepony.mc.otm.client.render.sprites.sprite
 import ru.dbotthepony.mc.otm.config.AndroidConfig
 import ru.dbotthepony.mc.otm.core.genericPositions
 import ru.dbotthepony.mc.otm.core.holder
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/Ext.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/ClientExtensions.kt
similarity index 99%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/client/Ext.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/client/ClientExtensions.kt
index 55f05461a..bb55d7bee 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/Ext.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/ClientExtensions.kt
@@ -11,7 +11,6 @@ import org.lwjgl.glfw.GLFW.GLFW_CURSOR
 import ru.dbotthepony.mc.otm.isClient
 import java.nio.ByteBuffer
 import java.nio.ByteOrder
-import java.nio.DoubleBuffer
 import java.util.function.BooleanSupplier
 
 inline val minecraft: Minecraft get() = Minecraft.getInstance()
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/MatteryGUI.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/MatteryGUI.kt
index 3dc54f4b9..36533e2f4 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/MatteryGUI.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/MatteryGUI.kt
@@ -22,6 +22,8 @@ import ru.dbotthepony.mc.otm.capability.MatteryCapability
 import ru.dbotthepony.mc.otm.capability.MatteryPlayerCapability
 import ru.dbotthepony.mc.otm.capability.matteryPlayer
 import ru.dbotthepony.mc.otm.client.render.*
+import ru.dbotthepony.mc.otm.client.render.sprites.MatteryAtlas
+import ru.dbotthepony.mc.otm.client.render.sprites.MatterySprite
 import ru.dbotthepony.mc.otm.config.ClientConfig
 import ru.dbotthepony.mc.otm.core.TextComponent
 import ru.dbotthepony.mc.otm.core.math.RGBAColor
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/Ext.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/FontRenderer.kt
similarity index 80%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/client/render/Ext.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/client/render/FontRenderer.kt
index f3fdb5aac..4e43bc1bb 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/Ext.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/FontRenderer.kt
@@ -1,75 +1,18 @@
 package ru.dbotthepony.mc.otm.client.render
 
 import com.mojang.blaze3d.vertex.PoseStack
-import com.mojang.blaze3d.vertex.Tesselator
-import com.mojang.blaze3d.vertex.VertexConsumer
 import com.mojang.blaze3d.vertex.VertexSorting
 import net.minecraft.client.gui.Font
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.client.renderer.MultiBufferSource
-import net.minecraft.core.Vec3i
 import net.minecraft.network.chat.Component
 import net.minecraft.util.FormattedCharSequence
 import org.joml.Matrix4f
-import org.joml.Vector3f
 import ru.dbotthepony.mc.otm.core.FloatSupplier
-import ru.dbotthepony.mc.otm.core.math.IAngle
 import ru.dbotthepony.mc.otm.core.math.RGBAColor
-import ru.dbotthepony.mc.otm.core.math.Vector
 import ru.dbotthepony.mc.otm.core.math.component1
 import ru.dbotthepony.mc.otm.core.math.component2
 import ru.dbotthepony.mc.otm.core.math.component3
-import ru.dbotthepony.mc.otm.core.math.rotateAroundPoint
-import ru.dbotthepony.mc.otm.core.math.rotateAroundThis
-import ru.dbotthepony.mc.otm.core.math.times
-import ru.dbotthepony.mc.otm.core.math.translation
-import ru.dbotthepony.mc.otm.core.math.unaryMinus
-
-val tesselator: Tesselator get() = Tesselator.getInstance()
-
-fun VertexConsumer.normal(vector: Vector): VertexConsumer = normal(vector.x.toFloat(), vector.y.toFloat(), vector.z.toFloat())
-fun VertexConsumer.vertex(matrix4f: Matrix4f, vector: Vector): VertexConsumer = vertex(matrix4f, vector.x.toFloat(), vector.y.toFloat(), vector.z.toFloat())
-fun VertexConsumer.color(color: RGBAColor?): VertexConsumer {
-	if (color != null)
-		color(color.redInt, color.greenInt, color.blueInt, color.alphaInt)
-
-	return this
-}
-
-fun PoseStack.translate(vector: Vector) = translate(vector.x, vector.y, vector.z)
-fun PoseStack.translate(vector: Vec3i) = translate(vector.x.toDouble(), vector.y.toDouble(), vector.z.toDouble())
-fun PoseStack.translate(vector: Vector3f) = translate(vector.x(), vector.y(), vector.z()) // TODO: 1.19.3
-
-fun PoseStack.rotateAroundPoint(point: Vector, axis: Vector, rotation: Float, isDegrees: Boolean = false) {
-	val last = last()
-	last.pose().rotateAroundPoint(point, axis, rotation, isDegrees)
-	last.normal().rotate(axis.rotateAroundThis(rotation, isDegrees))
-}
-
-fun PoseStack.rotateAroundPoint(point: Vector, rotation: IAngle) {
-	val last = last()
-	last.pose().rotateAroundPoint(point, rotation)
-	// last.normal().mul(rotation.forward().rotateAroundThis(rotation))
-}
-
-fun PoseStack.rotateAroundPoint(point: Vector3f, axis: Vector, rotation: Float, isDegrees: Boolean = false) {
-	val last = last()
-	last.pose().rotateAroundPoint(point, axis, rotation, isDegrees)
-	last.normal().rotate(axis.rotateAroundThis(rotation, isDegrees))
-}
-
-fun PoseStack.rotateAroundPoint(point: Vector3f, rotation: IAngle) {
-	val last = last()
-	last.pose().rotateAroundPoint(point, rotation)
-	// last.normal().mul(rotation.forward().rotateAroundThis(rotation))
-}
-
-fun PoseStack.translation(): Vector3f {
-	return last().pose().translation
-}
-
-inline val PoseStack.last: PoseStack.Pose get() = last()
-inline val PoseStack.Pose.pose: Matrix4f get() = pose()
 
 private val buffer = DynamicBufferSource(vertexSorting = VertexSorting.ORTHOGRAPHIC_Z)
 private fun buffer() = buffer
@@ -262,7 +205,7 @@ private fun Font.drawInternal(
 		if (outlineZ != 0f) {
 			poseStack.translate(0f, 0f, -outlineZ)
 		}
- 	}
+	}
 
 	val width = drawInBatch(
 		text,
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/RenderExtensions.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/RenderExtensions.kt
new file mode 100644
index 000000000..1d08afc62
--- /dev/null
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/RenderExtensions.kt
@@ -0,0 +1,60 @@
+package ru.dbotthepony.mc.otm.client.render
+
+import com.mojang.blaze3d.vertex.PoseStack
+import com.mojang.blaze3d.vertex.Tesselator
+import com.mojang.blaze3d.vertex.VertexConsumer
+import net.minecraft.core.Vec3i
+import org.joml.Matrix4f
+import org.joml.Vector3f
+import ru.dbotthepony.mc.otm.core.math.IAngle
+import ru.dbotthepony.mc.otm.core.math.RGBAColor
+import ru.dbotthepony.mc.otm.core.math.Vector
+import ru.dbotthepony.mc.otm.core.math.rotateAroundPoint
+import ru.dbotthepony.mc.otm.core.math.rotateAroundThis
+import ru.dbotthepony.mc.otm.core.math.translation
+
+val tesselator: Tesselator get() = Tesselator.getInstance()
+
+fun VertexConsumer.normal(vector: Vector): VertexConsumer = normal(vector.x.toFloat(), vector.y.toFloat(), vector.z.toFloat())
+fun VertexConsumer.vertex(matrix4f: Matrix4f, vector: Vector): VertexConsumer = vertex(matrix4f, vector.x.toFloat(), vector.y.toFloat(), vector.z.toFloat())
+fun VertexConsumer.color(color: RGBAColor?): VertexConsumer {
+	if (color != null)
+		color(color.redInt, color.greenInt, color.blueInt, color.alphaInt)
+
+	return this
+}
+
+fun PoseStack.translate(vector: Vector) = translate(vector.x, vector.y, vector.z)
+fun PoseStack.translate(vector: Vec3i) = translate(vector.x.toDouble(), vector.y.toDouble(), vector.z.toDouble())
+fun PoseStack.translate(vector: Vector3f) = translate(vector.x(), vector.y(), vector.z())
+
+fun PoseStack.rotateAroundPoint(point: Vector, axis: Vector, rotation: Float, isDegrees: Boolean = false) {
+	val last = last()
+	last.pose().rotateAroundPoint(point, axis, rotation, isDegrees)
+	last.normal().rotate(axis.rotateAroundThis(rotation, isDegrees))
+}
+
+fun PoseStack.rotateAroundPoint(point: Vector, rotation: IAngle) {
+	val last = last()
+	last.pose().rotateAroundPoint(point, rotation)
+	// last.normal().mul(rotation.forward().rotateAroundThis(rotation))
+}
+
+fun PoseStack.rotateAroundPoint(point: Vector3f, axis: Vector, rotation: Float, isDegrees: Boolean = false) {
+	val last = last()
+	last.pose().rotateAroundPoint(point, axis, rotation, isDegrees)
+	last.normal().rotate(axis.rotateAroundThis(rotation, isDegrees))
+}
+
+fun PoseStack.rotateAroundPoint(point: Vector3f, rotation: IAngle) {
+	val last = last()
+	last.pose().rotateAroundPoint(point, rotation)
+	// last.normal().mul(rotation.forward().rotateAroundThis(rotation))
+}
+
+fun PoseStack.translation(): Vector3f {
+	return last().pose().translation
+}
+
+inline val PoseStack.last: PoseStack.Pose get() = last()
+inline val PoseStack.Pose.pose: Matrix4f get() = pose()
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/ResearchIcons.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/ResearchIcons.kt
index f043c2c74..1124d674f 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/ResearchIcons.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/ResearchIcons.kt
@@ -2,6 +2,9 @@ package ru.dbotthepony.mc.otm.client.render
 
 import net.minecraft.resources.ResourceLocation
 import ru.dbotthepony.mc.otm.OverdriveThatMatters
+import ru.dbotthepony.mc.otm.client.render.sprites.AbstractMatterySprite
+import ru.dbotthepony.mc.otm.client.render.sprites.GridAtlas
+import ru.dbotthepony.mc.otm.client.render.sprites.sprite
 
 object ResearchIcons {
 	val ICON_TRANSFER: AbstractMatterySprite
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/WidgetLocation.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/WidgetLocation.kt
index 2588604cf..46e5c5f26 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/WidgetLocation.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/WidgetLocation.kt
@@ -2,6 +2,7 @@ package ru.dbotthepony.mc.otm.client.render
 
 import net.minecraft.resources.ResourceLocation
 import ru.dbotthepony.mc.otm.OverdriveThatMatters
+import ru.dbotthepony.mc.otm.client.render.sprites.MatteryAtlas
 
 object WidgetLocation {
 	val LARGE_BUTTON = MatteryAtlas(ResourceLocation(OverdriveThatMatters.MOD_ID, "textures/gui/widgets/large_button.png"), 72f, 18f)
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/Widgets18.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/Widgets18.kt
index 93e07d358..e6cea1252 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/Widgets18.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/Widgets18.kt
@@ -2,6 +2,9 @@ package ru.dbotthepony.mc.otm.client.render
 
 import ru.dbotthepony.mc.otm.block.entity.MatteryDeviceBlockEntity
 import ru.dbotthepony.mc.otm.capability.FlowDirection
+import ru.dbotthepony.mc.otm.client.render.sprites.GridAtlas
+import ru.dbotthepony.mc.otm.client.render.sprites.StretchingRectangleElement
+import ru.dbotthepony.mc.otm.client.render.sprites.sprite
 import ru.dbotthepony.mc.otm.core.immutableMap
 import ru.dbotthepony.mc.otm.core.math.RelativeSide
 
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/Widgets8.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/Widgets8.kt
index 3cf7bbf71..44af60e19 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/Widgets8.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/Widgets8.kt
@@ -2,6 +2,7 @@ package ru.dbotthepony.mc.otm.client.render
 
 import net.minecraft.resources.ResourceLocation
 import ru.dbotthepony.mc.otm.OverdriveThatMatters
+import ru.dbotthepony.mc.otm.client.render.sprites.GridAtlas
 
 object Widgets8 {
 	val GRID = GridAtlas(ResourceLocation(OverdriveThatMatters.MOD_ID, "textures/gui/widgets_8.png"), 8f, 8f, columns = 64 / 8, rows = 32 / 8)
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/BankRenderer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/BankRenderer.kt
index cd8a147de..29dc62ddb 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/BankRenderer.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/BankRenderer.kt
@@ -15,7 +15,7 @@ import ru.dbotthepony.mc.otm.block.entity.MatteryDeviceBlockEntity
 import ru.dbotthepony.mc.otm.block.entity.matter.MatterCapacitorBankBlockEntity
 import ru.dbotthepony.mc.otm.block.entity.tech.BatteryBankBlockEntity
 import ru.dbotthepony.mc.otm.client.minecraft
-import ru.dbotthepony.mc.otm.client.render.AbstractMatterySprite
+import ru.dbotthepony.mc.otm.client.render.sprites.AbstractMatterySprite
 import ru.dbotthepony.mc.otm.client.render.DynamicBufferSource
 import ru.dbotthepony.mc.otm.client.screen.widget.MatterGaugePanel
 import ru.dbotthepony.mc.otm.client.screen.widget.PowerGaugePanel
@@ -28,7 +28,6 @@ import ru.dbotthepony.mc.otm.core.math.rotate
 import ru.dbotthepony.mc.otm.core.math.rotateY
 import ru.dbotthepony.mc.otm.nanoTime
 import java.util.function.BooleanSupplier
-import java.util.function.Supplier
 import kotlin.math.PI
 
 abstract class BankRenderer<T : MatteryDeviceBlockEntity>(private val context: BlockEntityRendererProvider.Context) : BlockEntityRenderer<T> {
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/AbstractMatterySprite.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/sprites/AbstractMatterySprite.kt
similarity index 95%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/client/render/AbstractMatterySprite.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/client/render/sprites/AbstractMatterySprite.kt
index d4ac1afef..90de4157e 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/AbstractMatterySprite.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/sprites/AbstractMatterySprite.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.client.render
+package ru.dbotthepony.mc.otm.client.render.sprites
 
 import com.google.gson.JsonObject
 import com.mojang.blaze3d.systems.RenderSystem
@@ -13,6 +13,11 @@ import net.minecraft.client.renderer.RenderType
 import net.minecraft.network.FriendlyByteBuf
 import net.minecraft.resources.ResourceLocation
 import org.lwjgl.opengl.GL11.GL_ALWAYS
+import ru.dbotthepony.mc.otm.client.render.IGUIRenderable
+import ru.dbotthepony.mc.otm.client.render.IUVCoords
+import ru.dbotthepony.mc.otm.client.render.UVWindingOrder
+import ru.dbotthepony.mc.otm.client.render.color
+import ru.dbotthepony.mc.otm.client.render.renderTexturedRect
 import ru.dbotthepony.mc.otm.core.math.RGBAColor
 import ru.dbotthepony.mc.otm.core.math.linearInterpolation
 import java.util.concurrent.ConcurrentHashMap
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/GridAtlas.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/sprites/GridAtlas.kt
similarity index 95%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/client/render/GridAtlas.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/client/render/sprites/GridAtlas.kt
index 942fdc287..6d2650488 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/GridAtlas.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/sprites/GridAtlas.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.client.render
+package ru.dbotthepony.mc.otm.client.render.sprites
 
 import net.minecraft.resources.ResourceLocation
 
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/GridInSprite.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/sprites/GridInSprite.kt
similarity index 95%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/client/render/GridInSprite.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/client/render/sprites/GridInSprite.kt
index ea03082e3..be67b84b2 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/GridInSprite.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/sprites/GridInSprite.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.client.render
+package ru.dbotthepony.mc.otm.client.render.sprites
 
 @Suppress("unused")
 data class GridInSprite(
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/MatteryAtlas.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/sprites/MatteryAtlas.kt
similarity index 89%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/client/render/MatteryAtlas.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/client/render/sprites/MatteryAtlas.kt
index c6f0ab4db..d27706892 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/MatteryAtlas.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/sprites/MatteryAtlas.kt
@@ -1,6 +1,7 @@
-package ru.dbotthepony.mc.otm.client.render
+package ru.dbotthepony.mc.otm.client.render.sprites
 
 import net.minecraft.resources.ResourceLocation
+import ru.dbotthepony.mc.otm.client.render.UVWindingOrder
 
 fun ResourceLocation.atlas(
 	width: Float,
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/MatterySprite.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/sprites/MatterySprite.kt
similarity index 95%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/client/render/MatterySprite.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/client/render/sprites/MatterySprite.kt
index d561b8f4f..719be2139 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/MatterySprite.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/sprites/MatterySprite.kt
@@ -1,6 +1,7 @@
-package ru.dbotthepony.mc.otm.client.render
+package ru.dbotthepony.mc.otm.client.render.sprites
 
 import net.minecraft.resources.ResourceLocation
+import ru.dbotthepony.mc.otm.client.render.UVWindingOrder
 
 fun ResourceLocation.sprite(
 	x: Float,
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/SpriteType.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/sprites/SpriteType.kt
similarity index 98%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/client/render/SpriteType.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/client/render/sprites/SpriteType.kt
index 18149aa40..9fd4b7efd 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/SpriteType.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/sprites/SpriteType.kt
@@ -1,11 +1,11 @@
-package ru.dbotthepony.mc.otm.client.render
+package ru.dbotthepony.mc.otm.client.render.sprites
 
 import com.google.gson.JsonObject
 import com.google.gson.JsonPrimitive
 import com.google.gson.JsonSyntaxException
 import net.minecraft.network.FriendlyByteBuf
 import net.minecraft.resources.ResourceLocation
-import ru.dbotthepony.mc.otm.core.nbt.set
+import ru.dbotthepony.mc.otm.client.render.UVWindingOrder
 import ru.dbotthepony.mc.otm.core.set
 
 enum class SpriteType {
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/StretchingRectangleElement.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/sprites/StretchingRectangleElement.kt
similarity index 98%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/client/render/StretchingRectangleElement.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/client/render/sprites/StretchingRectangleElement.kt
index 57e2835e6..f777b9f3f 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/StretchingRectangleElement.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/sprites/StretchingRectangleElement.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.client.render
+package ru.dbotthepony.mc.otm.client.render.sprites
 
 import com.mojang.blaze3d.vertex.PoseStack
 import net.minecraft.client.gui.GuiGraphics
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/SubMatterySprite.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/sprites/SubMatterySprite.kt
similarity index 92%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/client/render/SubMatterySprite.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/client/render/sprites/SubMatterySprite.kt
index 4dbdf4087..3ebd1350b 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/SubMatterySprite.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/sprites/SubMatterySprite.kt
@@ -1,6 +1,7 @@
-package ru.dbotthepony.mc.otm.client.render
+package ru.dbotthepony.mc.otm.client.render.sprites
 
 import net.minecraft.resources.ResourceLocation
+import ru.dbotthepony.mc.otm.client.render.UVWindingOrder
 
 class SubMatterySprite(
 	val parent: AbstractMatterySprite,
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ExoPackInventoryScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ExoPackInventoryScreen.kt
index 9dc4547ee..b6a00fb0b 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ExoPackInventoryScreen.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ExoPackInventoryScreen.kt
@@ -9,7 +9,7 @@ import ru.dbotthepony.mc.otm.client.moveMousePosScaled
 import ru.dbotthepony.mc.otm.client.render.ItemStackIcon
 import ru.dbotthepony.mc.otm.client.render.Widgets18
 import ru.dbotthepony.mc.otm.core.TranslatableComponent
-import ru.dbotthepony.mc.otm.client.render.sprite
+import ru.dbotthepony.mc.otm.client.render.sprites.sprite
 import ru.dbotthepony.mc.otm.client.screen.panels.*
 import ru.dbotthepony.mc.otm.client.screen.panels.button.LargeRectangleButtonPanel
 import ru.dbotthepony.mc.otm.client.screen.panels.slot.AbstractSlotPanel
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/ColorPicker.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/ColorPicker.kt
index 00e926461..97810e9d7 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/ColorPicker.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/ColorPicker.kt
@@ -9,7 +9,7 @@ import net.minecraft.network.chat.Component
 import net.minecraft.resources.ResourceLocation
 import ru.dbotthepony.mc.otm.OverdriveThatMatters
 import ru.dbotthepony.mc.otm.client.playGuiClickSound
-import ru.dbotthepony.mc.otm.client.render.MatterySprite
+import ru.dbotthepony.mc.otm.client.render.sprites.MatterySprite
 import ru.dbotthepony.mc.otm.client.render.RenderGravity
 import ru.dbotthepony.mc.otm.client.render.UVWindingOrder
 import ru.dbotthepony.mc.otm.client.render.WidgetLocation
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/EffectListPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/EffectListPanel.kt
index f8a3ed691..6fc0d47d8 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/EffectListPanel.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/EffectListPanel.kt
@@ -13,10 +13,9 @@ import ru.dbotthepony.mc.otm.client.minecraft
 import ru.dbotthepony.mc.otm.client.render.RenderGravity
 import ru.dbotthepony.mc.otm.client.render.determineTooltipPosition
 import ru.dbotthepony.mc.otm.client.render.draw
-import ru.dbotthepony.mc.otm.client.render.sprite
+import ru.dbotthepony.mc.otm.client.render.sprites.sprite
 import ru.dbotthepony.mc.otm.client.render.render
 import ru.dbotthepony.mc.otm.client.screen.panels.util.DiscreteScrollBarPanel
-import ru.dbotthepony.mc.otm.core.TextComponent
 import ru.dbotthepony.mc.otm.core.math.RGBAColor
 import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.core.util.formatTickDuration
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/EntityRendererPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/EntityRendererPanel.kt
index a4c1608cf..25fa55509 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/EntityRendererPanel.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/EntityRendererPanel.kt
@@ -1,8 +1,5 @@
 package ru.dbotthepony.mc.otm.client.screen.panels
 
-import com.mojang.blaze3d.platform.InputConstants
-import it.unimi.dsi.fastutil.booleans.BooleanConsumer
-import net.minecraft.ChatFormatting
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.client.gui.screens.Screen
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen
@@ -12,7 +9,7 @@ import net.minecraft.world.entity.player.Player
 import ru.dbotthepony.mc.otm.capability.MatteryPlayerCapability
 import ru.dbotthepony.mc.otm.capability.matteryPlayer
 import ru.dbotthepony.mc.otm.client.render.Widgets8
-import ru.dbotthepony.mc.otm.client.render.sprite
+import ru.dbotthepony.mc.otm.client.render.sprites.sprite
 import ru.dbotthepony.mc.otm.client.screen.ExoPackInventoryScreen
 import ru.dbotthepony.mc.otm.client.screen.MatteryScreen
 import ru.dbotthepony.mc.otm.client.screen.panels.button.ButtonPanel
@@ -22,9 +19,7 @@ import ru.dbotthepony.mc.otm.client.screen.panels.button.SmallRectangleButtonPan
 import ru.dbotthepony.mc.otm.compat.cos.CosmeticToggleRenderButton
 import ru.dbotthepony.mc.otm.compat.cos.isCosmeticArmorLoaded
 import ru.dbotthepony.mc.otm.core.GetterSetter
-import ru.dbotthepony.mc.otm.core.TextComponent
 import ru.dbotthepony.mc.otm.core.TranslatableComponent
-import ru.dbotthepony.mc.otm.core.asGetterOnly
 import ru.dbotthepony.mc.otm.core.math.RGBAColor
 import ru.dbotthepony.mc.otm.network.DisableExopackGlowPacket
 import ru.dbotthepony.mc.otm.network.DisplayExopackPacket
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/FramePanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/FramePanel.kt
index 62c0fa997..e921758ff 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/FramePanel.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/FramePanel.kt
@@ -10,6 +10,7 @@ import net.minecraft.client.gui.screens.Screen
 import net.minecraft.network.chat.Component
 import org.lwjgl.opengl.GL30
 import ru.dbotthepony.mc.otm.client.render.*
+import ru.dbotthepony.mc.otm.client.render.sprites.StretchingRectangleElement
 import ru.dbotthepony.mc.otm.client.screen.panels.button.AbstractButtonPanel
 import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.core.math.RGBAColor
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/SpritePanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/SpritePanel.kt
index 836444940..c0c45b58a 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/SpritePanel.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/SpritePanel.kt
@@ -2,7 +2,7 @@ package ru.dbotthepony.mc.otm.client.screen.panels
 
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.client.gui.screens.Screen
-import ru.dbotthepony.mc.otm.client.render.AbstractMatterySprite
+import ru.dbotthepony.mc.otm.client.render.sprites.AbstractMatterySprite
 import ru.dbotthepony.mc.otm.client.render.UVWindingOrder
 
 class SpritePanel<out S : Screen>(
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/Buttons.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/Buttons.kt
index cf0be7ad5..1bbb21a57 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/Buttons.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/Buttons.kt
@@ -13,7 +13,7 @@ import ru.dbotthepony.mc.otm.capability.addUpgradeTooltipLines
 import ru.dbotthepony.mc.otm.client.isCtrlDown
 import ru.dbotthepony.mc.otm.client.isShiftDown
 import ru.dbotthepony.mc.otm.client.minecraft
-import ru.dbotthepony.mc.otm.client.render.AbstractMatterySprite
+import ru.dbotthepony.mc.otm.client.render.sprites.AbstractMatterySprite
 import ru.dbotthepony.mc.otm.client.render.ItemStackIcon
 import ru.dbotthepony.mc.otm.client.render.Widgets18
 import ru.dbotthepony.mc.otm.client.screen.MatteryScreen
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/CheckBoxPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/CheckBoxPanel.kt
index 361e04a48..5c5693ae0 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/CheckBoxPanel.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/CheckBoxPanel.kt
@@ -2,7 +2,7 @@ package ru.dbotthepony.mc.otm.client.screen.panels.button
 
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.client.gui.screens.Screen
-import ru.dbotthepony.mc.otm.client.render.AbstractMatterySprite
+import ru.dbotthepony.mc.otm.client.render.sprites.AbstractMatterySprite
 import ru.dbotthepony.mc.otm.client.render.WidgetLocation
 import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel
 import ru.dbotthepony.mc.otm.core.GetterSetter
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/EnumRectangleButtonPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/EnumRectangleButtonPanel.kt
index 44d1a1d34..9e6ee6522 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/EnumRectangleButtonPanel.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/EnumRectangleButtonPanel.kt
@@ -1,13 +1,11 @@
 package ru.dbotthepony.mc.otm.client.screen.panels.button
 
 import com.mojang.blaze3d.platform.InputConstants
-import com.mojang.blaze3d.vertex.PoseStack
 import net.minecraft.ChatFormatting
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.client.gui.screens.Screen
 import net.minecraft.network.chat.Component
 import ru.dbotthepony.mc.otm.client.minecraft
-import ru.dbotthepony.mc.otm.client.render.AbstractMatterySprite
 import ru.dbotthepony.mc.otm.client.render.IGUIRenderable
 import ru.dbotthepony.mc.otm.client.render.UVWindingOrder
 import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/LargeBooleanRectangleButtonPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/LargeBooleanRectangleButtonPanel.kt
index f2003f88f..fb36e1996 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/LargeBooleanRectangleButtonPanel.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/LargeBooleanRectangleButtonPanel.kt
@@ -2,12 +2,10 @@ package ru.dbotthepony.mc.otm.client.screen.panels.button
 
 import net.minecraft.client.gui.screens.Screen
 import net.minecraft.network.chat.Component
-import ru.dbotthepony.mc.otm.client.minecraft
-import ru.dbotthepony.mc.otm.client.render.AbstractMatterySprite
+import ru.dbotthepony.mc.otm.client.render.sprites.AbstractMatterySprite
 import ru.dbotthepony.mc.otm.client.render.Widgets18
 import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel
 import ru.dbotthepony.mc.otm.core.GetterSetter
-import ru.dbotthepony.mc.otm.menu.input.IPlayerInputWithFeedback
 
 open class LargeBooleanRectangleButtonPanel<out S : Screen>(
 	screen: S,
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/LargeRectangleButtonPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/LargeRectangleButtonPanel.kt
index a5662a752..20d14a49f 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/LargeRectangleButtonPanel.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/LargeRectangleButtonPanel.kt
@@ -1,9 +1,7 @@
 package ru.dbotthepony.mc.otm.client.screen.panels.button
 
-import com.mojang.blaze3d.vertex.PoseStack
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.client.gui.screens.Screen
-import ru.dbotthepony.mc.otm.client.render.AbstractMatterySprite
 import ru.dbotthepony.mc.otm.client.render.IGUIRenderable
 import ru.dbotthepony.mc.otm.client.render.UVWindingOrder
 import ru.dbotthepony.mc.otm.client.render.Widgets18
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/RectangleButtonPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/RectangleButtonPanel.kt
index e7388dd61..a89d1436b 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/RectangleButtonPanel.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/RectangleButtonPanel.kt
@@ -1,13 +1,9 @@
 package ru.dbotthepony.mc.otm.client.screen.panels.button
 
-import com.mojang.blaze3d.vertex.PoseStack
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.client.gui.screens.Screen
-import ru.dbotthepony.mc.otm.client.playGuiClickSound
-import ru.dbotthepony.mc.otm.client.render.AbstractMatterySprite
 import ru.dbotthepony.mc.otm.client.render.IGUIRenderable
 import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel
-import ru.dbotthepony.mc.otm.core.TextComponent
 import java.util.function.IntConsumer
 
 @Suppress("PropertyName")
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/SmallBooleanRectangleButtonPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/SmallBooleanRectangleButtonPanel.kt
index 3b64db74c..c9106179d 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/SmallBooleanRectangleButtonPanel.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/SmallBooleanRectangleButtonPanel.kt
@@ -2,6 +2,7 @@ package ru.dbotthepony.mc.otm.client.screen.panels.button
 
 import net.minecraft.client.gui.screens.Screen
 import ru.dbotthepony.mc.otm.client.render.*
+import ru.dbotthepony.mc.otm.client.render.sprites.AbstractMatterySprite
 import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel
 import ru.dbotthepony.mc.otm.core.GetterSetter
 
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/SmallRectangleButtonPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/SmallRectangleButtonPanel.kt
index 2bb972a17..3b2cab6a9 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/SmallRectangleButtonPanel.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/button/SmallRectangleButtonPanel.kt
@@ -1,9 +1,8 @@
 package ru.dbotthepony.mc.otm.client.screen.panels.button
 
-import com.mojang.blaze3d.vertex.PoseStack
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.client.gui.screens.Screen
-import ru.dbotthepony.mc.otm.client.render.MatterySprite
+import ru.dbotthepony.mc.otm.client.render.sprites.MatterySprite
 import ru.dbotthepony.mc.otm.client.render.UVWindingOrder
 import ru.dbotthepony.mc.otm.client.render.Widgets8
 import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/slot/InventorySlotPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/slot/InventorySlotPanel.kt
index 03b4f9517..405909afb 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/slot/InventorySlotPanel.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/slot/InventorySlotPanel.kt
@@ -6,7 +6,6 @@ import net.minecraft.world.item.Item
 import ru.dbotthepony.mc.otm.client.isAltDown
 import ru.dbotthepony.mc.otm.client.minecraft
 import ru.dbotthepony.mc.otm.client.playGuiClickSound
-import ru.dbotthepony.mc.otm.client.render.MatterySprite
 import ru.dbotthepony.mc.otm.client.render.Widgets18
 import ru.dbotthepony.mc.otm.client.screen.MatteryScreen
 import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/util/BackgroundPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/util/BackgroundPanel.kt
index e36c41bf6..62ec2595b 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/util/BackgroundPanel.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/util/BackgroundPanel.kt
@@ -1,9 +1,8 @@
 package ru.dbotthepony.mc.otm.client.screen.panels.util
 
-import com.mojang.blaze3d.vertex.PoseStack
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.client.gui.screens.Screen
-import ru.dbotthepony.mc.otm.client.render.StretchingRectangleElement
+import ru.dbotthepony.mc.otm.client.render.sprites.StretchingRectangleElement
 import ru.dbotthepony.mc.otm.client.render.WidgetLocation
 import ru.dbotthepony.mc.otm.client.screen.panels.DockProperty
 import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/util/HeightControls.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/util/HeightControls.kt
index 53de032e0..9eeaae48a 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/util/HeightControls.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/util/HeightControls.kt
@@ -2,7 +2,7 @@ package ru.dbotthepony.mc.otm.client.screen.panels.util
 
 import com.mojang.blaze3d.platform.InputConstants
 import net.minecraft.client.gui.screens.Screen
-import ru.dbotthepony.mc.otm.client.render.AbstractMatterySprite
+import ru.dbotthepony.mc.otm.client.render.sprites.AbstractMatterySprite
 import ru.dbotthepony.mc.otm.client.render.Widgets
 import ru.dbotthepony.mc.otm.client.screen.panels.Dock
 import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/util/ScrollBarConstants.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/util/ScrollBarConstants.kt
index 397500379..5309d2144 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/util/ScrollBarConstants.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/util/ScrollBarConstants.kt
@@ -2,8 +2,8 @@ package ru.dbotthepony.mc.otm.client.screen.panels.util
 
 import net.minecraft.resources.ResourceLocation
 import ru.dbotthepony.mc.otm.OverdriveThatMatters
-import ru.dbotthepony.mc.otm.client.render.MatteryAtlas
-import ru.dbotthepony.mc.otm.client.render.sprite
+import ru.dbotthepony.mc.otm.client.render.sprites.MatteryAtlas
+import ru.dbotthepony.mc.otm.client.render.sprites.sprite
 
 object ScrollBarConstants {
 	const val WIDTH = 14f
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/EssenceStorageScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/EssenceStorageScreen.kt
index 7605bfde4..a980fdd31 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/EssenceStorageScreen.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/EssenceStorageScreen.kt
@@ -7,7 +7,7 @@ import net.minecraft.resources.ResourceLocation
 import net.minecraft.world.entity.player.Inventory
 import ru.dbotthepony.mc.otm.OverdriveThatMatters
 import ru.dbotthepony.mc.otm.client.isShiftDown
-import ru.dbotthepony.mc.otm.client.render.MatteryAtlas
+import ru.dbotthepony.mc.otm.client.render.sprites.MatteryAtlas
 import ru.dbotthepony.mc.otm.client.render.RenderGravity
 import ru.dbotthepony.mc.otm.client.screen.MatteryScreen
 import ru.dbotthepony.mc.otm.client.screen.panels.Dock
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/widget/FluidGaugePanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/widget/FluidGaugePanel.kt
index ca6bfd7b7..12dee13b7 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/widget/FluidGaugePanel.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/widget/FluidGaugePanel.kt
@@ -2,7 +2,6 @@ package ru.dbotthepony.mc.otm.client.screen.widget
 
 import com.mojang.blaze3d.systems.RenderSystem
 import com.mojang.blaze3d.vertex.DefaultVertexFormat
-import com.mojang.blaze3d.vertex.PoseStack
 import com.mojang.blaze3d.vertex.VertexFormat
 import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.client.gui.screens.Screen
@@ -15,9 +14,8 @@ import org.lwjgl.opengl.GL11
 import ru.dbotthepony.mc.otm.OverdriveThatMatters
 import ru.dbotthepony.mc.otm.client.ShiftPressedCond
 import ru.dbotthepony.mc.otm.client.minecraft
-import ru.dbotthepony.mc.otm.client.render.MatterySprite
+import ru.dbotthepony.mc.otm.client.render.sprites.MatterySprite
 import ru.dbotthepony.mc.otm.client.render.tesselator
-import ru.dbotthepony.mc.otm.client.render.vertex
 import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel
 import ru.dbotthepony.mc.otm.core.TextComponent
 import ru.dbotthepony.mc.otm.core.TranslatableComponent
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/cos/CosmeticArmorCompat.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/cos/CosmeticArmorCompat.kt
index 2eb86f7d1..d21277685 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/cos/CosmeticArmorCompat.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/cos/CosmeticArmorCompat.kt
@@ -1,7 +1,6 @@
 package ru.dbotthepony.mc.otm.compat.cos
 
 import com.mojang.blaze3d.platform.InputConstants
-import com.mojang.blaze3d.vertex.PoseStack
 import lain.mods.cos.impl.ModObjects
 import lain.mods.cos.impl.client.PlayerRenderHandler
 import lain.mods.cos.impl.client.gui.GuiCosArmorInventory
@@ -18,8 +17,8 @@ import net.minecraft.world.inventory.Slot
 import net.minecraft.world.item.ItemStack
 import net.minecraftforge.fml.ModList
 import ru.dbotthepony.mc.otm.client.minecraft
-import ru.dbotthepony.mc.otm.client.render.MatterySprite
-import ru.dbotthepony.mc.otm.client.render.sprite
+import ru.dbotthepony.mc.otm.client.render.sprites.MatterySprite
+import ru.dbotthepony.mc.otm.client.render.sprites.sprite
 import ru.dbotthepony.mc.otm.client.screen.panels.EditablePanel
 import ru.dbotthepony.mc.otm.client.screen.panels.button.RectangleButtonPanel
 import ru.dbotthepony.mc.otm.compat.cos.CosmeticToggleButton.Companion.BUTTON_ACTIVE
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/SkinDrawable.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/SkinDrawable.kt
index ff81b073e..6ac46e51f 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/SkinDrawable.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/SkinDrawable.kt
@@ -2,7 +2,7 @@ package ru.dbotthepony.mc.otm.compat.jei
 
 import mezz.jei.api.gui.drawable.IDrawable
 import net.minecraft.client.gui.GuiGraphics
-import ru.dbotthepony.mc.otm.client.render.MatterySprite
+import ru.dbotthepony.mc.otm.client.render.sprites.MatterySprite
 
 class SkinDrawable(val element: MatterySprite) : IDrawable {
 	override fun getWidth(): Int {
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/StretchingDrawable.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/StretchingDrawable.kt
index 7d47e2454..72c2c96eb 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/StretchingDrawable.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/StretchingDrawable.kt
@@ -2,7 +2,7 @@ package ru.dbotthepony.mc.otm.compat.jei
 
 import mezz.jei.api.gui.drawable.IDrawable
 import net.minecraft.client.gui.GuiGraphics
-import ru.dbotthepony.mc.otm.client.render.StretchingRectangleElement
+import ru.dbotthepony.mc.otm.client.render.sprites.StretchingRectangleElement
 
 class StretchingDrawable(val element: StretchingRectangleElement, val rectWidth: Int, val rectHeight: Int) : IDrawable {
 	override fun getWidth(): Int {