diff --git a/src/net/torvald/spriteassembler/AssembleSheetPixmap.kt b/src/net/torvald/spriteassembler/AssembleSheetPixmap.kt
index b201a749a..73a2ea1d1 100644
--- a/src/net/torvald/spriteassembler/AssembleSheetPixmap.kt
+++ b/src/net/torvald/spriteassembler/AssembleSheetPixmap.kt
@@ -6,9 +6,9 @@ import com.badlogic.gdx.utils.GdxRuntimeException
 import net.torvald.terrarum.App.printdbg
 import net.torvald.terrarum.linearSearch
 import net.torvald.terrarum.serialise.Common
-import net.torvald.terrarum.tvda.ByteArray64InputStream
-import net.torvald.terrarum.tvda.ByteArray64Reader
-import net.torvald.terrarum.tvda.SimpleFileSystem
+import net.torvald.terrarum.savegame.ByteArray64InputStream
+import net.torvald.terrarum.savegame.ByteArray64Reader
+import net.torvald.terrarum.savegame.SimpleFileSystem
 import java.io.InputStream
 import java.util.*
 import kotlin.collections.ArrayList
diff --git a/src/net/torvald/terrarum/App.java b/src/net/torvald/terrarum/App.java
index 46e99096e..23b457864 100644
--- a/src/net/torvald/terrarum/App.java
+++ b/src/net/torvald/terrarum/App.java
@@ -31,7 +31,7 @@ import net.torvald.terrarum.modulebasegame.IngameRenderer;
 import net.torvald.terrarum.modulebasegame.TerrarumIngame;
 import net.torvald.terrarum.modulebasegame.ui.ItemSlotImageFactory;
 import net.torvald.terrarum.serialise.WriteConfig;
-import net.torvald.terrarum.tvda.DiskSkimmer;
+import net.torvald.terrarum.savegame.DiskSkimmer;
 import net.torvald.terrarum.ui.Toolkit;
 import net.torvald.terrarum.utils.JsonFetcher;
 import net.torvald.terrarum.worlddrawer.CreateTileAtlas;
diff --git a/src/net/torvald/terrarum/IngameInstance.kt b/src/net/torvald/terrarum/IngameInstance.kt
index 961279a1b..c57863beb 100644
--- a/src/net/torvald/terrarum/IngameInstance.kt
+++ b/src/net/torvald/terrarum/IngameInstance.kt
@@ -16,7 +16,7 @@ import net.torvald.terrarum.modulebasegame.gameactors.IngamePlayer
 import net.torvald.terrarum.modulebasegame.ui.Notification
 import net.torvald.terrarum.modulebasegame.ui.UITooltip
 import net.torvald.terrarum.realestate.LandUtil
-import net.torvald.terrarum.tvda.VirtualDisk
+import net.torvald.terrarum.savegame.VirtualDisk
 import net.torvald.terrarum.ui.ConsoleWindow
 import net.torvald.util.SortedArrayList
 import org.khelekore.prtree.*
diff --git a/src/net/torvald/terrarum/Terrarum.kt b/src/net/torvald/terrarum/Terrarum.kt
index 4a2b84218..0b78ad125 100644
--- a/src/net/torvald/terrarum/Terrarum.kt
+++ b/src/net/torvald/terrarum/Terrarum.kt
@@ -26,8 +26,8 @@ import net.torvald.terrarum.gameworld.fmod
 import net.torvald.terrarum.itemproperties.ItemCodex
 import net.torvald.terrarum.itemproperties.MaterialCodex
 import net.torvald.terrarum.serialise.Common
-import net.torvald.terrarum.tvda.ByteArray64Reader
-import net.torvald.terrarum.tvda.DiskSkimmer
+import net.torvald.terrarum.savegame.ByteArray64Reader
+import net.torvald.terrarum.savegame.DiskSkimmer
 import net.torvald.terrarum.ui.UICanvas
 import net.torvald.terrarum.worlddrawer.WorldCamera
 import net.torvald.terrarumsansbitmap.gdx.GameFontBase
diff --git a/src/net/torvald/terrarum/debuggerapp/SavegameCracker.kt b/src/net/torvald/terrarum/debuggerapp/SavegameCracker.kt
index b28524f79..c71cd7676 100644
--- a/src/net/torvald/terrarum/debuggerapp/SavegameCracker.kt
+++ b/src/net/torvald/terrarum/debuggerapp/SavegameCracker.kt
@@ -2,10 +2,10 @@ package net.torvald.terrarum.debuggerapp
 
 import net.torvald.terrarum.TerrarumAppConfiguration
 import net.torvald.terrarum.serialise.Common
