diff --git a/ModuleComputers/src/module-info.java b/ModuleComputers/src/module-info.java
new file mode 100644
index 000000000..711867a06
--- /dev/null
+++ b/ModuleComputers/src/module-info.java
@@ -0,0 +1,11 @@
+/**
+ * Created by minjaesong on 2022-02-27.
+ */
+module ModuleComputers {
+    requires gdx;
+    requires Terrarum;
+    requires TerrarumSansBitmap;
+    requires kotlin.stdlib;
+    requires kotlinx.coroutines.core;
+    requires TerrarumTSVM;
+}
\ No newline at end of file
diff --git a/ModuleComputers/src/net/torvald/terrarum/modulecomputers/console/Dumpsprite.kt b/ModuleComputers/src/net/torvald/terrarum/modulecomputers/console/Dumpsprite.kt
new file mode 100644
index 000000000..026abf69b
--- /dev/null
+++ b/ModuleComputers/src/net/torvald/terrarum/modulecomputers/console/Dumpsprite.kt
@@ -0,0 +1,35 @@
+package net.torvald.terrarum.modulecomputers.console
+
+import com.badlogic.gdx.Gdx
+import net.torvald.gdx.graphics.PixmapIO2
+import net.torvald.spriteanimation.SpriteAnimation
+import net.torvald.terrarum.App
+import net.torvald.terrarum.Terrarum
+import net.torvald.terrarum.console.ConsoleCommand
+import net.torvald.terrarum.console.Echo
+import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
+
+/**
+ * Created by minjaesong on 2022-02-27.
+ */
+internal object Dumpsprite : ConsoleCommand {
+
+    override fun execute(args: Array<String>) {
+
+        val player = Terrarum.ingame!!.actorNowPlaying!!.sprite!!
+
+        val field = SpriteAnimation::class.java.getDeclaredField("textureRegion")
+        field.isAccessible = true
+        val textureRegion = field.get(player) as TextureRegionPack
+        val texture = textureRegion.texture.textureData
+
+        val pixmap = texture.consumePixmap()
+        PixmapIO2.writeTGA(Gdx.files.absolute("${App.defaultDir}/Exports/PlayerTexture.tga"), pixmap, false)
+
+    }
+
+    override fun printUsage() {
+        Echo("A spear to test the ingame's shield")
+    }
+
+}
\ No newline at end of file
diff --git a/assets/mods/dwarventech/ModuleComputers.jar b/assets/mods/dwarventech/ModuleComputers.jar
index a6caddabb..d3401d38f 100644
Binary files a/assets/mods/dwarventech/ModuleComputers.jar and b/assets/mods/dwarventech/ModuleComputers.jar differ
diff --git a/assets/mods/dwarventech/commands.csv b/assets/mods/dwarventech/commands.csv
new file mode 100644
index 000000000..57423e053
--- /dev/null
+++ b/assets/mods/dwarventech/commands.csv
@@ -0,0 +1 @@
+Dumpsprite
\ No newline at end of file
diff --git a/src/module-info.java b/src/module-info.java
new file mode 100644
index 000000000..08c01b9ad
--- /dev/null
+++ b/src/module-info.java
@@ -0,0 +1,66 @@
+module Terrarum {
+    // java
+    requires java.base;
+    requires java.desktop;
+    requires java.logging;
+    requires jdk.unsupported; // sun.misc.Unsafe
+
+    // kotlin
+    requires kotlin.stdlib;
+    requires kotlin.test;
+    requires kotlin.reflect;
+    requires kotlin.stdlib.jdk8; // for some reason it's required
+
+    // gdx
+    requires gdx;
+    requires gdx.platform;
+    requires gdx.backend.lwjgl3;
+    requires gdx.controllers.core;
+    requires gdx.controllers.desktop;
+
+    // terrarum
+    requires TerrarumSansBitmap;
+    requires Terrarum.Joise;
+
+    // etc
+    requires GetCpuName;
+    requires org.apache.commons.codec;
+    requires commons.csv;
+    requires jxinput;
+    requires org.graalvm.sdk;
+    requires com.ibm.icu;
+    requires org.lwjgl.opengl;
+
+
+    exports net.torvald.colourutil;
+    exports net.torvald.gdx.graphics;
+    exports net.torvald.random;
+    exports net.torvald.spriteanimation;
+    exports net.torvald.util;
+    exports net.torvald.unicode;
+
+    exports net.torvald.terrarum;
+    exports net.torvald.terrarum.blockproperties;
+    exports net.torvald.terrarum.concurrent;
+    exports net.torvald.terrarum.console;
+    exports net.torvald.terrarum.gameactors;
+    exports net.torvald.terrarum.gamecontroller;
+    exports net.torvald.terrarum.gameitems;
+    exports net.torvald.terrarum.gameparticles;
+    exports net.torvald.terrarum.gameworld;
+    exports net.torvald.terrarum.imagefont;
+    exports net.torvald.terrarum.itemproperties;
+    exports net.torvald.terrarum.langpack;
+    exports net.torvald.terrarum.realestate;
+    exports net.torvald.terrarum.ui;
+    exports net.torvald.terrarum.utils;
+    exports net.torvald.terrarum.weather;
+
+    exports net.torvald.terrarum.modulebasegame;
+    exports net.torvald.terrarum.modulebasegame.gameactors;
+    exports net.torvald.terrarum.modulebasegame.gameitems;
+    exports net.torvald.terrarum.modulebasegame.gameparticles;
+    exports net.torvald.terrarum.modulebasegame.gameworld;
+    exports net.torvald.terrarum.modulebasegame.ui;
+    exports net.torvald.terrarum.modulebasegame.worldgenerator;
+}
\ No newline at end of file
diff --git a/src/module-info.java.wtf b/src/module-info.java.wtf
deleted file mode 100644
index bdc471f86..000000000
--- a/src/module-info.java.wtf
+++ /dev/null
@@ -1,35 +0,0 @@
-module terrarum.terrarum {
-    // java
-    requires java.base;
-    requires java.desktop;
-    requires java.logging;
-    requires jdk.unsupported; // sun.misc.Unsafe
-
-    // kotlin
-    requires kotlin.stdlib;
-    requires kotlin.test;
-    requires kotlin.reflect;
-    requires kotlin.stdlib.jdk8;
-
-    // gdx
-    requires gdx;
-    requires gdx.platform;
-    requires gdx.backend.lwjgl3;
-    requires gdx.controllers.core;
-    requires gdx.controllers.desktop;
-
-    // terrarum
-    requires TerrarumSansBitmap;
-    requires Terrarum.Joise;
-
-    // etc
-    requires GetCpuName;
-    requires org.apache.commons.codec;
-    requires commons.csv;
-    requires jxinput;
-    requires org.graalvm.sdk;
-    requires com.ibm.icu;
-    requires org.lwjgl.opengl;
-
-    exports net.torvald.terrarum;
-}
\ No newline at end of file
diff --git a/src/net/torvald/gdx/graphics/UnsafeCvecArray.kt b/src/net/torvald/gdx/graphics/UnsafeCvecArray.kt
index c0a78d980..0045cabc2 100644
--- a/src/net/torvald/gdx/graphics/UnsafeCvecArray.kt
+++ b/src/net/torvald/gdx/graphics/UnsafeCvecArray.kt
@@ -1,6 +1,6 @@
 package net.torvald.gdx.graphics
 
