diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/Registries.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/Registries.kt
index a9821113..faa28caf 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/Registries.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/Registries.kt
@@ -39,8 +39,8 @@ import ru.dbotthepony.kstarbound.defs.world.BushVariant
 import ru.dbotthepony.kstarbound.defs.world.GrassVariant
 import ru.dbotthepony.kstarbound.defs.world.TreeVariant
 import ru.dbotthepony.kstarbound.defs.world.BiomeDefinition
-import ru.dbotthepony.kstarbound.defs.world.terrain.TerrainSelectorFactory
-import ru.dbotthepony.kstarbound.defs.world.terrain.TerrainSelectorType
+import ru.dbotthepony.kstarbound.world.terrain.TerrainSelectorFactory
+import ru.dbotthepony.kstarbound.world.terrain.TerrainSelectorType
 import ru.dbotthepony.kstarbound.util.AssetPathStack
 import java.util.*
 import java.util.concurrent.CompletableFuture
diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/Starbound.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/Starbound.kt
index 65c76188..77541220 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/Starbound.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/Starbound.kt
@@ -40,7 +40,7 @@ import ru.dbotthepony.kstarbound.defs.world.VisitableWorldParametersType
 import ru.dbotthepony.kstarbound.defs.world.BiomePlaceables
 import ru.dbotthepony.kstarbound.defs.world.BiomePlacementDistributionType
 import ru.dbotthepony.kstarbound.defs.world.BiomePlacementItemType
-import ru.dbotthepony.kstarbound.defs.world.terrain.TerrainSelectorType
+import ru.dbotthepony.kstarbound.world.terrain.TerrainSelectorType
 import ru.dbotthepony.kstarbound.io.*
 import ru.dbotthepony.kstarbound.json.factory.MapsTypeAdapterFactory
 import ru.dbotthepony.kstarbound.json.InternedJsonElementAdapter
diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/terrain/TerrainSelectorParameters.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/TerrainSelectorParameters.kt
similarity index 93%
rename from src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/terrain/TerrainSelectorParameters.kt
rename to src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/TerrainSelectorParameters.kt
index f807c761..b93a76a2 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/terrain/TerrainSelectorParameters.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/TerrainSelectorParameters.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.kstarbound.defs.world.terrain
+package ru.dbotthepony.kstarbound.defs.world
 
 import ru.dbotthepony.kstarbound.json.builder.JsonFactory
 import java.util.random.RandomGenerator
diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/WorldLayout.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/WorldLayout.kt
index 6afff605..06ae1d07 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/WorldLayout.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/WorldLayout.kt
@@ -18,9 +18,8 @@ import ru.dbotthepony.kommons.vector.Vector2i
 import ru.dbotthepony.kstarbound.GlobalDefaults
 import ru.dbotthepony.kstarbound.Registries
 import ru.dbotthepony.kstarbound.Starbound
-import ru.dbotthepony.kstarbound.defs.world.terrain.AbstractTerrainSelector
-import ru.dbotthepony.kstarbound.defs.world.terrain.TerrainSelectorParameters
-import ru.dbotthepony.kstarbound.defs.world.terrain.createNamedTerrainSelector
+import ru.dbotthepony.kstarbound.world.terrain.AbstractTerrainSelector
+import ru.dbotthepony.kstarbound.world.terrain.createNamedTerrainSelector
 import ru.dbotthepony.kstarbound.json.builder.JsonFactory
 import ru.dbotthepony.kstarbound.util.ListInterner
 import ru.dbotthepony.kstarbound.util.random.AbstractPerlinNoise
diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/terrain/AbstractTerrainSelector.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/world/terrain/AbstractTerrainSelector.kt
similarity index 91%
rename from src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/terrain/AbstractTerrainSelector.kt
rename to src/main/kotlin/ru/dbotthepony/kstarbound/world/terrain/AbstractTerrainSelector.kt
index 6c60d5f7..41d4f8df 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/terrain/AbstractTerrainSelector.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/world/terrain/AbstractTerrainSelector.kt
@@ -1,8 +1,9 @@
-package ru.dbotthepony.kstarbound.defs.world.terrain
+package ru.dbotthepony.kstarbound.world.terrain
 
 import com.google.gson.JsonObject
 import ru.dbotthepony.kommons.gson.set
 import ru.dbotthepony.kstarbound.Starbound