-import net.torvald.terrarum.tvda.EntryFile
-import net.torvald.terrarum.tvda.VDUtil
-import net.torvald.terrarum.tvda.VirtualDisk
-import net.torvald.terrarum.tvda.diskIDtoReadableFilename
+import net.torvald.terrarum.savegame.EntryFile
+import net.torvald.terrarum.savegame.VDUtil
+import net.torvald.terrarum.savegame.VirtualDisk
+import net.torvald.terrarum.savegame.diskIDtoReadableFilename
 import java.io.File
 import java.io.PrintStream
 import java.nio.charset.Charset
diff --git a/src/net/torvald/terrarum/gameactors/Actor.kt b/src/net/torvald/terrarum/gameactors/Actor.kt
index 693e2b86a..ea4c0340a 100644
--- a/src/net/torvald/terrarum/gameactors/Actor.kt
+++ b/src/net/torvald/terrarum/gameactors/Actor.kt
@@ -9,8 +9,8 @@ import net.torvald.terrarum.Terrarum
 import net.torvald.terrarum.modulebasegame.gameactors.IngamePlayer
 import net.torvald.terrarum.modulebasegame.gameactors.Pocketed
 import net.torvald.terrarum.serialise.Common
-import net.torvald.terrarum.tvda.ByteArray64Reader
-import net.torvald.terrarum.tvda.toBigEndian
+import net.torvald.terrarum.savegame.ByteArray64Reader
+import net.torvald.terrarum.savegame.toBigEndian
 import net.torvald.terrarum.utils.PasswordBase32
 
 
diff --git a/src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt b/src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt
index 91e88da37..915d5a8a1 100644
--- a/src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt
+++ b/src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt
@@ -36,8 +36,8 @@ import net.torvald.terrarum.serialise.Common
 import net.torvald.terrarum.serialise.LoadSavegame
 import net.torvald.terrarum.serialise.ReadActor
 import net.torvald.terrarum.serialise.WriteSavegame
-import net.torvald.terrarum.tvda.DiskSkimmer
-import net.torvald.terrarum.tvda.VDUtil
+import net.torvald.terrarum.savegame.DiskSkimmer
+import net.torvald.terrarum.savegame.VDUtil
 import net.torvald.terrarum.ui.Toolkit
 import net.torvald.terrarum.ui.UIAutosaveNotifier
 import net.torvald.terrarum.ui.UICanvas
diff --git a/src/net/torvald/terrarum/modulebasegame/console/ReaderTest.kt b/src/net/torvald/terrarum/modulebasegame/console/ReaderTest.kt
index 89a0c022c..de9e4dd0a 100644
--- a/src/net/torvald/terrarum/modulebasegame/console/ReaderTest.kt
+++ b/src/net/torvald/terrarum/modulebasegame/console/ReaderTest.kt
@@ -2,8 +2,8 @@ package net.torvald.terrarum.modulebasegame.console
 
 import net.torvald.terrarum.console.ConsoleCommand
 import net.torvald.terrarum.console.Echo
-import net.torvald.terrarum.tvda.ByteArray64Reader
-import net.torvald.terrarum.tvda.ByteArray64Writer
+import net.torvald.terrarum.savegame.ByteArray64Reader
+import net.torvald.terrarum.savegame.ByteArray64Writer
 import net.torvald.terrarum.serialise.Common
 import net.torvald.terrarum.serialise.toUint
 import java.io.File
diff --git a/src/net/torvald/terrarum/modulebasegame/console/Save.kt b/src/net/torvald/terrarum/modulebasegame/console/Save.kt
index ae158ec0d..20e06ffd0 100644
--- a/src/net/torvald/terrarum/modulebasegame/console/Save.kt
+++ b/src/net/torvald/terrarum/modulebasegame/console/Save.kt
@@ -7,7 +7,7 @@ import net.torvald.terrarum.console.Echo
 import net.torvald.terrarum.modulebasegame.TerrarumIngame
 import net.torvald.terrarum.serialise.Common
 import net.torvald.terrarum.serialise.WriteSavegame
-import net.torvald.terrarum.tvda.VDUtil
+import net.torvald.terrarum.savegame.VDUtil
 import java.io.File
 import java.io.IOException
 
diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/IngamePlayer.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/IngamePlayer.kt
index 09d1f7a97..56c72a06c 100644
--- a/src/net/torvald/terrarum/modulebasegame/gameactors/IngamePlayer.kt
+++ b/src/net/torvald/terrarum/modulebasegame/gameactors/IngamePlayer.kt
@@ -8,7 +8,7 @@ import net.torvald.spriteassembler.AssembleSheetPixmap
 import net.torvald.terrarum.App
 import net.torvald.terrarum.Terrarum
 import net.torvald.terrarum.gameactors.AVKey
-import net.torvald.terrarum.tvda.SimpleFileSystem
+import net.torvald.terrarum.savegame.SimpleFileSystem
 import net.torvald.terrarum.utils.PlayerLastStatus
 import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
 import java.util.*
diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UILoadDemoSavefiles.kt b/src/net/torvald/terrarum/modulebasegame/ui/UILoadDemoSavefiles.kt
index ee1c88860..105264a37 100644
--- a/src/net/torvald/terrarum/modulebasegame/ui/UILoadDemoSavefiles.kt
+++ b/src/net/torvald/terrarum/modulebasegame/ui/UILoadDemoSavefiles.kt
@@ -21,10 +21,10 @@ import net.torvald.terrarum.modulebasegame.ui.UIInventoryFull.Companion.CELL_COL
 import net.torvald.terrarum.serialise.Common
 import net.torvald.terrarum.serialise.LoadSavegame
 import net.torvald.terrarum.serialise.ReadPlayer
-import net.torvald.terrarum.tvda.ByteArray64InputStream
-import net.torvald.terrarum.tvda.ByteArray64Reader
-import net.torvald.terrarum.tvda.DiskSkimmer
-import net.torvald.terrarum.tvda.EntryFile
+import net.torvald.terrarum.savegame.ByteArray64InputStream
+import net.torvald.terrarum.savegame.ByteArray64Reader
+import net.torvald.terrarum.savegame.DiskSkimmer
+import net.torvald.terrarum.savegame.EntryFile
 import net.torvald.terrarum.ui.*
 import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
 import java.time.Instant
diff --git a/src/net/torvald/terrarum/tvda/ByteArray64.kt b/src/net/torvald/terrarum/savegame/ByteArray64.kt
similarity index 99%
rename from src/net/torvald/terrarum/tvda/ByteArray64.kt
rename to src/net/torvald/terrarum/savegame/ByteArray64.kt
index 56d2bc48d..2daa79b75 100644
--- a/src/net/torvald/terrarum/tvda/ByteArray64.kt
+++ b/src/net/torvald/terrarum/savegame/ByteArray64.kt
@@ -1,4 +1,4 @@
-package net.torvald.terrarum.tvda
+package net.torvald.terrarum.savegame
 
 import java.io.*
 import java.nio.channels.ClosedChannelException
diff --git a/src/net/torvald/terrarum/tvda/DiskSkimmer.kt b/src/net/torvald/terrarum/savegame/DiskSkimmer.kt
similarity index 99%
rename from src/net/torvald/terrarum/tvda/DiskSkimmer.kt
rename to src/net/torvald/terrarum/savegame/DiskSkimmer.kt
index 80f89e226..f1b769f66 100644
--- a/src/net/torvald/terrarum/tvda/DiskSkimmer.kt
+++ b/src/net/torvald/terrarum/savegame/DiskSkimmer.kt
@@ -1,4 +1,4 @@
-package net.torvald.terrarum.tvda
+package net.torvald.terrarum.savegame
 
 import java.io.*
 import java.nio.charset.Charset
diff --git a/src/net/torvald/terrarum/tvda/DiskSkimmerTest.kt b/src/net/torvald/terrarum/savegame/DiskSkimmerTest.kt
similarity index 96%
rename from src/net/torvald/terrarum/tvda/DiskSkimmerTest.kt
rename to src/net/torvald/terrarum/savegame/DiskSkimmerTest.kt
index b0fd135b5..6266c843e 100644
--- a/src/net/torvald/terrarum/tvda/DiskSkimmerTest.kt
+++ b/src/net/torvald/terrarum/savegame/DiskSkimmerTest.kt
@@ -1,4 +1,4 @@
-package net.torvald.terrarum.tvda
+package net.torvald.terrarum.savegame
 
 import java.io.File
 import java.nio.file.Files
