diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/Ext.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/Ext.kt
index 9260c45d..0b8b9520 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/Ext.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/Ext.kt
@@ -7,7 +7,6 @@ import com.google.gson.TypeAdapter
 import com.google.gson.TypeAdapterFactory
 import com.google.gson.reflect.TypeToken
 import com.google.gson.stream.JsonReader
-import ru.dbotthepony.kstarbound.api.IStarboundFile
 import ru.dbotthepony.kstarbound.util.KOptional
 import java.util.Arrays
 import java.util.concurrent.Callable
diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/RecipeRegistry.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/RecipeRegistry.kt
index 114f3e14..2cc74fe7 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/RecipeRegistry.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/RecipeRegistry.kt
@@ -4,19 +4,12 @@ import com.google.gson.JsonElement
 import it.unimi.dsi.fastutil.objects.Object2ObjectFunction
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap
 import org.apache.logging.log4j.LogManager
-import ru.dbotthepony.kstarbound.api.IStarboundFile
 import ru.dbotthepony.kstarbound.defs.player.RecipeDefinition
-import ru.dbotthepony.kstarbound.util.KOptional
-import ru.dbotthepony.kstarbound.util.ParallelPerform
 import java.util.*
 import java.util.concurrent.ConcurrentLinkedQueue
 import java.util.concurrent.ExecutorService
-import java.util.concurrent.ForkJoinPool
-import java.util.concurrent.ForkJoinTask
 import java.util.concurrent.Future
-import java.util.concurrent.locks.ReentrantLock
 import kotlin.collections.ArrayList