+import ru.dbotthepony.kstarbound.defs.world.TerrainSelectorParameters
 
 abstract class AbstractTerrainSelector<D : Any>(val name: String, val config: D, val parameters: TerrainSelectorParameters) {
 	// Returns a float signifying the "solid-ness" of a block, >= 0.0 should be
diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/terrain/ConstantTerrainSelector.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/world/terrain/ConstantTerrainSelector.kt
similarity index 78%
rename from src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/terrain/ConstantTerrainSelector.kt
rename to src/main/kotlin/ru/dbotthepony/kstarbound/world/terrain/ConstantTerrainSelector.kt
index 6c5439eb..6b42e4d3 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/terrain/ConstantTerrainSelector.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/world/terrain/ConstantTerrainSelector.kt
@@ -1,5 +1,6 @@
-package ru.dbotthepony.kstarbound.defs.world.terrain
+package ru.dbotthepony.kstarbound.world.terrain
 
+import ru.dbotthepony.kstarbound.defs.world.TerrainSelectorParameters
 import ru.dbotthepony.kstarbound.json.builder.JsonFactory
 
 class ConstantTerrainSelector(name: String, data: Data, parameters: TerrainSelectorParameters) : AbstractTerrainSelector<ConstantTerrainSelector.Data>(name, data, parameters) {
diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/terrain/DisplacementTerrainSelector.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/world/terrain/DisplacementTerrainSelector.kt
similarity index 96%
rename from src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/terrain/DisplacementTerrainSelector.kt
rename to src/main/kotlin/ru/dbotthepony/kstarbound/world/terrain/DisplacementTerrainSelector.kt
index 608b6ff0..2a80c37e 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/terrain/DisplacementTerrainSelector.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/world/terrain/DisplacementTerrainSelector.kt
@@ -1,8 +1,9 @@
-package ru.dbotthepony.kstarbound.defs.world.terrain
+package ru.dbotthepony.kstarbound.world.terrain
 
 import com.google.gson.JsonObject
 import ru.dbotthepony.kommons.vector.Vector2d
 import ru.dbotthepony.kstarbound.defs.PerlinNoiseParameters
+import ru.dbotthepony.kstarbound.defs.world.TerrainSelectorParameters
 import ru.dbotthepony.kstarbound.json.builder.JsonFactory
 import ru.dbotthepony.kstarbound.util.random.AbstractPerlinNoise
 import kotlin.math.roundToInt
diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/terrain/TerrainSelectorFactory.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/world/terrain/TerrainSelectorFactory.kt
similarity index 70%
rename from src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/terrain/TerrainSelectorFactory.kt
rename to src/main/kotlin/ru/dbotthepony/kstarbound/world/terrain/TerrainSelectorFactory.kt
index 54395857..efa82cb1 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/terrain/TerrainSelectorFactory.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/world/terrain/TerrainSelectorFactory.kt
@@ -1,4 +1,6 @@
-package ru.dbotthepony.kstarbound.defs.world.terrain
+package ru.dbotthepony.kstarbound.world.terrain
+
+import ru.dbotthepony.kstarbound.defs.world.TerrainSelectorParameters
 
 class TerrainSelectorFactory<D : Any, out T : AbstractTerrainSelector<D>>(val name: String, private val data: D, private val factory: (String, D, TerrainSelectorParameters) -> T) {
 	fun create(parameters: TerrainSelectorParameters): T {
diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/terrain/TerrainSelectorType.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/world/terrain/TerrainSelectorType.kt
similarity index 95%
rename from src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/terrain/TerrainSelectorType.kt
rename to src/main/kotlin/ru/dbotthepony/kstarbound/world/terrain/TerrainSelectorType.kt
index 487c38b7..d5ff7a33 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/world/terrain/TerrainSelectorType.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/world/terrain/TerrainSelectorType.kt
@@ -1,4 +1,4 @@
-package ru.dbotthepony.kstarbound.defs.world.terrain
+package ru.dbotthepony.kstarbound.world.terrain
 
 import com.google.gson.Gson
 import com.google.gson.JsonObject
@@ -12,6 +12,7 @@ import ru.dbotthepony.kommons.gson.consumeNull
 import ru.dbotthepony.kommons.gson.value
 import ru.dbotthepony.kstarbound.Registries
 import ru.dbotthepony.kstarbound.Starbound
+import ru.dbotthepony.kstarbound.defs.world.TerrainSelectorParameters
 
 fun createNamedTerrainSelector(name: String, parameters: TerrainSelectorParameters): AbstractTerrainSelector<*> {
 	return Registries.terrainSelectors.getOrThrow(name).value.create(parameters)