diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt
index f4b40cfb3..f5c244a22 100644
--- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt
+++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt
@@ -20,7 +20,7 @@ import net.minecraftforge.data.event.GatherDataEvent
 import ru.dbotthepony.mc.otm.OverdriveThatMatters
 import ru.dbotthepony.mc.otm.android.AndroidResearchDataProvider
 import ru.dbotthepony.mc.otm.block.*
-import ru.dbotthepony.mc.otm.core.WriteOnce
+import ru.dbotthepony.mc.otm.core.util.WriteOnce
 import ru.dbotthepony.mc.otm.datagen.blocks.BatteryBankProvider
 import ru.dbotthepony.mc.otm.datagen.blocks.MatterBankProvider
 import ru.dbotthepony.mc.otm.datagen.blocks.MatteryBlockStateProvider
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/GlobalEventHandler.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/GlobalEventHandler.kt
index 2a0ca3784..08527452f 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/GlobalEventHandler.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/GlobalEventHandler.kt
@@ -16,10 +16,10 @@ import net.minecraftforge.event.server.ServerStoppingEvent
 import net.minecraftforge.fml.loading.FMLLoader
 import org.apache.logging.log4j.LogManager
 import ru.dbotthepony.mc.otm.client.minecraft
-import ru.dbotthepony.mc.otm.core.IConditionalTickable
-import ru.dbotthepony.mc.otm.core.ITickable
-import ru.dbotthepony.mc.otm.core.TickList
-import ru.dbotthepony.mc.otm.core.TimerQueue
+import ru.dbotthepony.mc.otm.core.util.IConditionalTickable
+import ru.dbotthepony.mc.otm.core.util.ITickable
+import ru.dbotthepony.mc.otm.core.util.TickList
+import ru.dbotthepony.mc.otm.core.util.TimerQueue
 import java.util.*
 
 private val preServerTick = TickList()
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearchDataProvider.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearchDataProvider.kt
index ad2635fa8..779263e7d 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearchDataProvider.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidResearchDataProvider.kt
@@ -2,12 +2,11 @@ package ru.dbotthepony.mc.otm.android
 
 import it.unimi.dsi.fastutil.objects.ObjectArraySet
 import net.minecraft.data.CachedOutput
-import net.minecraft.data.DataGenerator
 import net.minecraft.data.DataProvider
 import net.minecraft.data.PackOutput
 import net.minecraft.resources.ResourceLocation
 import net.minecraftforge.data.event.GatherDataEvent
-import ru.dbotthepony.mc.otm.core.WriteOnce
+import ru.dbotthepony.mc.otm.core.util.WriteOnce
 import java.util.Collections
 import java.util.LinkedList
 import java.util.concurrent.CompletableFuture
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/AndroidStationBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/AndroidStationBlockEntity.kt
index d59942492..bf212b5ac 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/AndroidStationBlockEntity.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/AndroidStationBlockEntity.kt
@@ -21,7 +21,7 @@ import ru.dbotthepony.mc.otm.menu.AndroidStationMenu
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.registry.MBlocks
 import ru.dbotthepony.mc.otm.registry.MNames
-import ru.dbotthepony.mc.otm.core.WriteOnce
+import ru.dbotthepony.mc.otm.core.util.WriteOnce
 
 @Suppress("ObjectPropertyName")
 class AndroidStationBlockEntity(p_155229_: BlockPos, p_155230_: BlockState) :
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/ChemicalGeneratorBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/ChemicalGeneratorBlockEntity.kt
index 50915838f..65397f358 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/ChemicalGeneratorBlockEntity.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/ChemicalGeneratorBlockEntity.kt
@@ -29,7 +29,7 @@ import ru.dbotthepony.mc.otm.core.*
 import ru.dbotthepony.mc.otm.menu.ChemicalGeneratorMenu
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.registry.MNames
-import ru.dbotthepony.mc.otm.core.WriteOnce
+import ru.dbotthepony.mc.otm.core.util.WriteOnce
 import ru.dbotthepony.mc.otm.core.math.Decimal
 import ru.dbotthepony.mc.otm.core.math.DecimalConfigValue
 import ru.dbotthepony.mc.otm.core.math.defineDecimal
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterBottlerBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterBottlerBlockEntity.kt
index b59157637..06526a072 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterBottlerBlockEntity.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterBottlerBlockEntity.kt
@@ -38,7 +38,7 @@ import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.core.*
 import ru.dbotthepony.mc.otm.registry.MBlocks
 import ru.dbotthepony.mc.otm.registry.MNames