-import net.torvald.UnsafeHelper
+import net.torvald.unsafe.UnsafeHelper
 
 /**
  * Basically just a FloatArray. You may need to re-write the entire code to actually store the Vectors,
diff --git a/src/net/torvald/parametricsky/Application.kt b/src/net/torvald/parametricsky/Application.kt
index 4692e31c9..5a1b4ba62 100644
--- a/src/net/torvald/parametricsky/Application.kt
+++ b/src/net/torvald/parametricsky/Application.kt
@@ -9,7 +9,7 @@ import com.badlogic.gdx.graphics.Color
 import com.badlogic.gdx.graphics.Pixmap
 import com.badlogic.gdx.graphics.Texture
 import com.badlogic.gdx.graphics.g2d.SpriteBatch
-import net.torvald.EMDASH
+import net.torvald.unicode.EMDASH
 import net.torvald.colourutil.*
 import net.torvald.parametricsky.datasets.DatasetCIEXYZ
 import net.torvald.parametricsky.datasets.DatasetRGB
diff --git a/src/net/torvald/random/XXHash32.java b/src/net/torvald/random/XXHash32.java
index 3657e3dc1..668156477 100644
--- a/src/net/torvald/random/XXHash32.java
+++ b/src/net/torvald/random/XXHash32.java
@@ -1,6 +1,6 @@
 package net.torvald.random;
 
-import net.torvald.UnsafeHelper;
+import net.torvald.unsafe.UnsafeHelper;
 
 /**
  * Code from https://richardstartin.github.io/posts/xxhash
diff --git a/src/net/torvald/random/XXHash64.java b/src/net/torvald/random/XXHash64.java
index 124ca0c81..86cd7e4b5 100644
--- a/src/net/torvald/random/XXHash64.java
+++ b/src/net/torvald/random/XXHash64.java
@@ -1,6 +1,6 @@
 package net.torvald.random;
 
-import net.torvald.UnsafeHelper;
+import net.torvald.unsafe.UnsafeHelper;
 
 /**
  * Code from https://richardstartin.github.io/posts/xxhash
diff --git a/src/net/torvald/terrarum/ColorLimiterTest.kt b/src/net/torvald/terrarum/ColorLimiterTest.kt
index 6eb48fcba..0dd9b636a 100644
--- a/src/net/torvald/terrarum/ColorLimiterTest.kt
+++ b/src/net/torvald/terrarum/ColorLimiterTest.kt
@@ -10,8 +10,8 @@ import com.badlogic.gdx.graphics.Texture
 import com.badlogic.gdx.graphics.g2d.SpriteBatch
 import com.badlogic.gdx.graphics.glutils.ShaderProgram
 import com.badlogic.gdx.graphics.glutils.ShapeRenderer
-import net.torvald.EMDASH
 import net.torvald.terrarumsansbitmap.gdx.TerrarumSansBitmap
+import net.torvald.unicode.EMDASH
 
 /**
  * Created by minjaesong on 2017-07-05.
diff --git a/src/net/torvald/terrarum/CommonResourcePool.kt b/src/net/torvald/terrarum/CommonResourcePool.kt
index 5bfa4059d..53231267b 100644
--- a/src/net/torvald/terrarum/CommonResourcePool.kt
+++ b/src/net/torvald/terrarum/CommonResourcePool.kt
@@ -4,8 +4,8 @@ import com.badlogic.gdx.graphics.Texture
 import com.badlogic.gdx.graphics.g2d.TextureRegion
 import com.badlogic.gdx.utils.Disposable
 import com.badlogic.gdx.utils.Queue
-import net.torvald.UnsafePtr
 import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
+import net.torvald.unsafe.UnsafePtr
 
 /**
  * Created by minjaesong on 2019-03-10.
@@ -127,8 +127,8 @@ object CommonResourcePool {
                     u is Disposable -> u.dispose()
                     u is Texture -> u.dispose()
                     u is TextureRegion -> u.texture.dispose()
-                    u is UnsafePtr -> u.destroy()
-                    else -> poolKillFun[name]?.invoke(u)
+                    u is UnsafePtr     -> u.destroy()
+                    else               -> poolKillFun[name]?.invoke(u)
                 }
             }
             catch (e: Throwable) {
diff --git a/src/net/torvald/terrarum/CreditSingleton.kt b/src/net/torvald/terrarum/CreditSingleton.kt
index afe6dcb81..7f6f3a6d2 100644
--- a/src/net/torvald/terrarum/CreditSingleton.kt
+++ b/src/net/torvald/terrarum/CreditSingleton.kt
@@ -1,7 +1,7 @@
 package net.torvald.terrarum
 
-import net.torvald.BULLET
-import net.torvald.ENDASH
+import net.torvald.unicode.BULLET
+import net.torvald.unicode.ENDASH
 
 object CreditSingleton {
 
diff --git a/src/net/torvald/terrarum/GlslTilingTest.kt b/src/net/torvald/terrarum/GlslTilingTest.kt
index c0739741f..c3d1f5fe7 100644
--- a/src/net/torvald/terrarum/GlslTilingTest.kt
+++ b/src/net/torvald/terrarum/GlslTilingTest.kt
@@ -8,7 +8,7 @@ import com.badlogic.gdx.graphics.*
 import com.badlogic.gdx.graphics.g2d.SpriteBatch
 import com.badlogic.gdx.graphics.glutils.ShaderProgram
 import com.badlogic.gdx.graphics.Color
-import net.torvald.EMDASH
+import net.torvald.unicode.EMDASH
 import net.torvald.terrarumsansbitmap.gdx.TerrarumSansBitmap
 
 /**
diff --git a/src/net/torvald/terrarum/ModMgr.kt b/src/net/torvald/terrarum/ModMgr.kt
index 908c6cca4..970c86bb0 100644
--- a/src/net/torvald/terrarum/ModMgr.kt
+++ b/src/net/torvald/terrarum/ModMgr.kt
@@ -206,6 +206,15 @@ object ModMgr {
                                 val cl = JarFileLoader(urls)
                                 cl.addFile("${File(modDir).absolutePath}/$moduleName/$jar")
                                 moduleClassloader[moduleName] = cl
+
+                                // check for module-info.java
+                                val moduleInfoPath = cl.getResources("module-info.class").toList().filter { it.toString().contains("$moduleName/$jar!/module-info.class") && it.toString().endsWith("module-info.class")}
+                                println("moduleinfo: ${cl.getResources("module-info.class").toList().joinToString()}")
+                                println(moduleInfoPath.joinToString())
+                                if (moduleInfoPath.size == 0) {
+                                    throw IllegalStateException("module-info not found on $moduleName")
+                                }
+
                                 newClass = cl.loadClass(entryPoint)
                             }
                             // for modules that are not (meant to be used by the "basegame" kind of modules)
diff --git a/src/net/torvald/terrarum/ShitOnGlsl.kt b/src/net/torvald/terrarum/ShitOnGlsl.kt
index 2f017795e..84cb84b06 100644
--- a/src/net/torvald/terrarum/ShitOnGlsl.kt
+++ b/src/net/torvald/terrarum/ShitOnGlsl.kt
@@ -7,7 +7,7 @@ import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration
 import com.badlogic.gdx.graphics.*
 import com.badlogic.gdx.graphics.g2d.SpriteBatch
 import com.badlogic.gdx.graphics.glutils.ShaderProgram
-import net.torvald.EMDASH
+import net.torvald.unicode.EMDASH
 import net.torvald.terrarumsansbitmap.gdx.TerrarumSansBitmap
 
 /**
diff --git a/src/net/torvald/terrarum/Terrarum.kt b/src/net/torvald/terrarum/Terrarum.kt
index 751fc51cd..53e4fcc99 100644
--- a/src/net/torvald/terrarum/Terrarum.kt
+++ b/src/net/torvald/terrarum/Terrarum.kt
@@ -12,7 +12,7 @@ import com.badlogic.gdx.graphics.glutils.ShapeRenderer
 import com.badlogic.gdx.utils.Disposable
 import com.badlogic.gdx.utils.JsonReader
 import com.jme3.math.FastMath
-import net.torvald.UnsafeHelper
+import net.torvald.unsafe.UnsafeHelper
 import net.torvald.gdx.graphics.Cvec
 import net.torvald.random.HQRNG
 import net.torvald.terrarum.App.*
diff --git a/src/net/torvald/terrarum/TestTestTest.kt b/src/net/torvald/terrarum/TestTestTest.kt
index 64179f62e..e01267d5e 100644
--- a/src/net/torvald/terrarum/TestTestTest.kt
+++ b/src/net/torvald/terrarum/TestTestTest.kt
@@ -11,7 +11,7 @@ import com.badlogic.gdx.graphics.g2d.SpriteBatch
 import com.badlogic.gdx.graphics.glutils.FrameBuffer
 import com.badlogic.gdx.graphics.glutils.ShaderProgram
 import com.badlogic.gdx.graphics.Color
-import net.torvald.EMDASH
+import net.torvald.unicode.EMDASH
 import net.torvald.terrarumsansbitmap.gdx.TerrarumSansBitmap
 
 
diff --git a/src/net/torvald/terrarum/controller/GamepadVirtualKeyboard.kt b/src/net/torvald/terrarum/controller/GamepadVirtualKeyboard.kt
index 5a74e1639..d3e1ee1ea 100644
--- a/src/net/torvald/terrarum/controller/GamepadVirtualKeyboard.kt
+++ b/src/net/torvald/terrarum/controller/GamepadVirtualKeyboard.kt
@@ -1,8 +1,8 @@
 package net.torvald.terrarum.controller
 
-import net.torvald.CURRENCY
-import net.torvald.EMDASH
-import net.torvald.MIDDOT
+import net.torvald.unicode.CURRENCY
+import net.torvald.unicode.EMDASH
+import net.torvald.unicode.MIDDOT
 
 /**
  * Created by minjaesong on 2019-04-10.
diff --git a/src/net/torvald/terrarum/gameworld/BlockLayer.kt b/src/net/torvald/terrarum/gameworld/BlockLayer.kt
index 08ed76528..bfc19071c 100644
--- a/src/net/torvald/terrarum/gameworld/BlockLayer.kt
+++ b/src/net/torvald/terrarum/gameworld/BlockLayer.kt
@@ -1,14 +1,14 @@
 package net.torvald.terrarum.gameworld
 
 import com.badlogic.gdx.utils.Disposable
-import net.torvald.UnsafeHelper
-import net.torvald.UnsafePtr
 import net.torvald.terrarum.App.printdbg
+import net.torvald.unsafe.UnsafeHelper
+import net.torvald.unsafe.UnsafePtr
 
 /**
  * Memory layout:
  * ```
- *  a7 a6 a5 a4 a3 a2 a1 a0 | xx xx xx xx aB aA a9 a8 ||
+ *  a7 a6 a5 a4 a3 a2 a1 a0 | aF aE aD aC aB aA a9 a8 ||
  * ```
  * where a_n is a tile number
  *
diff --git a/src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt b/src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt
index ca7810e67..148364893 100644
--- a/src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt
+++ b/src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt
@@ -4,7 +4,7 @@ import com.badlogic.gdx.Gdx
 import com.badlogic.gdx.Input
 import com.badlogic.gdx.graphics.Camera
 import com.badlogic.gdx.graphics.g2d.SpriteBatch
-import net.torvald.EMDASH
+import net.torvald.unicode.EMDASH
 import net.torvald.terrarum.*
 import net.torvald.terrarum.App.*
 import net.torvald.terrarum.Terrarum.getPlayerSaveFiledesc
diff --git a/src/net/torvald/terrarum/modulebasegame/console/MoneyDisp.kt b/src/net/torvald/terrarum/modulebasegame/console/MoneyDisp.kt
index fad752078..a71bb83cb 100644
--- a/src/net/torvald/terrarum/modulebasegame/console/MoneyDisp.kt
+++ b/src/net/torvald/terrarum/modulebasegame/console/MoneyDisp.kt
@@ -1,6 +1,6 @@
 package net.torvald.terrarum.modulebasegame.console
 
-import net.torvald.EMDASH
+import net.torvald.unicode.EMDASH
 import net.torvald.random.HQRNG
 import net.torvald.terrarum.console.ConsoleAlias
 import net.torvald.terrarum.console.ConsoleCommand
diff --git a/src/net/torvald/terrarum/modulebasegame/debuggerapp/ActorValueTracker.kt b/src/net/torvald/terrarum/modulebasegame/debuggerapp/ActorValueTracker.kt
index 9a2618925..db2cfebb8 100644
--- a/src/net/torvald/terrarum/modulebasegame/debuggerapp/ActorValueTracker.kt
+++ b/src/net/torvald/terrarum/modulebasegame/debuggerapp/ActorValueTracker.kt
@@ -1,6 +1,6 @@
 package net.torvald.terrarum.modulebasegame.debuggerapp
 
-import net.torvald.EMDASH
+import net.torvald.unicode.EMDASH
 import net.torvald.terrarum.*
 import net.torvald.terrarum.TerrarumAppConfiguration.TILE_SIZE
 import net.torvald.terrarum.console.Echo
diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/DecodeTapestry.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/DecodeTapestry.kt
index 34a1e022a..085b81ba5 100644
--- a/src/net/torvald/terrarum/modulebasegame/gameactors/DecodeTapestry.kt
+++ b/src/net/torvald/terrarum/modulebasegame/gameactors/DecodeTapestry.kt
@@ -2,7 +2,7 @@ package net.torvald.terrarum.modulebasegame.gameactors
 
 import com.badlogic.gdx.graphics.Color
 import com.badlogic.gdx.graphics.Pixmap
-import net.torvald.EMDASH
+import net.torvald.unicode.EMDASH
 import net.torvald.terrarum.ccC
 import net.torvald.terrarum.ccW
 import net.torvald.terrarum.gameworld.toUint
diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/WireGraphDebugger.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/WireGraphDebugger.kt
index 02085b5bc..aec4352d6 100644
--- a/src/net/torvald/terrarum/modulebasegame/gameitems/WireGraphDebugger.kt
+++ b/src/net/torvald/terrarum/modulebasegame/gameitems/WireGraphDebugger.kt
@@ -2,7 +2,7 @@ package net.torvald.terrarum.modulebasegame.gameitems
 
 import com.badlogic.gdx.graphics.Color
 import com.badlogic.gdx.graphics.g2d.TextureRegion
-import net.torvald.EMDASH
+import net.torvald.unicode.EMDASH
 import net.torvald.terrarum.*
 import net.torvald.terrarum.gameactors.ActorWithBody
 import net.torvald.terrarum.gameactors.BlockMarkerActor
diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIGraphicsControlPanel.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIGraphicsControlPanel.kt
index 5dc8b63be..0230fbcd0 100644
--- a/src/net/torvald/terrarum/modulebasegame/ui/UIGraphicsControlPanel.kt
+++ b/src/net/torvald/terrarum/modulebasegame/ui/UIGraphicsControlPanel.kt
@@ -3,7 +3,7 @@ package net.torvald.terrarum.modulebasegame.ui
 import com.badlogic.gdx.graphics.Camera
 import com.badlogic.gdx.graphics.Color
 import com.badlogic.gdx.graphics.g2d.SpriteBatch
-import net.torvald.TIMES
+import net.torvald.unicode.TIMES
 import net.torvald.terrarum.App
 import net.torvald.terrarum.langpack.Lang
 import net.torvald.terrarum.modulebasegame.ui.UIInventoryFull.Companion.CELL_COL
diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt
index de0ac2002..dde6d263e 100644
--- a/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt
+++ b/src/net/torvald/terrarum/modulebasegame/ui/UIInventoryFull.kt
@@ -4,16 +4,15 @@ import com.badlogic.gdx.graphics.Camera
 import com.badlogic.gdx.graphics.Color
 import com.badlogic.gdx.graphics.g2d.SpriteBatch
 import com.badlogic.gdx.graphics.glutils.ShapeRenderer
-import net.torvald.ENDASH
-import net.torvald.getKeycapPC
 import net.torvald.terrarum.*
 import net.torvald.terrarum.App.*
-import net.torvald.terrarum.gamecontroller.TerrarumKeyboardEvent
 import net.torvald.terrarum.langpack.Lang
 import net.torvald.terrarum.modulebasegame.gameactors.ActorHumanoid
 import net.torvald.terrarum.ui.Toolkit
 import net.torvald.terrarum.ui.UICanvas
 import net.torvald.terrarum.ui.UIItemHorizontalFadeSlide
+import net.torvald.unicode.ENDASH
+import net.torvald.unicode.getKeycapPC
 
 /**
  * Created by minjaesong on 2017-10-21.
diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIKeyboardInputConfig.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIKeyboardInputConfig.kt
index 5bb44a06b..ddd940b2c 100644
--- a/src/net/torvald/terrarum/modulebasegame/ui/UIKeyboardInputConfig.kt
+++ b/src/net/torvald/terrarum/modulebasegame/ui/UIKeyboardInputConfig.kt
@@ -5,7 +5,7 @@ import com.badlogic.gdx.Input
 import com.badlogic.gdx.graphics.Camera
 import com.badlogic.gdx.graphics.Color
 import com.badlogic.gdx.graphics.g2d.SpriteBatch
-import net.torvald.EMDASH
+import net.torvald.unicode.EMDASH
 import net.torvald.terrarum.App
 import net.torvald.terrarum.CommonResourcePool
 import net.torvald.terrarum.gamecontroller.*
diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UILoadDemoSavefiles.kt b/src/net/torvald/terrarum/modulebasegame/ui/UILoadDemoSavefiles.kt
index 2fbbc0c10..616724a42 100644
--- a/src/net/torvald/terrarum/modulebasegame/ui/UILoadDemoSavefiles.kt
+++ b/src/net/torvald/terrarum/modulebasegame/ui/UILoadDemoSavefiles.kt
@@ -9,9 +9,9 @@ import com.badlogic.gdx.graphics.glutils.FrameBuffer
 import com.badlogic.gdx.graphics.glutils.ShapeRenderer
 import com.badlogic.gdx.utils.JsonReader
 import com.jme3.math.FastMath
-import net.torvald.EMDASH
-import net.torvald.getKeycapConsole
-import net.torvald.getKeycapPC
+import net.torvald.unicode.EMDASH
+import net.torvald.unicode.getKeycapConsole
+import net.torvald.unicode.getKeycapPC
 import net.torvald.spriteanimation.SpriteAnimation
 import net.torvald.terrarum.*
 import net.torvald.terrarum.App.printdbg
diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIScreenZoom.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIScreenZoom.kt
index 59fc910a9..81ef9d60e 100644
--- a/src/net/torvald/terrarum/modulebasegame/ui/UIScreenZoom.kt
+++ b/src/net/torvald/terrarum/modulebasegame/ui/UIScreenZoom.kt
@@ -3,14 +3,13 @@ package net.torvald.terrarum.modulebasegame.ui
 import com.badlogic.gdx.graphics.Camera
 import com.badlogic.gdx.graphics.Color
 import com.badlogic.gdx.graphics.g2d.SpriteBatch
-import net.torvald.EMDASH
-import net.torvald.getKeycapPC
 import net.torvald.terrarum.App
 import net.torvald.terrarum.Terrarum
-import net.torvald.terrarum.TerrarumScreenSize
 import net.torvald.terrarum.modulebasegame.ui.UIQuickslotBar.Companion.COMMON_OPEN_CLOSE
 import net.torvald.terrarum.ui.Movement
 import net.torvald.terrarum.ui.UICanvas
+import net.torvald.unicode.EMDASH
+import net.torvald.unicode.getKeycapPC
 import kotlin.math.roundToInt
 
 /**
diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UITitleModules.kt b/src/net/torvald/terrarum/modulebasegame/ui/UITitleModules.kt
index 8ac284074..4ee3627ee 100644
--- a/src/net/torvald/terrarum/modulebasegame/ui/UITitleModules.kt
+++ b/src/net/torvald/terrarum/modulebasegame/ui/UITitleModules.kt
@@ -6,8 +6,8 @@ import com.badlogic.gdx.graphics.g2d.SpriteBatch
 import com.badlogic.gdx.graphics.g2d.TextureRegion
 import com.badlogic.gdx.graphics.glutils.FrameBuffer
 import com.badlogic.gdx.graphics.glutils.ShapeRenderer
-import net.torvald.getKeycapConsole
-import net.torvald.getKeycapPC
+import net.torvald.unicode.getKeycapConsole
+import net.torvald.unicode.getKeycapPC
 import net.torvald.terrarum.*
 import net.torvald.terrarum.langpack.Lang
 import net.torvald.terrarum.ui.Movement
diff --git a/src/net/torvald/terrarum/spriteassembler/SpriteAssemblerApp.kt b/src/net/torvald/terrarum/spriteassembler/SpriteAssemblerApp.kt
index f36e95e11..974517f53 100644
--- a/src/net/torvald/terrarum/spriteassembler/SpriteAssemblerApp.kt
+++ b/src/net/torvald/terrarum/spriteassembler/SpriteAssemblerApp.kt
@@ -8,7 +8,7 @@ import com.badlogic.gdx.graphics.Color
 import com.badlogic.gdx.graphics.Pixmap
 import com.badlogic.gdx.graphics.Texture
 import com.badlogic.gdx.graphics.g2d.SpriteBatch
-import net.torvald.EMDASH
+import net.torvald.unicode.EMDASH
 import net.torvald.gdx.graphics.PixmapIO2
 import net.torvald.terrarum.gdxClearAndSetBlend
 import net.torvald.terrarum.inUse
diff --git a/src/net/torvald/terrarum/tests/MakeKeylayoutFile.kt b/src/net/torvald/terrarum/tests/MakeKeylayoutFile.kt
index bd72e5684..da7f34277 100644
--- a/src/net/torvald/terrarum/tests/MakeKeylayoutFile.kt
+++ b/src/net/torvald/terrarum/tests/MakeKeylayoutFile.kt
@@ -6,7 +6,7 @@ import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Application
 import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration
 import com.badlogic.gdx.graphics.g2d.BitmapFont
 import com.badlogic.gdx.graphics.g2d.SpriteBatch
-import net.torvald.EMDASH
+import net.torvald.unicode.EMDASH
 import net.torvald.terrarum.gdxClearAndSetBlend
 import net.torvald.terrarum.inUse
 
diff --git a/src/net/torvald/terrarum/tests/NoopRectTest.kt b/src/net/torvald/terrarum/tests/NoopRectTest.kt
index 7027bdbf1..cce546f34 100644
--- a/src/net/torvald/terrarum/tests/NoopRectTest.kt
+++ b/src/net/torvald/terrarum/tests/NoopRectTest.kt
@@ -9,7 +9,7 @@ import com.badlogic.gdx.graphics.OrthographicCamera
 import com.badlogic.gdx.graphics.Pixmap
 import com.badlogic.gdx.graphics.Texture
 import com.badlogic.gdx.graphics.g2d.SpriteBatch
-import net.torvald.EMDASH
+import net.torvald.unicode.EMDASH
 import net.torvald.random.HQRNG
 import net.torvald.terrarum.Point2i
 import net.torvald.terrarum.inUse
diff --git a/src/net/torvald/terrarum/tests/UIElemTest.kt b/src/net/torvald/terrarum/tests/UIElemTest.kt
index ed9097180..e0c487006 100644
--- a/src/net/torvald/terrarum/tests/UIElemTest.kt
+++ b/src/net/torvald/terrarum/tests/UIElemTest.kt
@@ -10,7 +10,7 @@ import com.badlogic.gdx.graphics.Color
 import com.badlogic.gdx.graphics.OrthographicCamera
 import com.badlogic.gdx.graphics.g2d.SpriteBatch
 import com.badlogic.gdx.graphics.glutils.ShaderProgram
-import net.torvald.EMDASH
+import net.torvald.unicode.EMDASH
 import net.torvald.terrarum.*
 import net.torvald.terrarum.ui.Toolkit
 import net.torvald.terrarum.ui.UICanvas
diff --git a/src/net/torvald/terrarum/tests/UnsafeTest.kt b/src/net/torvald/terrarum/tests/UnsafeTest.kt
index cbb79ac44..6c849d8ab 100644
--- a/src/net/torvald/terrarum/tests/UnsafeTest.kt
+++ b/src/net/torvald/terrarum/tests/UnsafeTest.kt
@@ -1,6 +1,6 @@
 package net.torvald.terrarum.tests
 
-import net.torvald.UnsafeHelper
+import net.torvald.unsafe.UnsafeHelper
 import net.torvald.terrarum.gameworld.toUint
 import sun.misc.Unsafe
 
diff --git a/src/net/torvald/terrarum/tests/WorldgenNoiseSandbox.kt b/src/net/torvald/terrarum/tests/WorldgenNoiseSandbox.kt
index 0f7a8b8a3..b0f85a44f 100644
--- a/src/net/torvald/terrarum/tests/WorldgenNoiseSandbox.kt
+++ b/src/net/torvald/terrarum/tests/WorldgenNoiseSandbox.kt
@@ -14,7 +14,7 @@ import com.badlogic.gdx.graphics.g2d.SpriteBatch
 import com.badlogic.gdx.graphics.glutils.ShaderProgram
 import com.sudoplay.joise.Joise
 import com.sudoplay.joise.module.*
-import net.torvald.UnsafePtr
+import net.torvald.unsafe.UnsafeHelper
 import net.torvald.random.HQRNG
 import net.torvald.terrarum.concurrent.*
 import net.torvald.terrarum.gameworld.fmod
diff --git a/src/net/torvald/terrarum/ui/BasicDebugInfoWindow.kt b/src/net/torvald/terrarum/ui/BasicDebugInfoWindow.kt
index 34128e965..d1e9f681a 100644
--- a/src/net/torvald/terrarum/ui/BasicDebugInfoWindow.kt
+++ b/src/net/torvald/terrarum/ui/BasicDebugInfoWindow.kt
@@ -4,7 +4,7 @@ import com.badlogic.gdx.Gdx
 import com.badlogic.gdx.graphics.Camera
 import com.badlogic.gdx.graphics.Color
 import com.badlogic.gdx.graphics.g2d.SpriteBatch
-import net.torvald.EMDASH
+import net.torvald.unicode.EMDASH
 import net.torvald.terrarum.*
 import net.torvald.terrarum.Terrarum.mouseTileX
 import net.torvald.terrarum.Terrarum.mouseTileY
diff --git a/src/net/torvald/terrarum/ui/ConsoleWindow.kt b/src/net/torvald/terrarum/ui/ConsoleWindow.kt
index b2222aea3..47dfbac83 100644
--- a/src/net/torvald/terrarum/ui/ConsoleWindow.kt
+++ b/src/net/torvald/terrarum/ui/ConsoleWindow.kt
@@ -5,7 +5,7 @@ import com.badlogic.gdx.Input
 import com.badlogic.gdx.graphics.Camera
 import com.badlogic.gdx.graphics.Color
 import com.badlogic.gdx.graphics.g2d.SpriteBatch
-import net.torvald.EMDASH
+import net.torvald.unicode.EMDASH
 import net.torvald.terrarum.App
 import net.torvald.terrarum.Terrarum
 import net.torvald.terrarum.TerrarumAppConfiguration
diff --git a/src/net/torvald/terrarum/ui/UIItemTextLineInput.kt b/src/net/torvald/terrarum/ui/UIItemTextLineInput.kt
index cbca58cf3..38a3d76c4 100644
--- a/src/net/torvald/terrarum/ui/UIItemTextLineInput.kt
+++ b/src/net/torvald/terrarum/ui/UIItemTextLineInput.kt
@@ -13,7 +13,7 @@ import net.torvald.terrarum.*
 import net.torvald.terrarum.gamecontroller.*
 import net.torvald.terrarum.utils.Clipboard
 import net.torvald.terrarumsansbitmap.gdx.CodepointSequence
-import net.torvald.toJavaString
+import net.torvald.unicode.toJavaString
 import kotlin.streams.toList
 
 data class InputLenCap(val count: Int, val unit: CharLenUnit) {
diff --git a/src/net/torvald/terrarum/worlddrawer/LightmapHDRMap.kt b/src/net/torvald/terrarum/worlddrawer/LightmapHDRMap.kt
index 64644c302..6b46b6849 100644
--- a/src/net/torvald/terrarum/worlddrawer/LightmapHDRMap.kt
+++ b/src/net/torvald/terrarum/worlddrawer/LightmapHDRMap.kt
@@ -1,7 +1,7 @@
 package net.torvald.terrarum.worlddrawer
 
 import com.badlogic.gdx.utils.Disposable
-import net.torvald.UnsafeHelper
+import net.torvald.unsafe.UnsafeHelper
 
 /**
  * As the fast access to this LUT is critical for the performance because of the way light calculation work,
diff --git a/src/net/torvald/UniTextShortcuts.kt b/src/net/torvald/unicode/UniTextShortcuts.kt
similarity index 98%
rename from src/net/torvald/UniTextShortcuts.kt
rename to src/net/torvald/unicode/UniTextShortcuts.kt
index c9925f593..cbf12a293 100644
--- a/src/net/torvald/UniTextShortcuts.kt
+++ b/src/net/torvald/unicode/UniTextShortcuts.kt
@@ -1,4 +1,4 @@
-package net.torvald
+package net.torvald.unicode
 
 import net.torvald.terrarum.savegame.ByteArray64
 
diff --git a/src/net/torvald/UnsafePtr.kt b/src/net/torvald/unsafe/UnsafePtr.kt
similarity index 99%
rename from src/net/torvald/UnsafePtr.kt
rename to src/net/torvald/unsafe/UnsafePtr.kt
index a26c5083b..492643c48 100644
--- a/src/net/torvald/UnsafePtr.kt
+++ b/src/net/torvald/unsafe/UnsafePtr.kt
@@ -1,4 +1,4 @@
-package net.torvald
+package net.torvald.unsafe
 
 import net.torvald.terrarum.App.printdbg
 import net.torvald.terrarum.printStackTrace