-import kotlin.concurrent.withLock
 
 object RecipeRegistry {
 	private val LOGGER = LogManager.getLogger()
diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/Registries.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/Registries.kt
index e1254b76..b40b502b 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/Registries.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/Registries.kt
@@ -5,7 +5,6 @@ import com.google.gson.JsonObject
 import com.google.gson.internal.bind.JsonTreeReader
 import com.google.gson.stream.JsonReader
 import org.apache.logging.log4j.LogManager
-import ru.dbotthepony.kstarbound.api.IStarboundFile
 import ru.dbotthepony.kstarbound.defs.Json2Function
 import ru.dbotthepony.kstarbound.defs.JsonFunction
 import ru.dbotthepony.kstarbound.defs.Species
@@ -36,8 +35,6 @@ import ru.dbotthepony.kstarbound.defs.tile.MaterialModifier
 import ru.dbotthepony.kstarbound.defs.tile.TileDefinition
 import ru.dbotthepony.kstarbound.util.AssetPathStack
 import java.util.concurrent.ExecutorService
-import java.util.concurrent.ForkJoinPool
-import java.util.concurrent.ForkJoinTask
 import java.util.concurrent.Future
 
 object Registries {
diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/Registry.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/Registry.kt
index 5b51a98e..09b015f6 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/Registry.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/Registry.kt
@@ -20,7 +20,6 @@ import it.unimi.dsi.fastutil.objects.Object2ObjectMap
 import it.unimi.dsi.fastutil.objects.Object2ObjectMaps
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap
 import org.apache.logging.log4j.LogManager
-import ru.dbotthepony.kstarbound.api.IStarboundFile
 import ru.dbotthepony.kstarbound.json.consumeNull
 import ru.dbotthepony.kstarbound.util.Either
 import java.lang.reflect.ParameterizedType
diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/Starbound.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/Starbound.kt
index c96e8cfc..c3d513a0 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/Starbound.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/Starbound.kt
@@ -2,14 +2,9 @@ package ru.dbotthepony.kstarbound
 
 import com.github.benmanes.caffeine.cache.Interner
 import com.google.gson.*
-import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap
 import it.unimi.dsi.fastutil.objects.Object2ObjectFunction
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap
 import org.apache.logging.log4j.LogManager
-import ru.dbotthepony.kstarbound.api.ISBFileLocator
-import ru.dbotthepony.kstarbound.api.IStarboundFile
-import ru.dbotthepony.kstarbound.api.NonExistingFile
-import ru.dbotthepony.kstarbound.api.PhysicalFile
 import ru.dbotthepony.kstarbound.defs.*
 import ru.dbotthepony.kstarbound.defs.image.Image
 import ru.dbotthepony.kstarbound.defs.image.SpriteReference
@@ -18,13 +13,8 @@ import ru.dbotthepony.kstarbound.defs.item.InventoryIcon
 import ru.dbotthepony.kstarbound.defs.item.TreasurePoolDefinition
 import ru.dbotthepony.kstarbound.defs.`object`.ObjectDefinition
 import ru.dbotthepony.kstarbound.defs.`object`.ObjectOrientation
-import ru.dbotthepony.kstarbound.defs.tile.LiquidDefinition
 import ru.dbotthepony.kstarbound.defs.player.BlueprintLearnList
-import ru.dbotthepony.kstarbound.defs.player.PlayerDefinition
-import ru.dbotthepony.kstarbound.util.JsonArrayCollector
 import ru.dbotthepony.kstarbound.io.*
-import ru.dbotthepony.kstarbound.json.AABBTypeAdapter
-import ru.dbotthepony.kstarbound.json.AABBiTypeAdapter
 import ru.dbotthepony.kstarbound.json.ColorTypeAdapter
 import ru.dbotthepony.kstarbound.json.EitherTypeAdapter
 import ru.dbotthepony.kstarbound.json.FastutilTypeAdapterFactory
@@ -47,16 +37,10 @@ import ru.dbotthepony.kstarbound.json.factory.ArrayListAdapterFactory
 import ru.dbotthepony.kstarbound.json.factory.ImmutableCollectionAdapterFactory
 import ru.dbotthepony.kstarbound.json.factory.PairAdapterFactory
 import ru.dbotthepony.kstarbound.math.*
-import ru.dbotthepony.kstarbound.util.ITimeSource
 import ru.dbotthepony.kstarbound.util.ItemStack
-import ru.dbotthepony.kstarbound.util.JVMTimeSource
-import ru.dbotthepony.kstarbound.util.AssetPathStack
 import ru.dbotthepony.kstarbound.util.SBPattern
 import ru.dbotthepony.kstarbound.util.HashTableInterner
 import ru.dbotthepony.kstarbound.util.MailboxExecutorService
-import ru.dbotthepony.kstarbound.util.WriteOnce
-import ru.dbotthepony.kstarbound.util.filterNotNull
-import ru.dbotthepony.kstarbound.util.set
 import ru.dbotthepony.kstarbound.util.traverseJsonPath
 import ru.dbotthepony.kstarbound.world.physics.Poly
 import java.io.*
@@ -65,7 +49,6 @@ import java.text.DateFormat
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.Executors
 import java.util.concurrent.ForkJoinPool
-import java.util.concurrent.ForkJoinTask
 import java.util.concurrent.Future
 import java.util.concurrent.locks.LockSupport
 import java.util.function.BiConsumer
@@ -75,7 +58,6 @@ import java.util.function.Supplier
 import java.util.stream.Collector
 import kotlin.NoSuchElementException
 import kotlin.collections.ArrayList
-import kotlin.random.Random
 
 object Starbound : ISBFileLocator {
 	const val ENGINE_VERSION = "0.0.1"
diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/api/IStarboundFileSystem.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/StarboundFileSystem.kt
similarity index 98%
rename from src/main/kotlin/ru/dbotthepony/kstarbound/api/IStarboundFileSystem.kt
rename to src/main/kotlin/ru/dbotthepony/kstarbound/StarboundFileSystem.kt
index cd5e393e..37a5157a 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/api/IStarboundFileSystem.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/StarboundFileSystem.kt
@@ -1,9 +1,8 @@
-package ru.dbotthepony.kstarbound.api
+package ru.dbotthepony.kstarbound
 
 import com.google.common.collect.ImmutableMap
 import com.google.gson.stream.JsonReader
 import ru.dbotthepony.kstarbound.io.StarboundPak
-import ru.dbotthepony.kstarbound.stream
 import java.io.BufferedInputStream
 import java.io.File
 import java.io.FileNotFoundException
diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/image/Image.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/image/Image.kt
index 47105860..202b079e 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/defs/image/Image.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/defs/image/Image.kt
@@ -26,7 +26,7 @@ import org.lwjgl.system.MemoryUtil
 import ru.dbotthepony.kstarbound.world.PIXELS_IN_STARBOUND_UNIT
 import ru.dbotthepony.kstarbound.world.PIXELS_IN_STARBOUND_UNITi
 import ru.dbotthepony.kstarbound.Starbound
-import ru.dbotthepony.kstarbound.api.IStarboundFile
+import ru.dbotthepony.kstarbound.IStarboundFile
 import ru.dbotthepony.kstarbound.client.StarboundClient
 import ru.dbotthepony.kstarbound.client.gl.GLTexture2D
 import ru.dbotthepony.kstarbound.json.consumeNull
diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/io/StarboundPak.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/io/StarboundPak.kt
index a5b7a302..76b89824 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/io/StarboundPak.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/io/StarboundPak.kt
@@ -2,19 +2,16 @@ package ru.dbotthepony.kstarbound.io
 
 import it.unimi.dsi.fastutil.objects.Object2ObjectFunction
 import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap
-import ru.dbotthepony.kstarbound.Starbound
-import ru.dbotthepony.kstarbound.api.IStarboundFile
+import ru.dbotthepony.kstarbound.IStarboundFile
 import ru.dbotthepony.kstarbound.getValue
 import ru.dbotthepony.kstarbound.json.BinaryJsonReader
 import java.io.BufferedInputStream
 import java.io.Closeable
 import java.io.DataInputStream
 import java.io.File
-import java.io.IOError
 import java.io.IOException
 import java.io.InputStream
 import java.io.RandomAccessFile
-import java.lang.ref.Cleaner
 import java.nio.channels.Channels
 import java.util.*