diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/PainterBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/PainterBlock.kt
similarity index 88%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/PainterBlock.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/PainterBlock.kt
index 391f7504e..0e8ffdaa6 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/PainterBlock.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/decorative/PainterBlock.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.block.tech
+package ru.dbotthepony.mc.otm.block.decorative
 
 import net.minecraft.core.BlockPos
 import net.minecraft.world.level.Level
@@ -8,7 +8,7 @@ import net.minecraft.world.level.block.entity.BlockEntityTicker
 import net.minecraft.world.level.block.entity.BlockEntityType
 import net.minecraft.world.level.block.state.BlockState
 import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock
-import ru.dbotthepony.mc.otm.block.entity.tech.PainterBlockEntity
+import ru.dbotthepony.mc.otm.block.entity.decorative.PainterBlockEntity
 
 class PainterBlock : RotatableMatteryBlock(), EntityBlock {
 	override fun newBlockEntity(p_153215_: BlockPos, p_153216_: BlockState): BlockEntity {
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/PainterBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/PainterBlockEntity.kt
similarity index 98%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/PainterBlockEntity.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/PainterBlockEntity.kt
index 46e00a325..02c980166 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/tech/PainterBlockEntity.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/PainterBlockEntity.kt
@@ -1,9 +1,8 @@
-package ru.dbotthepony.mc.otm.block.entity.tech
+package ru.dbotthepony.mc.otm.block.entity.decorative
 
 import com.google.common.collect.ImmutableList
 import net.minecraft.core.BlockPos
 import net.minecraft.nbt.CompoundTag
-import net.minecraft.nbt.IntTag
 import net.minecraft.world.entity.player.Inventory
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.inventory.AbstractContainerMenu
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/PainterScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/PainterScreen.kt
index 9882c3e27..b85fe86df 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/PainterScreen.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/tech/PainterScreen.kt
@@ -9,7 +9,7 @@ import net.minecraft.world.item.ItemStack
 import net.minecraft.world.item.Items
 import net.minecraftforge.common.Tags
 import net.minecraftforge.registries.ForgeRegistries
-import ru.dbotthepony.mc.otm.block.entity.tech.PainterBlockEntity
+import ru.dbotthepony.mc.otm.block.entity.decorative.PainterBlockEntity
 import ru.dbotthepony.mc.otm.client.render.FlatRectangleIcon
 import ru.dbotthepony.mc.otm.client.render.ItemStackIcon
 import ru.dbotthepony.mc.otm.client.render.renderRect
@@ -28,7 +28,6 @@ import ru.dbotthepony.mc.otm.core.TextComponent
 import ru.dbotthepony.mc.otm.core.TranslatableComponent
 import ru.dbotthepony.mc.otm.core.math.RGBAColor
 import ru.dbotthepony.mc.otm.menu.tech.PainterMenu
-import ru.dbotthepony.mc.otm.registry.MItems
 
 class PainterScreen(menu: PainterMenu, inventory: Inventory, title: Component) : MatteryScreen<PainterMenu>(menu, inventory, title) {
 	inner class Bar(parent: EditablePanel<*>, val dye: DyeColor) : EditablePanel<PainterScreen>(this@PainterScreen, parent, width = 5f) {
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/PainterMenu.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/PainterMenu.kt
index 55466ffd1..5d93bddb0 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/PainterMenu.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/menu/tech/PainterMenu.kt
@@ -5,7 +5,7 @@ import net.minecraft.world.entity.player.Inventory
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.item.DyeColor
 import net.minecraft.world.item.ItemStack
-import ru.dbotthepony.mc.otm.block.entity.tech.PainterBlockEntity
+import ru.dbotthepony.mc.otm.block.entity.decorative.PainterBlockEntity
 import ru.dbotthepony.mc.otm.container.MatteryContainer
 import ru.dbotthepony.mc.otm.core.ISubscriptable
 import ru.dbotthepony.mc.otm.core.addAll
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/PainterRecipe.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/PainterRecipe.kt
index 158cab1df..61cda92bd 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/PainterRecipe.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/recipe/PainterRecipe.kt
@@ -1,7 +1,5 @@
 package ru.dbotthepony.mc.otm.recipe
 
-import com.google.common.collect.ImmutableSet
-import com.mojang.datafixers.util.Either
 import com.mojang.serialization.Codec
 import com.mojang.serialization.codecs.RecordCodecBuilder
 import net.minecraft.core.NonNullList
@@ -17,13 +15,12 @@ import net.minecraft.world.item.crafting.RecipeSerializer
 import net.minecraft.world.item.crafting.RecipeType
 import net.minecraft.world.level.Level
 import ru.dbotthepony.mc.otm.OverdriveThatMatters
-import ru.dbotthepony.mc.otm.block.entity.tech.PainterBlockEntity
+import ru.dbotthepony.mc.otm.block.entity.decorative.PainterBlockEntity
 import ru.dbotthepony.mc.otm.container.get
 import ru.dbotthepony.mc.otm.core.isActuallyEmpty
 import ru.dbotthepony.mc.otm.core.nbt.set
 import ru.dbotthepony.mc.otm.core.tagNotNull
 import ru.dbotthepony.mc.otm.data.Codec2RecipeSerializer
-import ru.dbotthepony.mc.otm.data.CodecList
 import ru.dbotthepony.mc.otm.data.IngredientCodec
 import ru.dbotthepony.mc.otm.data.PredicatedCodecList
 import ru.dbotthepony.mc.otm.data.minRange
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 4dfd27172..0a88fdb2a 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlockEntities.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlockEntities.kt
@@ -20,6 +20,7 @@ import ru.dbotthepony.mc.otm.block.entity.decorative.DevChestBlockEntity
 import ru.dbotthepony.mc.otm.block.entity.decorative.FluidTankBlockEntity
 import ru.dbotthepony.mc.otm.block.entity.decorative.HoloSignBlockEntity
 import ru.dbotthepony.mc.otm.block.entity.decorative.InfiniteWaterSourceBlockEntity
+import ru.dbotthepony.mc.otm.block.entity.decorative.PainterBlockEntity
 import ru.dbotthepony.mc.otm.block.entity.matter.*
 import ru.dbotthepony.mc.otm.block.entity.storage.*
 import ru.dbotthepony.mc.otm.block.entity.tech.AndroidStationBlockEntity
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt
index 34658df9d..4772c75de 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt
@@ -63,7 +63,7 @@ import ru.dbotthepony.mc.otm.block.storage.StoragePowerSupplierBlock
 import ru.dbotthepony.mc.otm.block.tech.AndroidChargerBlock
 import ru.dbotthepony.mc.otm.block.tech.CobblerBlock
 import ru.dbotthepony.mc.otm.block.tech.EssenceStorageBlock
-import ru.dbotthepony.mc.otm.block.tech.PainterBlock
+import ru.dbotthepony.mc.otm.block.decorative.PainterBlock
 import ru.dbotthepony.mc.otm.block.tech.PoweredFurnaceBlock
 import ru.dbotthepony.mc.otm.config.MachinesConfig
 import ru.dbotthepony.mc.otm.core.TranslatableComponent