diff --git a/src/integration-test/kotlin/de/bixilon/minosoft/MinosoftSIT.kt b/src/integration-test/kotlin/de/bixilon/minosoft/MinosoftSIT.kt
index 7eb3e2487..9aa3d268d 100644
--- a/src/integration-test/kotlin/de/bixilon/minosoft/MinosoftSIT.kt
+++ b/src/integration-test/kotlin/de/bixilon/minosoft/MinosoftSIT.kt
@@ -42,7 +42,7 @@ internal object MinosoftSIT {
         RunConfiguration.VERBOSE_LOGGING = true
         RunConfiguration.APPLICATION_NAME = "Minosoft it"
 
-        val isCi = (System.getenv("GITHUB_ACTIONS") ?: System.getenv("TRAVIS") ?: System.getenv("CIRCLECI") ?: System.getenv("GITLAB_CI")) != null
+        val isCi = (System.getenv("GITHUB_ACTIONS") ?: System.getenv("TRAVIS") ?: System.getenv("CIRCLECI") ?: System.getenv("GITLAB_CI")) != null // TODO: kutil 1.25 Environment.isInCI()
         if (isCi) {
             RunConfiguration::HOME_DIRECTORY.forceSet(Path.of("./it"))
         }
diff --git a/src/main/java/de/bixilon/minosoft/data/world/chunk/manager/ChunkTicker.kt b/src/main/java/de/bixilon/minosoft/data/world/chunk/manager/ChunkTicker.kt
index ac0b3cb14..c9dc2a664 100644
--- a/src/main/java/de/bixilon/minosoft/data/world/chunk/manager/ChunkTicker.kt
+++ b/src/main/java/de/bixilon/minosoft/data/world/chunk/manager/ChunkTicker.kt
@@ -16,7 +16,7 @@ package de.bixilon.minosoft.data.world.chunk.manager
 import de.bixilon.kotlinglm.vec2.Vec2i
 import de.bixilon.kutil.collections.iterator.async.ConcurrentIterator
 import de.bixilon.kutil.concurrent.pool.ThreadPool
-import de.bixilon.minosoft.util.chunk.ChunkUtil.isInViewDistance
+import de.bixilon.minosoft.protocol.packets.s2c.play.block.chunk.ChunkUtil.isInViewDistance
 import java.util.*
 
 class ChunkTicker(val manager: ChunkManager) {
diff --git a/src/main/java/de/bixilon/minosoft/data/world/chunk/neighbours/ChunkNeighbours.kt b/src/main/java/de/bixilon/minosoft/data/world/chunk/neighbours/ChunkNeighbours.kt
index f1acd200c..720c23484 100644
--- a/src/main/java/de/bixilon/minosoft/data/world/chunk/neighbours/ChunkNeighbours.kt
+++ b/src/main/java/de/bixilon/minosoft/data/world/chunk/neighbours/ChunkNeighbours.kt
@@ -24,7 +24,7 @@ import de.bixilon.minosoft.data.world.chunk.chunk.Chunk
 import de.bixilon.minosoft.data.world.positions.ChunkPositionUtil.chunkPosition
 import de.bixilon.minosoft.data.world.positions.SectionHeight
 import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3iUtil.inChunkPosition
-import de.bixilon.minosoft.util.chunk.ChunkUtil
+import de.bixilon.minosoft.protocol.packets.s2c.play.block.chunk.ChunkUtil
 
 class ChunkNeighbours(val chunk: Chunk) : Iterable<Chunk?> {
     val neighbours: Array<Chunk?> = arrayOfNulls(COUNT)
diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/camera/visibility/WorldVisibilityGraph.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/camera/visibility/WorldVisibilityGraph.kt
index fd584f376..7562be545 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/camera/visibility/WorldVisibilityGraph.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/camera/visibility/WorldVisibilityGraph.kt
@@ -38,8 +38,8 @@ import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3iUtil.EMPTY
 import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3iUtil.chunkPosition
 import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3iUtil.sectionHeight
 import de.bixilon.minosoft.modding.event.listener.CallbackEventListener.Companion.listen
+import de.bixilon.minosoft.protocol.packets.s2c.play.block.chunk.ChunkUtil.isInViewDistance
 import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition
-import de.bixilon.minosoft.util.chunk.ChunkUtil.isInViewDistance
 import it.unimi.dsi.fastutil.ints.IntOpenHashSet
 
 /**
diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/mesher/ChunkMesher.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/mesher/ChunkMesher.kt
index bc9e81b1a..23ab42982 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/mesher/ChunkMesher.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/chunk/mesher/ChunkMesher.kt
@@ -19,7 +19,7 @@ import de.bixilon.minosoft.gui.rendering.chunk.WorldQueueItem
 import de.bixilon.minosoft.gui.rendering.chunk.mesh.ChunkMeshes
 import de.bixilon.minosoft.gui.rendering.chunk.queue.meshing.tasks.MeshPrepareTask
 import de.bixilon.minosoft.gui.rendering.chunk.util.ChunkRendererUtil.smallMesh
-import de.bixilon.minosoft.util.chunk.ChunkUtil
+import de.bixilon.minosoft.protocol.packets.s2c.play.block.chunk.ChunkUtil
 
 class ChunkMesher(
     private val renderer: ChunkRenderer,
diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/ParticleRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/ParticleRenderer.kt
index d97e9c327..ad9cba8f1 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/ParticleRenderer.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/ParticleRenderer.kt
@@ -37,8 +37,8 @@ import de.bixilon.minosoft.modding.event.listener.CallbackEventListener.Companio
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnectionStates
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnectionStates.Companion.disconnected
+import de.bixilon.minosoft.protocol.packets.s2c.play.block.chunk.ChunkUtil.isInViewDistance
 import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition
-import de.bixilon.minosoft.util.chunk.ChunkUtil.isInViewDistance
 import de.bixilon.minosoft.util.collections.floats.BufferedArrayFloatList
 
 
diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/registry/DefaultPackets.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/registry/DefaultPackets.kt
index f652d0629..9b8a13dab 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/packets/registry/DefaultPackets.kt
+++ b/src/main/java/de/bixilon/minosoft/protocol/packets/registry/DefaultPackets.kt
@@ -74,6 +74,7 @@ import de.bixilon.minosoft.protocol.packets.s2c.play.block.*
 import de.bixilon.minosoft.protocol.packets.s2c.play.block.chunk.*
 import de.bixilon.minosoft.protocol.packets.s2c.play.block.chunk.batch.ChunkBatchDoneS2CP
 import de.bixilon.minosoft.protocol.packets.s2c.play.block.chunk.batch.ChunkBatchStartS2CP
+import de.bixilon.minosoft.protocol.packets.s2c.play.block.chunk.light.ChunkLightS2CP
 import de.bixilon.minosoft.protocol.packets.s2c.play.border.*
 import de.bixilon.minosoft.protocol.packets.s2c.play.bossbar.BossbarS2CF
 import de.bixilon.minosoft.protocol.packets.s2c.play.chat.*
diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/chunk/ChunkS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/chunk/ChunkS2CP.kt
index 24e6b779e..79a18550f 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/chunk/ChunkS2CP.kt
+++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/chunk/ChunkS2CP.kt
@@ -31,6 +31,7 @@ import de.bixilon.minosoft.gui.rendering.util.VecUtil.of
 import de.bixilon.minosoft.gui.rendering.util.vec.vec3.Vec3iUtil.EMPTY
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
 import de.bixilon.minosoft.protocol.packets.s2c.PlayS2CPacket
+import de.bixilon.minosoft.protocol.packets.s2c.play.block.chunk.light.ChunkLightS2CP
 import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition
 import de.bixilon.minosoft.protocol.protocol.ProtocolVersions
 import de.bixilon.minosoft.protocol.protocol.ProtocolVersions.V_14W26A
@@ -47,7 +48,6 @@ import de.bixilon.minosoft.protocol.protocol.ProtocolVersions.V_21W03A
 import de.bixilon.minosoft.protocol.protocol.ProtocolVersions.V_21W37A
 import de.bixilon.minosoft.protocol.protocol.buffers.play.PlayInByteBuffer
 import de.bixilon.minosoft.util.KUtil.toResourceLocation
-import de.bixilon.minosoft.util.chunk.ChunkUtil
 import de.bixilon.minosoft.util.logging.Log
 import de.bixilon.minosoft.util.logging.LogLevels
 import de.bixilon.minosoft.util.logging.LogMessageType
diff --git a/src/main/java/de/bixilon/minosoft/util/chunk/ChunkUtil.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/chunk/ChunkUtil.kt
similarity index 99%
rename from src/main/java/de/bixilon/minosoft/util/chunk/ChunkUtil.kt
rename to src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/chunk/ChunkUtil.kt
index e31c6cd17..758a3d98e 100644
--- a/src/main/java/de/bixilon/minosoft/util/chunk/ChunkUtil.kt
+++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/chunk/ChunkUtil.kt
@@ -11,7 +11,7 @@
  * This software is not affiliated with Mojang AB, the original developer of Minecraft.
  */
 
-package de.bixilon.minosoft.util.chunk
+package de.bixilon.minosoft.protocol.packets.s2c.play.block.chunk
 
 import de.bixilon.kutil.cast.CastUtil.unsafeCast
 import de.bixilon.minosoft.config.StaticConfiguration
@@ -31,6 +31,7 @@ import de.bixilon.minosoft.data.world.container.palette.palettes.BiomePaletteFac
 import de.bixilon.minosoft.data.world.container.palette.palettes.BlockStatePaletteFactory
 import de.bixilon.minosoft.data.world.positions.ChunkPosition
 import de.bixilon.minosoft.data.world.positions.SectionHeight
+import de.bixilon.minosoft.protocol.packets.s2c.play.block.chunk.light.LightUtil
 import de.bixilon.minosoft.protocol.protocol.ProtocolDefinition
 import de.bixilon.minosoft.protocol.protocol.ProtocolVersions.V_14W26A
 import de.bixilon.minosoft.protocol.protocol.ProtocolVersions.V_15W35A
diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/chunk/ChunksS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/chunk/ChunksS2CP.kt
index 622db231b..a25f5b3a3 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/chunk/ChunksS2CP.kt
+++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/chunk/ChunksS2CP.kt
@@ -19,7 +19,6 @@ import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
 import de.bixilon.minosoft.protocol.packets.s2c.PlayS2CPacket
 import de.bixilon.minosoft.protocol.protocol.ProtocolVersions
 import de.bixilon.minosoft.protocol.protocol.buffers.play.PlayInByteBuffer
-import de.bixilon.minosoft.util.chunk.ChunkUtil
 import de.bixilon.minosoft.util.logging.Log
 import de.bixilon.minosoft.util.logging.LogLevels
 import de.bixilon.minosoft.util.logging.LogMessageType
diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/chunk/ChunkLightS2CP.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/chunk/light/ChunkLightS2CP.kt
similarity index 96%
rename from src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/chunk/ChunkLightS2CP.kt
rename to src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/chunk/light/ChunkLightS2CP.kt
index d734ac900..e809633f5 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/chunk/ChunkLightS2CP.kt
+++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/chunk/light/ChunkLightS2CP.kt
@@ -10,7 +10,7 @@
  *
  * This software is not affiliated with Mojang AB, the original developer of Minecraft.
  */
-package de.bixilon.minosoft.protocol.packets.s2c.play.block.chunk
+package de.bixilon.minosoft.protocol.packets.s2c.play.block.chunk.light
 
 
 import de.bixilon.kotlinglm.vec2.Vec2i
@@ -20,9 +20,9 @@ import de.bixilon.minosoft.protocol.network.connection.Connection
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
 import de.bixilon.minosoft.protocol.packets.registry.PacketExtraHandler
 import de.bixilon.minosoft.protocol.packets.s2c.PlayS2CPacket
+import de.bixilon.minosoft.protocol.packets.s2c.play.block.chunk.light.LightUtil.readLightPacket
 import de.bixilon.minosoft.protocol.protocol.ProtocolVersions
 import de.bixilon.minosoft.protocol.protocol.buffers.play.PlayInByteBuffer
-import de.bixilon.minosoft.util.chunk.LightUtil.readLightPacket
 import de.bixilon.minosoft.util.logging.Log
 import de.bixilon.minosoft.util.logging.LogLevels
 import de.bixilon.minosoft.util.logging.LogMessageType
diff --git a/src/main/java/de/bixilon/minosoft/util/chunk/LightUtil.kt b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/chunk/light/LightUtil.kt
similarity index 98%
rename from src/main/java/de/bixilon/minosoft/util/chunk/LightUtil.kt
rename to src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/chunk/light/LightUtil.kt
index 69b0fb3ea..c04cdc197 100644
--- a/src/main/java/de/bixilon/minosoft/util/chunk/LightUtil.kt
+++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/block/chunk/light/LightUtil.kt
@@ -11,7 +11,7 @@
  * This software is not affiliated with Mojang AB, the original developer of Minecraft.
  */
 
-package de.bixilon.minosoft.util.chunk
+package de.bixilon.minosoft.protocol.packets.s2c.play.block.chunk.light
 
 import de.bixilon.minosoft.data.registries.dimension.DimensionProperties
 import de.bixilon.minosoft.data.world.chunk.chunk.ChunkPrototype