diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/Starbound.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/Starbound.kt
index ce95063a..5d2b848f 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/Starbound.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/Starbound.kt
@@ -29,7 +29,7 @@ import ru.dbotthepony.kstarbound.defs.item.ItemPrototype
 import ru.dbotthepony.kstarbound.defs.item.LegsArmorItemPrototype
 import ru.dbotthepony.kstarbound.defs.item.LiquidItemPrototype
 import ru.dbotthepony.kstarbound.defs.item.MaterialItemPrototype
-import ru.dbotthepony.kstarbound.defs.liquid.LiquidDefinition
+import ru.dbotthepony.kstarbound.defs.tile.LiquidDefinition
 import ru.dbotthepony.kstarbound.defs.parallax.ParallaxPrototype
 import ru.dbotthepony.kstarbound.defs.particle.ParticleDefinition
 import ru.dbotthepony.kstarbound.defs.player.PlayerDefinition
diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/client/ClientChunk.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/client/ClientChunk.kt
index 85f33387..22c27b6d 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/client/ClientChunk.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/client/ClientChunk.kt
@@ -14,7 +14,7 @@ import ru.dbotthepony.kstarbound.client.render.entity.EntityRenderer
 import ru.dbotthepony.kstarbound.client.render.ILayeredRenderer
 import ru.dbotthepony.kstarbound.client.render.GPULightRenderer
 import ru.dbotthepony.kstarbound.client.render.TileLayerList
-import ru.dbotthepony.kstarbound.defs.liquid.LiquidDefinition
+import ru.dbotthepony.kstarbound.defs.tile.LiquidDefinition
 import ru.dbotthepony.kstarbound.world.*
 import ru.dbotthepony.kstarbound.world.entities.Entity
 import ru.dbotthepony.kvector.matrix.Matrix4fStack
diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/liquid/LiquidDefinition.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/tile/LiquidDefinition.kt
similarity index 80%
rename from src/main/kotlin/ru/dbotthepony/kstarbound/defs/liquid/LiquidDefinition.kt
rename to src/main/kotlin/ru/dbotthepony/kstarbound/defs/tile/LiquidDefinition.kt
index c56d172d..bdf9ad27 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/liquid/LiquidDefinition.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/tile/LiquidDefinition.kt
@@ -1,10 +1,7 @@
-package ru.dbotthepony.kstarbound.defs.liquid
+package ru.dbotthepony.kstarbound.defs.tile
 
 import com.google.common.collect.ImmutableList
-import com.google.gson.GsonBuilder
-import ru.dbotthepony.kstarbound.io.json.builder.FactoryAdapter
 import ru.dbotthepony.kstarbound.io.json.builder.JsonFactory
-import ru.dbotthepony.kstarbound.registerTypeAdapter
 import ru.dbotthepony.kvector.vector.Color
 
 @JsonFactory
diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/world/Chunk.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/world/Chunk.kt
index e01fde33..faa11c8c 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/world/Chunk.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/world/Chunk.kt
@@ -4,7 +4,7 @@ import ru.dbotthepony.kbox2d.api.BodyDef
 import ru.dbotthepony.kbox2d.api.FixtureDef
 import ru.dbotthepony.kbox2d.collision.shapes.PolygonShape
 import ru.dbotthepony.kbox2d.dynamics.B2Fixture
-import ru.dbotthepony.kstarbound.defs.liquid.LiquidDefinition
+import ru.dbotthepony.kstarbound.defs.tile.LiquidDefinition
 import ru.dbotthepony.kstarbound.defs.tile.MaterialModifier
 import ru.dbotthepony.kstarbound.defs.tile.TILE_COLOR_VARIANTS
 import ru.dbotthepony.kstarbound.defs.tile.TileDefinition
@@ -15,7 +15,6 @@ import ru.dbotthepony.kstarbound.world.phys.RectTileFlooderDepthFirst
 import ru.dbotthepony.kstarbound.world.phys.RectTileFlooderSizeFirst
 import ru.dbotthepony.kvector.util2d.AABB
 import ru.dbotthepony.kvector.vector.ndouble.Vector2d
-import ru.dbotthepony.kvector.vector.nint.Vector2i
 import java.util.*
 import kotlin.collections.ArrayList
 import kotlin.collections.HashSet