diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/BlackHoleRenderer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/BlackHoleRenderer.kt
similarity index 98%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/client/render/BlackHoleRenderer.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/BlackHoleRenderer.kt
index eaf2b827a..bf4445101 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/BlackHoleRenderer.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/BlackHoleRenderer.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.client.render
+package ru.dbotthepony.mc.otm.client.render.blockentity
 
 import com.mojang.blaze3d.systems.RenderSystem
 import com.mojang.blaze3d.vertex.*
@@ -15,6 +15,7 @@ import ru.dbotthepony.mc.otm.TranslatableComponent
 import ru.dbotthepony.mc.otm.block.entity.GravitationStabilizerBlockEntity
 import ru.dbotthepony.mc.otm.block.entity.blackhole.BlackHoleBlockEntity
 import ru.dbotthepony.mc.otm.capability.android
+import ru.dbotthepony.mc.otm.client.render.*
 import ru.dbotthepony.mc.otm.core.*
 import ru.dbotthepony.mc.otm.registry.MItems
 import kotlin.math.PI
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/EnergyCounterRenderer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/EnergyCounterRenderer.kt
similarity index 87%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/client/render/EnergyCounterRenderer.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/EnergyCounterRenderer.kt
index d65f88ed8..2d299b81c 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/EnergyCounterRenderer.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/EnergyCounterRenderer.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.client.render
+package ru.dbotthepony.mc.otm.client.render.blockentity
 
 import com.mojang.blaze3d.vertex.PoseStack
 import net.minecraft.client.Minecraft
@@ -9,6 +9,7 @@ import net.minecraft.core.Direction
 import ru.dbotthepony.mc.otm.TranslatableComponent
 import ru.dbotthepony.mc.otm.block.EnergyCounterBlock
 import ru.dbotthepony.mc.otm.block.entity.EnergyCounterBlockEntity
+import ru.dbotthepony.mc.otm.client.render.*
 import ru.dbotthepony.mc.otm.core.RGBAColor
 import ru.dbotthepony.mc.otm.core.asAngle
 import ru.dbotthepony.mc.otm.core.formatPower
@@ -53,13 +54,15 @@ class EnergyCounterRenderer(private val context: BlockEntityRendererProvider.Con
 		poseStack.pushPose()
 		poseStack.translate(-0.1, -0.1, -0.1)
 		font.drawAligned(poseStack, tile.lastTick.toString(0), TextAlign.CENTER_RIGHT, finalX.toFloat(), y, RGBAColor.WHITE)
-		font.drawAligned(poseStack, tile.sumHistory(20).toString(0), TextAlign.CENTER_RIGHT, finalX.toFloat(), y + font.lineHeight, RGBAColor.WHITE)
+		font.drawAligned(poseStack, tile.sumHistory(20).toString(0),
+			TextAlign.CENTER_RIGHT, finalX.toFloat(), y + font.lineHeight, RGBAColor.WHITE)
 		poseStack.popPose()
 
 		y += font.lineHeight * 3
 
 		font.drawAligned(poseStack, TOTAL, TextAlign.CENTER_CENTER, 0f, y, RGBAColor.WHITE)
-		font.drawAligned(poseStack, tile.passed.formatPower(), TextAlign.CENTER_CENTER, 0f, y + font.lineHeight, RGBAColor.WHITE)
+		font.drawAligned(poseStack, tile.passed.formatPower(),
+			TextAlign.CENTER_CENTER, 0f, y + font.lineHeight, RGBAColor.WHITE)
 
 		poseStack.popPose()
 	}
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/GravitationStabilizerRenderer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/GravitationStabilizerRenderer.kt
similarity index 96%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/client/render/GravitationStabilizerRenderer.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/GravitationStabilizerRenderer.kt
index 241f206f3..ab12d926a 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/GravitationStabilizerRenderer.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/render/blockentity/GravitationStabilizerRenderer.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.client.render
+package ru.dbotthepony.mc.otm.client.render.blockentity
 
 import com.mojang.blaze3d.vertex.*
 import com.mojang.math.Matrix4f
@@ -16,6 +16,7 @@ import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
 import ru.dbotthepony.mc.otm.block.entity.GravitationStabilizerBlockEntity
 import ru.dbotthepony.mc.otm.block.entity.blackhole.BlackHoleBlockEntity
 import ru.dbotthepony.mc.otm.block.entity.worker.WorkerState
+import ru.dbotthepony.mc.otm.client.render.*
 import ru.dbotthepony.mc.otm.core.*
 import kotlin.math.PI
 
@@ -143,8 +144,10 @@ class GravitationStabilizerRenderer(private val context: BlockEntityRendererProv
 			poseStack.scale(0.01f, 0.01f, 0.01f)
 
 			val font = Minecraft.getInstance().font
-			font.drawAligned(poseStack, TranslatableComponent("otm.3d2d.gravitation_stabilizer.mass", bhTile.mass.formatMatter()), TextAlign.TOP_CENTER, 0f, -font.lineHeight.toFloat() / 2f, 0xFFFFFF)
-			font.drawAligned(poseStack, TranslatableComponent("otm.3d2d.gravitation_stabilizer.strength", "%.2f".format(bhTile.gravitationStrength)), TextAlign.TOP_CENTER, 0f, font.lineHeight.toFloat() / 2f, 0xFFFFFF)
+			font.drawAligned(poseStack, TranslatableComponent("otm.3d2d.gravitation_stabilizer.mass", bhTile.mass.formatMatter()),
+				TextAlign.TOP_CENTER, 0f, -font.lineHeight.toFloat() / 2f, 0xFFFFFF)
+			font.drawAligned(poseStack, TranslatableComponent("otm.3d2d.gravitation_stabilizer.strength", "%.2f".format(bhTile.gravitationStrength)),
+				TextAlign.TOP_CENTER, 0f, font.lineHeight.toFloat() / 2f, 0xFFFFFF)
 
 			poseStack.popPose()
 		}
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlockEntities.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlockEntities.kt
index e25008302..9b6d68b8e 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlockEntities.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlockEntities.kt
@@ -14,7 +14,7 @@ import ru.dbotthepony.mc.otm.block.entity.blackhole.BlockEntitySphereDebugger
 import ru.dbotthepony.mc.otm.block.entity.matter.*
 import ru.dbotthepony.mc.otm.block.entity.storage.*
 import ru.dbotthepony.mc.otm.client.render.BlackHoleRenderer
-import ru.dbotthepony.mc.otm.client.render.EnergyCounterRenderer
+import ru.dbotthepony.mc.otm.client.render.blockentity.EnergyCounterRenderer
 import ru.dbotthepony.mc.otm.client.render.GravitationStabilizerRenderer
 
 object MBlockEntities {