diff --git a/src/net/torvald/terrarum/tvda/SimpleFileSystem.kt b/src/net/torvald/terrarum/savegame/SimpleFileSystem.kt
similarity index 86%
rename from src/net/torvald/terrarum/tvda/SimpleFileSystem.kt
rename to src/net/torvald/terrarum/savegame/SimpleFileSystem.kt
index 0755a82c4..7cab86a61 100644
--- a/src/net/torvald/terrarum/tvda/SimpleFileSystem.kt
+++ b/src/net/torvald/terrarum/savegame/SimpleFileSystem.kt
@@ -1,4 +1,4 @@
-package net.torvald.terrarum.tvda
+package net.torvald.terrarum.savegame
 
 import java.nio.charset.Charset
 
diff --git a/src/net/torvald/terrarum/tvda/VDUtil.kt b/src/net/torvald/terrarum/savegame/VDUtil.kt
similarity index 97%
rename from src/net/torvald/terrarum/tvda/VDUtil.kt
rename to src/net/torvald/terrarum/savegame/VDUtil.kt
index 75fe3bb14..045f41eb7 100644
--- a/src/net/torvald/terrarum/tvda/VDUtil.kt
+++ b/src/net/torvald/terrarum/savegame/VDUtil.kt
@@ -1,4 +1,4 @@
-package net.torvald.terrarum.tvda
+package net.torvald.terrarum.savegame
 
 import java.io.*
 import java.nio.charset.Charset