-import ru.dbotthepony.mc.otm.core.WriteOnce
+import ru.dbotthepony.mc.otm.core.util.WriteOnce
 import ru.dbotthepony.mc.otm.core.math.Decimal
 import ru.dbotthepony.mc.otm.core.math.DecimalConfigValue
 import ru.dbotthepony.mc.otm.core.math.defineDecimal
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterDecomposerBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterDecomposerBlockEntity.kt
index 0850b82c9..c05623c36 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterDecomposerBlockEntity.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterDecomposerBlockEntity.kt
@@ -28,7 +28,6 @@ import ru.dbotthepony.mc.otm.capability.matter.IMatterStorage
 import ru.dbotthepony.mc.otm.capability.matter.MatterStorageImpl
 import ru.dbotthepony.mc.otm.container.MatteryContainer
 import ru.dbotthepony.mc.otm.container.MatteryContainerHooks
-import ru.dbotthepony.mc.otm.core.*
 import ru.dbotthepony.mc.otm.graph.Graph6Node
 import ru.dbotthepony.mc.otm.graph.matter.IMatterGraphNode
 import ru.dbotthepony.mc.otm.graph.matter.MatterNetworkGraph
@@ -38,7 +37,7 @@ import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.registry.MBlocks
 import ru.dbotthepony.mc.otm.registry.MItems
 import ru.dbotthepony.mc.otm.registry.MNames
-import ru.dbotthepony.mc.otm.core.WriteOnce
+import ru.dbotthepony.mc.otm.core.util.WriteOnce
 import ru.dbotthepony.mc.otm.core.math.Decimal
 import ru.dbotthepony.mc.otm.core.math.DecimalConfigValue
 import ru.dbotthepony.mc.otm.core.math.defineDecimal
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterRecyclerBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterRecyclerBlockEntity.kt
index 5f9876c5d..12b1cfccd 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterRecyclerBlockEntity.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterRecyclerBlockEntity.kt
@@ -41,7 +41,7 @@ import ru.dbotthepony.mc.otm.core.math.defineDecimal
 import ru.dbotthepony.mc.otm.core.nbt.set
 import ru.dbotthepony.mc.otm.registry.MBlocks
 import ru.dbotthepony.mc.otm.registry.MNames
-import ru.dbotthepony.mc.otm.core.WriteOnce
+import ru.dbotthepony.mc.otm.core.util.WriteOnce
 import ru.dbotthepony.mc.otm.core.math.getDecimal
 import ru.dbotthepony.mc.otm.core.math.set
 
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterReplicatorBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterReplicatorBlockEntity.kt
index daf276288..9895021eb 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterReplicatorBlockEntity.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterReplicatorBlockEntity.kt
@@ -31,10 +31,9 @@ import ru.dbotthepony.mc.otm.graph.matter.IMatterGraphNode
 import ru.dbotthepony.mc.otm.graph.matter.MatterNetworkGraph
 import ru.dbotthepony.mc.otm.menu.MatterReplicatorMenu
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
-import ru.dbotthepony.mc.otm.core.*
 import ru.dbotthepony.mc.otm.registry.MBlocks
 import ru.dbotthepony.mc.otm.registry.MNames
-import ru.dbotthepony.mc.otm.core.WriteOnce
+import ru.dbotthepony.mc.otm.core.util.WriteOnce
 import ru.dbotthepony.mc.otm.core.math.Decimal
 import ru.dbotthepony.mc.otm.core.math.DecimalConfigValue
 import ru.dbotthepony.mc.otm.core.math.defineDecimal
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterScannerBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterScannerBlockEntity.kt
index 103f04e5b..964f7e16a 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterScannerBlockEntity.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/MatterScannerBlockEntity.kt
@@ -37,7 +37,7 @@ import ru.dbotthepony.mc.otm.menu.MatterScannerMenu
 import ru.dbotthepony.mc.otm.registry.MBlockEntities
 import ru.dbotthepony.mc.otm.registry.MBlocks
 import ru.dbotthepony.mc.otm.registry.MNames
