diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/data/world/OneOfProvider.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/data/world/OneOfProvider.kt
index ddcfab249..40e7aeca2 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/data/world/OneOfProvider.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/data/world/OneOfProvider.kt
@@ -7,7 +7,7 @@ import com.mojang.serialization.MapCodec
 import com.mojang.serialization.codecs.RecordCodecBuilder
 import net.minecraft.util.RandomSource
 import net.minecraft.util.valueproviders.IntProvider
-import ru.dbotthepony.mc.otm.core.random
+import ru.dbotthepony.mc.otm.util.random
 import java.util.Optional
 
 class OneOfProvider<T> private constructor(val children: List<T>, val selector: Optional<IntProvider> = Optional.empty()) {
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/EnhancedPlacedFeature.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/EnhancedPlacedFeature.kt
index d6eaf6c68..60b6f79ce 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/EnhancedPlacedFeature.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/EnhancedPlacedFeature.kt
@@ -22,9 +22,9 @@ import net.minecraft.world.level.levelgen.feature.configurations.FeatureConfigur
 import net.minecraft.world.level.levelgen.placement.PlacedFeature
 import ru.dbotthepony.kommons.util.XXHash64
 import ru.dbotthepony.mc.otm.THREAD_LOCAL_RANDOM
-import ru.dbotthepony.mc.otm.core.shuffle
-import ru.dbotthepony.mc.otm.core.util.GJRAND64RandomSource
 import ru.dbotthepony.mc.otm.data.codec.minRange
+import ru.dbotthepony.mc.otm.util.GJRAND64RandomSource
+import ru.dbotthepony.mc.otm.util.shuffle
 import ru.dbotthepony.mc.otm.worldgen.feature.EnhancedFeature
 import ru.dbotthepony.mc.otm.worldgen.placement.EnhancedPlacement
 import java.io.DataOutputStream
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/placement/EllipsoidPlacement.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/placement/EllipsoidPlacement.kt
index f2b411cb7..003c2eaea 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/placement/EllipsoidPlacement.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/placement/EllipsoidPlacement.kt
@@ -11,13 +11,15 @@ import net.minecraft.world.level.levelgen.placement.PlacementContext
 import net.minecraft.world.level.levelgen.placement.PlacementModifier
 import net.minecraft.world.level.levelgen.placement.PlacementModifierType
 import ru.dbotthepony.mc.otm.util.collect.Vec3iHashStrategy
-import ru.dbotthepony.mc.otm.core.math.VECTOR_POSITIVE_X
-import ru.dbotthepony.mc.otm.core.math.VECTOR_POSITIVE_Z
-import ru.dbotthepony.mc.otm.core.math.VECTOR_UP
-import ru.dbotthepony.mc.otm.core.math.rotate
-import ru.dbotthepony.mc.otm.core.math.rotateAroundThis
 import ru.dbotthepony.mc.otm.data.world.BooleanProvider
 import ru.dbotthepony.mc.otm.registry.data.MPlacementModifiers
+import ru.dbotthepony.mc.otm.util.math.VECTOR_POSITIVE_X
+import ru.dbotthepony.mc.otm.util.math.VECTOR_POSITIVE_Z
+import ru.dbotthepony.mc.otm.util.math.VECTOR_UP
+import ru.dbotthepony.mc.otm.util.math.Vector
+import ru.dbotthepony.mc.otm.util.math.rotate
+import ru.dbotthepony.mc.otm.util.math.rotateAroundThis
+import ru.dbotthepony.mc.otm.util.nextDouble
 import ru.dbotthepony.mc.otm.worldgen.EnhancedPlacementContext
 import ru.dbotthepony.mc.otm.worldgen.PlacementPos
 import java.util.*
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/placement/WormPlacement.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/placement/WormPlacement.kt
index 7886972a3..ad58cd59a 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/placement/WormPlacement.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/worldgen/placement/WormPlacement.kt
@@ -13,15 +13,15 @@ import net.minecraft.util.valueproviders.UniformFloat
 import net.minecraft.world.level.levelgen.placement.PlacementContext
 import net.minecraft.world.level.levelgen.placement.PlacementModifier
 import net.minecraft.world.level.levelgen.placement.PlacementModifierType
-import ru.dbotthepony.mc.otm.core.math.Vector
-import ru.dbotthepony.mc.otm.core.math.angleDifference
-import ru.dbotthepony.mc.otm.core.math.normalizeAngle
-import ru.dbotthepony.mc.otm.core.math.plus
-import ru.dbotthepony.mc.otm.core.math.toBlockPos
-import ru.dbotthepony.mc.otm.core.nextDouble
 import ru.dbotthepony.mc.otm.data.codec.minRange
 import ru.dbotthepony.mc.otm.data.world.BooleanProvider
 import ru.dbotthepony.mc.otm.registry.data.MPlacementModifiers
+import ru.dbotthepony.mc.otm.util.math.Vector
+import ru.dbotthepony.mc.otm.util.math.angleDifference
+import ru.dbotthepony.mc.otm.util.math.normalizeAngle
+import ru.dbotthepony.mc.otm.util.math.plus
+import ru.dbotthepony.mc.otm.util.math.toBlockPos
+import ru.dbotthepony.mc.otm.util.nextDouble
 import ru.dbotthepony.mc.otm.worldgen.EnhancedPlacementContext
 import ru.dbotthepony.mc.otm.worldgen.PlacementPos
 import java.util.stream.Stream