@@ -16,12 +16,12 @@ import kotlin.experimental.and
  */
 object VDUtil {
 
-    fun File.writeBytes64(array: net.torvald.terrarum.tvda.ByteArray64) {
+    fun File.writeBytes64(array: net.torvald.terrarum.savegame.ByteArray64) {
         array.writeToFile(this)
     }
 
-    fun File.readBytes64(): net.torvald.terrarum.tvda.ByteArray64 {
-        val inbytes = net.torvald.terrarum.tvda.ByteArray64(this.length())
+    fun File.readBytes64(): net.torvald.terrarum.savegame.ByteArray64 {
+        val inbytes = net.torvald.terrarum.savegame.ByteArray64(this.length())
         val inputStream = BufferedInputStream(FileInputStream(this))
         var readInt = inputStream.read()
         var readInCounter = 0L
@@ -100,7 +100,7 @@ object VDUtil {
             }
 
             if (DEBUG_PRINT_READ) {
-                println("[tvda.VDUtil] == Entry deserialise debugprint for entry ID $entryID (child of $entryParentID)")
+                println("[savegame.VDUtil] == Entry deserialise debugprint for entry ID $entryID (child of $entryParentID)")
                 println("Entry type flag: ${entryTypeFlag and 127}${if (entryTypeFlag < 0) "*" else ""}")
                 println("Entry raw contents bytes: (len: ${entryData.size})")
                 entryData.forEachIndexed { i, it ->
@@ -158,7 +158,7 @@ object VDUtil {
                         (diskEntry.contents as? EntryDirectory)?.forEach {
                             println("entry: ${it.toHex()}")
                         }
-                        println("[tvda.VDUtil] bytes to calculate crc against:")
+                        println("[savegame.VDUtil] bytes to calculate crc against:")
                         testbytes.forEachIndexed { i, it ->
                             if (i % 4 == 0L) print(" ")
                             print(it.toInt().toHex().substring(6))
@@ -175,7 +175,7 @@ object VDUtil {
 
                     if (calculatedCRC != entryCRC) {
 
-                        println("[tvda.VDUtil] CRC failed; entry info:\n$diskEntry")
+                        println("[savegame.VDUtil] CRC failed; entry info:\n$diskEntry")
 
                         if (crcWarnLevel == Level.SEVERE)
                             throw IOException(crcMsg)
@@ -189,7 +189,7 @@ object VDUtil {
             }
             else {
                 if (DEBUG_PRINT_READ) {
-                    println("[tvda.VDUtil] Discarding entry ${entryID.toHex()} (raw type flag: $entryTypeFlag)")
+                    println("[savegame.VDUtil] Discarding entry ${entryID.toHex()} (raw type flag: $entryTypeFlag)")
                 }
             }
         }
diff --git a/src/net/torvald/terrarum/tvda/VirtualDisk.kt b/src/net/torvald/terrarum/savegame/VirtualDisk.kt
similarity index 99%
rename from src/net/torvald/terrarum/tvda/VirtualDisk.kt
rename to src/net/torvald/terrarum/savegame/VirtualDisk.kt
index 15c0b0b79..f1e51800c 100644
--- a/src/net/torvald/terrarum/tvda/VirtualDisk.kt
+++ b/src/net/torvald/terrarum/savegame/VirtualDisk.kt
@@ -1,4 +1,4 @@
-package net.torvald.terrarum.tvda
+package net.torvald.terrarum.savegame
 
 import java.io.IOException
 import java.nio.charset.Charset
diff --git a/src/net/torvald/terrarum/tvda/finder/Popups.kt b/src/net/torvald/terrarum/savegame/finder/Popups.kt
similarity index 98%
rename from src/net/torvald/terrarum/tvda/finder/Popups.kt
rename to src/net/torvald/terrarum/savegame/finder/Popups.kt
index 7f834814a..2c63a20aa 100644
--- a/src/net/torvald/terrarum/tvda/finder/Popups.kt
+++ b/src/net/torvald/terrarum/savegame/finder/Popups.kt
@@ -1,4 +1,4 @@
-package net.torvald.terrarum.tvda.finder
+package net.torvald.terrarum.savegame.finder
 
 import java.awt.BorderLayout
 import java.awt.GridLayout
diff --git a/src/net/torvald/terrarum/tvda/finder/VirtualDiskCracker.kt b/src/net/torvald/terrarum/savegame/finder/VirtualDiskCracker.kt
similarity index 99%
rename from src/net/torvald/terrarum/tvda/finder/VirtualDiskCracker.kt
rename to src/net/torvald/terrarum/savegame/finder/VirtualDiskCracker.kt
index d7a190536..ec956486b 100644
--- a/src/net/torvald/terrarum/tvda/finder/VirtualDiskCracker.kt
+++ b/src/net/torvald/terrarum/savegame/finder/VirtualDiskCracker.kt
@@ -1,6 +1,6 @@
-package net.torvald.terrarum.tvda.finder
+package net.torvald.terrarum.savegame.finder
 
-import net.torvald.terrarum.tvda.*
+import net.torvald.terrarum.savegame.*
 import java.awt.BorderLayout
 import java.awt.Dimension
 import java.awt.event.KeyEvent
diff --git a/src/net/torvald/terrarum/serialise/Common.kt b/src/net/torvald/terrarum/serialise/Common.kt
index 20b4d42c0..86e002236 100644
--- a/src/net/torvald/terrarum/serialise/Common.kt
+++ b/src/net/torvald/terrarum/serialise/Common.kt
@@ -7,10 +7,10 @@ import net.torvald.terrarum.console.EchoError
 import net.torvald.terrarum.gameworld.BlockLayer
 import net.torvald.terrarum.gameworld.GameWorld
 import net.torvald.terrarum.gameworld.WorldTime
-import net.torvald.terrarum.tvda.ByteArray64
-import net.torvald.terrarum.tvda.ByteArray64GrowableOutputStream
-import net.torvald.terrarum.tvda.ByteArray64InputStream
-import net.torvald.terrarum.tvda.ByteArray64Reader
+import net.torvald.terrarum.savegame.ByteArray64
+import net.torvald.terrarum.savegame.ByteArray64GrowableOutputStream
+import net.torvald.terrarum.savegame.ByteArray64InputStream
+import net.torvald.terrarum.savegame.ByteArray64Reader
 import net.torvald.terrarum.utils.*
 import org.apache.commons.codec.digest.DigestUtils
 import java.io.InputStream
diff --git a/src/net/torvald/terrarum/serialise/GameSavingThread.kt b/src/net/torvald/terrarum/serialise/GameSavingThread.kt
index 83991a488..1d0463d7e 100644
--- a/src/net/torvald/terrarum/serialise/GameSavingThread.kt
+++ b/src/net/torvald/terrarum/serialise/GameSavingThread.kt
@@ -9,7 +9,7 @@ import net.torvald.terrarum.modulebasegame.TerrarumIngame
 import net.torvald.terrarum.modulebasegame.gameactors.IngamePlayer
 import net.torvald.terrarum.realestate.LandUtil
 import net.torvald.terrarum.toInt
-import net.torvald.terrarum.tvda.*
+import net.torvald.terrarum.savegame.*
 import java.io.File
 import java.util.zip.GZIPOutputStream
 
diff --git a/src/net/torvald/terrarum/serialise/QuickSaveThread.kt b/src/net/torvald/terrarum/serialise/QuickSaveThread.kt
index 49f650efb..17e867b8f 100644
--- a/src/net/torvald/terrarum/serialise/QuickSaveThread.kt
+++ b/src/net/torvald/terrarum/serialise/QuickSaveThread.kt
@@ -9,7 +9,7 @@ import net.torvald.terrarum.modulebasegame.TerrarumIngame
 import net.torvald.terrarum.modulebasegame.gameactors.IngamePlayer
 import net.torvald.terrarum.realestate.LandUtil
 import net.torvald.terrarum.toInt
-import net.torvald.terrarum.tvda.*
+import net.torvald.terrarum.savegame.*
 import net.torvald.terrarum.utils.PlayerLastStatus
 import java.io.File
 import java.util.zip.GZIPOutputStream
diff --git a/src/net/torvald/terrarum/serialise/WriteActor.kt b/src/net/torvald/terrarum/serialise/WriteActor.kt
index 19d9eac89..41fe030be 100644
--- a/src/net/torvald/terrarum/serialise/WriteActor.kt
+++ b/src/net/torvald/terrarum/serialise/WriteActor.kt
@@ -10,7 +10,7 @@ import net.torvald.terrarum.modulebasegame.TerrarumIngame
 import net.torvald.terrarum.modulebasegame.gameactors.ActorHumanoid
 import net.torvald.terrarum.modulebasegame.gameactors.IngamePlayer
 import net.torvald.terrarum.modulebasegame.gameactors.Pocketed
-import net.torvald.terrarum.tvda.*
+import net.torvald.terrarum.savegame.*
 import java.io.Reader
 
 /**
diff --git a/src/net/torvald/terrarum/serialise/WriteSavegame.kt b/src/net/torvald/terrarum/serialise/WriteSavegame.kt
index 05106ab53..9a44b902e 100644
--- a/src/net/torvald/terrarum/serialise/WriteSavegame.kt
+++ b/src/net/torvald/terrarum/serialise/WriteSavegame.kt
@@ -13,7 +13,7 @@ import net.torvald.terrarum.modulebasegame.IngameRenderer
 import net.torvald.terrarum.modulebasegame.TerrarumIngame
 import net.torvald.terrarum.modulebasegame.gameactors.IngamePlayer
 import net.torvald.terrarum.realestate.LandUtil
-import net.torvald.terrarum.tvda.*
+import net.torvald.terrarum.savegame.*
 import java.io.File
 import java.io.Reader
 
diff --git a/src/net/torvald/terrarum/serialise/WriteWorld.kt b/src/net/torvald/terrarum/serialise/WriteWorld.kt
index dab91bc26..2080575da 100644
--- a/src/net/torvald/terrarum/serialise/WriteWorld.kt
+++ b/src/net/torvald/terrarum/serialise/WriteWorld.kt
@@ -11,8 +11,8 @@ import net.torvald.terrarum.modulebasegame.TerrarumIngame
 import net.torvald.terrarum.modulebasegame.gameactors.IngamePlayer
 import net.torvald.terrarum.modulebasegame.worldgenerator.RoguelikeRandomiser
 import net.torvald.terrarum.realestate.LandUtil
-import net.torvald.terrarum.tvda.ByteArray64
-import net.torvald.terrarum.tvda.ByteArray64Writer
+import net.torvald.terrarum.savegame.ByteArray64
+import net.torvald.terrarum.savegame.ByteArray64Writer
 import net.torvald.terrarum.utils.PlayerLastStatus
 import net.torvald.terrarum.weather.WeatherMixer
 import java.io.Reader
diff --git a/src/net/torvald/terrarum/tests/ByteArray64Test.kt b/src/net/torvald/terrarum/tests/ByteArray64Test.kt
index f99c13bd0..1e683febf 100644
--- a/src/net/torvald/terrarum/tests/ByteArray64Test.kt
+++ b/src/net/torvald/terrarum/tests/ByteArray64Test.kt
@@ -1,6 +1,6 @@
 package net.torvald.terrarum.tests
 
-import net.torvald.terrarum.tvda.ByteArray64GrowableOutputStream
+import net.torvald.terrarum.savegame.ByteArray64GrowableOutputStream
 import net.torvald.terrarum.serialise.toLittle
 import net.torvald.terrarum.serialise.toULittle48
 import java.util.zip.Deflater