-import ru.dbotthepony.mc.otm.core.WriteOnce
+import ru.dbotthepony.mc.otm.core.util.WriteOnce
 import ru.dbotthepony.mc.otm.matter.MatterManager
 import java.util.*
 import kotlin.math.pow
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/ClientTickHandler.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/ClientTickHandler.kt
index 52b8581d2..7b04b4ebc 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/ClientTickHandler.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/ClientTickHandler.kt
@@ -2,11 +2,10 @@ package ru.dbotthepony.mc.otm.client
 
 import net.minecraftforge.client.event.ClientPlayerNetworkEvent
 import net.minecraftforge.event.TickEvent
-import org.apache.logging.log4j.LogManager
-import ru.dbotthepony.mc.otm.core.IConditionalTickable
-import ru.dbotthepony.mc.otm.core.ITickable
-import ru.dbotthepony.mc.otm.core.TickList
-import ru.dbotthepony.mc.otm.core.TimerQueue
+import ru.dbotthepony.mc.otm.core.util.IConditionalTickable
+import ru.dbotthepony.mc.otm.core.util.ITickable
+import ru.dbotthepony.mc.otm.core.util.TickList
+import ru.dbotthepony.mc.otm.core.util.TimerQueue
 import ru.dbotthepony.mc.otm.isClient
 
 private val preTickList = TickList()
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/mekanism/QIO.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/mekanism/QIO.kt
index 3c4b1ef04..5556f0819 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/mekanism/QIO.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/mekanism/QIO.kt
@@ -15,7 +15,7 @@ import net.minecraftforge.common.capabilities.ICapabilityProvider
 import net.minecraftforge.common.util.LazyOptional
 import net.minecraftforge.event.AttachCapabilitiesEvent
 import net.minecraftforge.eventbus.api.SubscribeEvent
-import ru.dbotthepony.mc.otm.core.ITickable
+import ru.dbotthepony.mc.otm.core.util.ITickable
 import ru.dbotthepony.mc.otm.OverdriveThatMatters
 import ru.dbotthepony.mc.otm.onceServer
 import ru.dbotthepony.mc.otm.capability.MatteryCapability
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/IConditionalTickable.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/IConditionalTickable.kt
new file mode 100644
index 000000000..7a9491798
--- /dev/null
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/IConditionalTickable.kt
@@ -0,0 +1,36 @@
+package ru.dbotthepony.mc.otm.core.util
+
+/**
+ * Represents tick callback with condition, once
+ */
+interface IConditionalTickable : ITickable {
+	/**
+	 * Once this returns false, it should stay false.
+	 *
+	 * If it suddenly turns true after being false, result is undefined.
+	 */
+	val canTick: Boolean
+
+	companion object {
+		fun wrap(ticker: () -> Boolean): IConditionalTickable {
+			return object : IConditionalTickable {
+				override var canTick: Boolean = true
+					private set
+
+				override fun tick() {
+					canTick = !ticker.invoke()
+				}
+			}
+		}
+
+		fun wrap(condition: () -> Boolean, ticker: () -> Unit): IConditionalTickable {
+			return object : IConditionalTickable {
+				override val canTick: Boolean get() = condition.invoke()
+
+				override fun tick() {
+					ticker.invoke()
+				}
+			}
+		}
+	}
+}
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/ITickable.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/ITickable.kt
new file mode 100644
index 000000000..80c55d765
--- /dev/null
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/ITickable.kt
@@ -0,0 +1,8 @@
+package ru.dbotthepony.mc.otm.core.util
+
+/**
+ * Represents tick callback
+ */
+fun interface ITickable {
+	fun tick()
+}
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/TickList.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/TickList.kt
similarity index 67%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/TickList.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/core/util/TickList.kt
index 8b1d635f9..dcdb6134c 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/TickList.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/TickList.kt
@@ -1,7 +1,6 @@
-package ru.dbotthepony.mc.otm.core
+package ru.dbotthepony.mc.otm.core.util
 
 import org.apache.logging.log4j.LogManager
-import kotlin.ConcurrentModificationException
 
 class TickList {
 	private val conditional = ArrayDeque<IConditionalTickable>()
@@ -47,10 +46,16 @@ class TickList {
 	}
 
 	fun until(ticker: () -> Boolean) = add(IConditionalTickable.wrap(ticker))
-	fun `while`(tickerCondition: () -> Boolean, ticker: () -> Unit) = add(IConditionalTickable.wrap(tickerCondition, ticker))
+	fun `while`(tickerCondition: () -> Boolean, ticker: () -> Unit) = add(
+		IConditionalTickable.wrap(
+			tickerCondition,
+			ticker
+		)
+	)
 
 	fun until(ticker: () -> Boolean, condition: Boolean, reason: String) = add(IConditionalTickable.wrap(ticker), condition, reason)
-	fun `while`(tickerCondition: () -> Boolean, ticker: () -> Unit, condition: Boolean, reason: String) = add(IConditionalTickable.wrap(tickerCondition, ticker), condition, reason)
+	fun `while`(tickerCondition: () -> Boolean, ticker: () -> Unit, condition: Boolean, reason: String) = add(
+		IConditionalTickable.wrap(tickerCondition, ticker), condition, reason)
 
 	fun tick() {
 		if (inTicker) {
@@ -97,39 +102,3 @@ class TickList {
 		private val LOGGER = LogManager.getLogger()
 	}
 }
-
-fun interface ITickable {
-	fun tick()
-}
-
-interface IConditionalTickable : ITickable {
-	/**
-	 * Once this returns false, it should stay false.
-	 *
-	 * If it suddenly turns true after being false, result is undefined.
-	 */
-	val canTick: Boolean
-
-	companion object {
-		fun wrap(ticker: () -> Boolean): IConditionalTickable {
-			return object : IConditionalTickable {
-				override var canTick: Boolean = true
-					private set
-
-				override fun tick() {
-					canTick = !ticker.invoke()
-				}
-			}
-		}
-
-		fun wrap(condition: () -> Boolean, ticker: () -> Unit): IConditionalTickable {
-			return object : IConditionalTickable {
-				override val canTick: Boolean get() = condition.invoke()
-
-				override fun tick() {
-					ticker.invoke()
-				}
-			}
-		}
-	}
-}
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/TimerQueue.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/TimerQueue.kt
similarity index 97%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/TimerQueue.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/core/util/TimerQueue.kt
index c4747cc94..2ecbc87eb 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/TimerQueue.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/TimerQueue.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.core
+package ru.dbotthepony.mc.otm.core.util
 
 import org.apache.logging.log4j.LogManager
 
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/core/WriteOnce.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/WriteOnce.kt
similarity index 93%
rename from src/main/kotlin/ru/dbotthepony/mc/otm/core/WriteOnce.kt
rename to src/main/kotlin/ru/dbotthepony/mc/otm/core/util/WriteOnce.kt
index a4c8b047e..bda267313 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/core/WriteOnce.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/core/util/WriteOnce.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.mc.otm.core
+package ru.dbotthepony.mc.otm.core.util
 
 import kotlin.properties.ReadWriteProperty
 import kotlin.reflect.KProperty
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/graph/Abstract6Graph.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/graph/Abstract6Graph.kt
index 8a136c671..794e61d1c 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/graph/Abstract6Graph.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/graph/Abstract6Graph.kt
@@ -5,7 +5,7 @@ import net.minecraft.core.Direction
 import net.minecraft.core.SectionPos
 import net.minecraft.server.level.ServerLevel
 import net.minecraft.world.level.block.entity.BlockEntity
-import ru.dbotthepony.mc.otm.core.IConditionalTickable
+import ru.dbotthepony.mc.otm.core.util.IConditionalTickable
 import ru.dbotthepony.mc.otm.core.math.plus
 import ru.dbotthepony.mc.otm.addTicker
 import java.util.*
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/graph/Graph6Node.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/graph/Graph6Node.kt
index 73c2cfe99..c8b12be6b 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/graph/Graph6Node.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/graph/Graph6Node.kt
@@ -1,8 +1,8 @@
 package ru.dbotthepony.mc.otm.graph
 
 import net.minecraft.core.Direction
-import ru.dbotthepony.mc.otm.core.IConditionalTickable
-import ru.dbotthepony.mc.otm.core.ITickable
+import ru.dbotthepony.mc.otm.core.util.IConditionalTickable
+import ru.dbotthepony.mc.otm.core.util.ITickable
 import ru.dbotthepony.mc.otm.SERVER_IS_LIVE
 
 interface GraphNodeListener {
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/item/EnergySwordItem.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/item/EnergySwordItem.kt
index f9065728c..ad59c3415 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/item/EnergySwordItem.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/item/EnergySwordItem.kt
@@ -42,7 +42,7 @@ import ru.dbotthepony.mc.otm.core.math.defineDecimal
 import ru.dbotthepony.mc.otm.core.ifPresentK
 import ru.dbotthepony.mc.otm.core.orNull
 import ru.dbotthepony.mc.otm.registry.EMPDamageSource
-import ru.dbotthepony.mc.otm.core.WriteOnce
+import ru.dbotthepony.mc.otm.core.util.WriteOnce
 
 /**
  * This is called from [net.minecraft.world.item.enchantment.EnchantmentHelper.getSweepingDamageRatio]
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/matter/MatterDataProvider.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/matter/MatterDataProvider.kt
index 42b89a276..13fc067dc 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/matter/MatterDataProvider.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/matter/MatterDataProvider.kt
@@ -9,7 +9,7 @@ import net.minecraft.world.item.Item
 import net.minecraft.world.level.ItemLike
 import net.minecraftforge.data.event.GatherDataEvent
 import ru.dbotthepony.mc.otm.core.math.Decimal
-import ru.dbotthepony.mc.otm.core.WriteOnce
+import ru.dbotthepony.mc.otm.core.util.WriteOnce
 import ru.dbotthepony.mc.otm.core.registryName
 import java.util.Collections
 import java.util.concurrent.CompletableFuture
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MCreativeTabs.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MCreativeTabs.kt
index aa7fe5cdd..7a3176d4b 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MCreativeTabs.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MCreativeTabs.kt
@@ -1,17 +1,11 @@
 package ru.dbotthepony.mc.otm.registry
 
-import com.google.common.collect.Iterators
-import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap
-import it.unimi.dsi.fastutil.objects.ReferenceLinkedOpenHashSet
-import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.world.item.CreativeModeTab
-import net.minecraft.world.item.Item
 import net.minecraft.world.item.ItemStack
 import net.minecraftforge.event.CreativeModeTabEvent
 import ru.dbotthepony.mc.otm.OverdriveThatMatters
-import ru.dbotthepony.mc.otm.core.WriteOnce
-import ru.dbotthepony.mc.otm.core.registryName
+import ru.dbotthepony.mc.otm.core.util.WriteOnce
 import ru.dbotthepony.mc.otm.registry.MItems.BATTERY_CREATIVE
 
 object MCreativeTabs {
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/objects/DecorativeBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/objects/DecorativeBlock.kt
index 732085af2..d12237294 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/objects/DecorativeBlock.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/objects/DecorativeBlock.kt
@@ -8,7 +8,7 @@ import net.minecraft.world.level.block.state.BlockBehaviour
 import net.minecraftforge.registries.DeferredRegister
 import net.minecraftforge.registries.RegistryObject
 import ru.dbotthepony.mc.otm.core.collect.SupplierMap
-import ru.dbotthepony.mc.otm.core.WriteOnce
+import ru.dbotthepony.mc.otm.core.util.WriteOnce
 
 /**
  * Base + Colored
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/saveddata/SavedCountingMap.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/saveddata/SavedCountingMap.kt
index 6c696ea66..42263a437 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/saveddata/SavedCountingMap.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/saveddata/SavedCountingMap.kt
@@ -10,7 +10,7 @@ import net.minecraft.world.level.saveddata.SavedData
 import org.apache.logging.log4j.LogManager
 import ru.dbotthepony.mc.otm.core.collect.ProxiedMap
 import ru.dbotthepony.mc.otm.core.nbt.set
-import ru.dbotthepony.mc.otm.core.WriteOnce
+import ru.dbotthepony.mc.otm.core.util.WriteOnce
 
 class SavedMapDelegate<V>(val parent: SavedCountingMap<SavedMapDelegate<V>>?, val index: Int, value: V) {
 	constructor(value: V) : this(null, -1, value)
diff --git a/src/test/kotlin/ru/dbotthepony/mc/otm/tests/TimerQueueTests.kt b/src/test/kotlin/ru/dbotthepony/mc/otm/tests/TimerQueueTests.kt
index 0a2d1edae..efd9f31be 100644
--- a/src/test/kotlin/ru/dbotthepony/mc/otm/tests/TimerQueueTests.kt
+++ b/src/test/kotlin/ru/dbotthepony/mc/otm/tests/TimerQueueTests.kt
@@ -3,7 +3,7 @@ package ru.dbotthepony.mc.otm.tests
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test
-import ru.dbotthepony.mc.otm.core.TimerQueue
+import ru.dbotthepony.mc.otm.core.util.TimerQueue
 
 object TimerQueueTests {
 	@Test