diff --git a/meson.build b/meson.build
index f208d68d2..eb83ff943 100644
--- a/meson.build
+++ b/meson.build
@@ -63,6 +63,7 @@ stb_dep = declare_dependency(include_directories: stb)
 
 miniaudio_dep = dependency('miniaudio')
 
+subdir('minecraft/console_helpers')
 subdir('minecraft/java')
 subdir('minecraft/nbt')
 subdir('minecraft/platform')
diff --git a/minecraft/Minecraft.Client/Common/Consoles_App.cpp b/minecraft/Minecraft.Client/Common/Consoles_App.cpp
index 7dbcca20d..a7bddbb81 100644
--- a/minecraft/Minecraft.Client/Common/Consoles_App.cpp
+++ b/minecraft/Minecraft.Client/Common/Consoles_App.cpp
@@ -20,7 +20,7 @@
 #include "Minecraft.World/net/minecraft/world/level/tile/entity/DispenserTileEntity.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/entity/SignTileEntity.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/entity/HopperTileEntity.h"
-#include "Minecraft.World/ConsoleHelpers/PathHelper.h"
+#include "console_helpers/PathHelper.h"
 #include "Minecraft.Client/net/minecraft/stats/StatsCounter.h"
 #include "Minecraft.Client/net/minecraft/server/level/GameMode.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
@@ -28,7 +28,7 @@
 #include "Minecraft.Client/Windows64/XML/ATGXmlParser.h"
 #include "Minecraft.Client/Windows64/XML/xmlFilesCallback.h"
 #endif
-#include "Minecraft.World/ConsoleHelpers/PlatformTime.h"
+#include "console_helpers/PlatformTime.h"
 #include "Minecraft_Macros.h"
 #include "Minecraft.Client/net/minecraft/server/PlayerList.h"
 #include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h"
@@ -41,7 +41,7 @@
 #include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h"
 #include "Minecraft.World/net/minecraft/world/entity/player/net.minecraft.world.entity.player.h"
 #include "Minecraft.Client/net/minecraft/client/renderer/entity/EntityRenderDispatcher.h"
-#include "Minecraft.World/ConsoleHelpers/compression.h"
+#include "console_helpers/compression.h"
 #include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h"
 #include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h"
 #include "Minecraft.Client/Common/src/DLC/DLCPack.h"
@@ -50,7 +50,7 @@
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 #include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h"
 #include "Minecraft.Client/Common/src/Colours/ColourTable.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 
 #include "4J_Input.h"
 #include "Minecraft.Client/net/minecraft/client/gui/Gui.h"
diff --git a/minecraft/Minecraft.Client/Common/ShutdownManager.h b/minecraft/Minecraft.Client/Common/ShutdownManager.h
index 0153b511f..36d48e177 100644
--- a/minecraft/Minecraft.Client/Common/ShutdownManager.h
+++ b/minecraft/Minecraft.Client/Common/ShutdownManager.h
@@ -6,7 +6,7 @@
 #include <cstddef>
 #include <mutex>
 
-#include "../../Minecraft.World/ConsoleHelpers/C4JThread.h"
+#include "console_helpers/C4JThread.h"
 
 class ShutdownManager {
 public:
diff --git a/minecraft/Minecraft.Client/Common/src/Audio/SoundEngine.cpp b/minecraft/Minecraft.Client/Common/src/Audio/SoundEngine.cpp
index 580fff2c1..a556c74f6 100644
--- a/minecraft/Minecraft.Client/Common/src/Audio/SoundEngine.cpp
+++ b/minecraft/Minecraft.Client/Common/src/Audio/SoundEngine.cpp
@@ -11,7 +11,7 @@
 
 #include "SoundEngine.h"
 #include <filesystem>
-#include "Minecraft.World/ConsoleHelpers/PathHelper.h"
+#include "console_helpers/PathHelper.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h"
 #include "Minecraft.World/net/minecraft/util/Mth.h"
@@ -19,7 +19,7 @@
 #include "Minecraft.Client/Common/src/Audio/SoundEngine.h"
 #include "4J.Common/4J_Compat.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "Minecraft.World/ConsoleHelpers/C4JThread.h"
+#include "console_helpers/C4JThread.h"
 #include "Minecraft.World/net/minecraft/world/entity/Mob.h"
 #include "java/Random.h"
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
diff --git a/minecraft/Minecraft.Client/Common/src/Colours/ColourTable.cpp b/minecraft/Minecraft.Client/Common/src/Colours/ColourTable.cpp
index 3555df5c2..6fbc17ed9 100644
--- a/minecraft/Minecraft.Client/Common/src/Colours/ColourTable.cpp
+++ b/minecraft/Minecraft.Client/Common/src/Colours/ColourTable.cpp
@@ -3,7 +3,7 @@
 #include <cstring>
 
 #include "ColourTable.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/src/Colours/ColourTable.h"
 #include "Minecraft.Client/include/NetTypes.h"
 #include "Minecraft.Client/include/XboxStubs.h"
diff --git a/minecraft/Minecraft.Client/Common/src/DLC/DLCManager.cpp b/minecraft/Minecraft.Client/Common/src/DLC/DLCManager.cpp
index 742c9a09a..a6a8f0d1a 100644
--- a/minecraft/Minecraft.Client/Common/src/DLC/DLCManager.cpp
+++ b/minecraft/Minecraft.Client/Common/src/DLC/DLCManager.cpp
@@ -5,8 +5,8 @@
 #include "DLCManager.h"
 #include "DLCPack.h"
 #include "DLCFile.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
-#include "Minecraft.World/ConsoleHelpers/PortableFileIO.h"
+#include "console_helpers/StringHelpers.h"
+#include "console_helpers/PortableFileIO.h"
 #include "Minecraft.Client/Common/src/UI/UIController.h"
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 #include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h"
diff --git a/minecraft/Minecraft.Client/Common/src/DLC/DLCPack.cpp b/minecraft/Minecraft.Client/Common/src/DLC/DLCPack.cpp
index c0efef6c6..a38913ffc 100644
--- a/minecraft/Minecraft.Client/Common/src/DLC/DLCPack.cpp
+++ b/minecraft/Minecraft.Client/Common/src/DLC/DLCPack.cpp
@@ -13,7 +13,7 @@
 #include "DLCGameRulesHeader.h"
 #include "DLCAudioFile.h"
 #include "DLCColourTableFile.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/src/DLC/DLCPack.h"
 #include "4J_Profile.h"
 #include "Minecraft.Client/Common/src/Console_Debug_enum.h"
diff --git a/minecraft/Minecraft.Client/Common/src/GameRules/GameRuleManager.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/GameRuleManager.cpp
index 9c1cd36a4..e8b86842b 100644
--- a/minecraft/Minecraft.Client/Common/src/GameRules/GameRuleManager.cpp
+++ b/minecraft/Minecraft.Client/Common/src/GameRules/GameRuleManager.cpp
@@ -1,9 +1,8 @@
 #include "Minecraft.Client/include/stdafx.h"
 
-#include "Minecraft.World/ConsoleHelpers/compression.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/compression.h"
+#include "console_helpers/StringHelpers.h"
 #include "java/File.h"
-#include "Minecraft.World/ConsoleHelpers/compression.h"
 #include "Minecraft.Client/Common/src/DLC/DLCPack.h"
 #include "Minecraft.Client/Common/src/DLC/DLCLocalisationFile.h"
 #include "Minecraft.Client/Common/src/DLC/DLCGameRulesFile.h"
diff --git a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp
index 794194009..77ac35770 100644
--- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp
+++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp
@@ -1,7 +1,7 @@
 #include <algorithm>
 #include <cmath>
 
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "ApplySchematicRuleDefinition.h"
 #include "LevelGenerationOptions.h"
 #include "ConsoleSchematicFile.h"
diff --git a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.cpp
index 4204aacad..6fbbb2cf4 100644
--- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.cpp
+++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.cpp
@@ -1,4 +1,4 @@
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "BiomeOverride.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/BiomeOverride.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
diff --git a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp
index b308023cd..b4ab7855c 100644
--- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp
+++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.cpp
@@ -2,7 +2,7 @@
 #include <algorithm>
 
 #include "ConsoleGenerateStructure.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructure.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h"
diff --git a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp
index 41e8ef10e..804706534 100644
--- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp
+++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.cpp
@@ -6,7 +6,7 @@
 #include <unordered_map>
 
 #include "ConsoleSchematicFile.h"
-#include "Minecraft.World/ConsoleHelpers/compression.h"
+#include "console_helpers/compression.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.World/net/minecraft/world/entity/Entity.h"
 #include "Minecraft.World/net/minecraft/world/entity/EntityIO.h"
diff --git a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h
index 88dc5a7af..4da479709 100644
--- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h
+++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleSchematicFile.h
@@ -12,7 +12,7 @@
 #include <vector>
 
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
-#include "Minecraft.World/ConsoleHelpers/compression.h"
+#include "console_helpers/compression.h"
 #include "Minecraft.World/net/minecraft/world/phys/Vec3.h"
 
 class Level;
diff --git a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp
index c4ed34a11..a8eee781c 100644
--- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp
+++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.cpp
@@ -4,7 +4,7 @@
 
 #include "Minecraft.Client/include/stdafx.h"
 
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.World/net/minecraft/Pos.h"
 #include "Minecraft.World/net/minecraft/world/phys/net.minecraft.world.phys.h"
 #include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h"
diff --git a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.cpp
index df84c2605..6320572cb 100644
--- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.cpp
+++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.cpp
@@ -1,4 +1,4 @@
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "StartFeature.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StartFeature.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
diff --git a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp
index 0b2419e58..cf829b5d3 100644
--- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp
+++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.cpp
@@ -1,5 +1,5 @@
 #include "XboxStructureActionGenerateBox.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionGenerateBox.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
diff --git a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp
index 64804e04d..95d3c211c 100644
--- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp
+++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.cpp
@@ -1,5 +1,5 @@
 #include "XboxStructureActionPlaceBlock.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceBlock.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/ConsoleGenerateStructureAction.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
diff --git a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp
index 81a72139b..efb8c3762 100644
--- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp
+++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.cpp
@@ -1,7 +1,7 @@
 #include <wchar.h>
 #include <memory>
 
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "XboxStructureActionPlaceContainer.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/StructureActions/XboxStructureActionPlaceContainer.h"
diff --git a/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp
index 9b5af0014..307b90b1a 100644
--- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp
+++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.cpp
@@ -1,7 +1,7 @@
 #include <algorithm>
 #include <vector>
 
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "AddEnchantmentRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddEnchantmentRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
diff --git a/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp
index e66b5cadc..d993fdf2e 100644
--- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp
+++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.cpp
@@ -1,6 +1,6 @@
 #include <algorithm>
 
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "AddItemRuleDefinition.h"
 #include "AddEnchantmentRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h"
diff --git a/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp
index 932a292ab..296031486 100644
--- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp
+++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.cpp
@@ -1,4 +1,4 @@
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "CollectItemRuleDefinition.h"
 #include "Minecraft.World/net/minecraft/network/Connection.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h"
diff --git a/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp
index 334757a8c..24a5092c9 100644
--- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp
+++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.cpp
@@ -3,7 +3,7 @@
 #include <utility>
 
 #include "CompleteAllRuleDefinition.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.World/net/minecraft/network/Connection.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.h"
diff --git a/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp
index 97828ce63..a2f6c8170 100644
--- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp
+++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompoundGameRuleDefinition.cpp
@@ -4,7 +4,7 @@
 #include <unordered_map>
 #include <utility>
 
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "CompoundGameRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CollectItemRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h"
diff --git a/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp
index 2af9503a2..6b7e07cff 100644
--- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp
+++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.cpp
@@ -6,7 +6,7 @@
 #include <utility>
 #include <vector>
 
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/src/GameRules/ConsoleGameRulesConstants.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/CompleteAllRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
diff --git a/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp
index 53e2e286a..6a7c71c9f 100644
--- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp
+++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.cpp
@@ -1,7 +1,7 @@
 #include <wchar.h>
 
 #include "NamedAreaRuleDefinition.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/NamedAreaRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
diff --git a/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp
index 0cac25e2b..b1bf30dcb 100644
--- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp
+++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.cpp
@@ -3,7 +3,7 @@
 
 #include "UpdatePlayerRuleDefinition.h"
 #include "Minecraft.World/net/minecraft/Pos.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UpdatePlayerRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/AddItemRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
diff --git a/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp
index 4b6750afa..4b76532ed 100644
--- a/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp
+++ b/minecraft/Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.cpp
@@ -1,4 +1,4 @@
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "UseTileRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/UseTileRuleDefinition.h"
 #include "Minecraft.Client/Common/src/GameRules/LevelRules/RuleDefinitions/GameRuleDefinition.h"
diff --git a/minecraft/Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.cpp b/minecraft/Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.cpp
index 8bdea5bb6..7bd8f80e2 100644
--- a/minecraft/Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.cpp
+++ b/minecraft/Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.cpp
@@ -1,4 +1,4 @@
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "LeaderboardManager.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/include/NetTypes.h"
diff --git a/minecraft/Minecraft.Client/Common/src/Network/GameNetworkManager.cpp b/minecraft/Minecraft.Client/Common/src/Network/GameNetworkManager.cpp
index eff559f7e..8b07df8dc 100644
--- a/minecraft/Minecraft.Client/Common/src/Network/GameNetworkManager.cpp
+++ b/minecraft/Minecraft.Client/Common/src/Network/GameNetworkManager.cpp
@@ -5,11 +5,11 @@
 #include <fstream>
 #include <filesystem>
 
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.World/net/minecraft/world/phys/AABB.h"
 #include "Minecraft.World/net/minecraft/world/phys/Vec3.h"
 #include "Socket.h"
-#include "Minecraft.World/ConsoleHelpers/ThreadName.h"
+#include "console_helpers/ThreadName.h"
 #include "Minecraft.World/net/minecraft/world/entity/Entity.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h"
 #include "Minecraft.World/net/minecraft/world/item/crafting/FireworksRecipe.h"
@@ -24,7 +24,7 @@
 #include "Minecraft.Client/net/minecraft/client/ProgressRenderer.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "Minecraft.World/net/minecraft/network/packet/DisconnectPacket.h"
-#include "Minecraft.World/ConsoleHelpers/compression.h"
+#include "console_helpers/compression.h"
 #include "Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.h"
 #include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h"
 #include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h"
diff --git a/minecraft/Minecraft.Client/Common/src/Network/GameNetworkManager.h b/minecraft/Minecraft.Client/Common/src/Network/GameNetworkManager.h
index c2863bb66..334e88d2b 100644
--- a/minecraft/Minecraft.Client/Common/src/Network/GameNetworkManager.h
+++ b/minecraft/Minecraft.Client/Common/src/Network/GameNetworkManager.h
@@ -4,7 +4,7 @@
 #if !defined(__linux__)
 #include <qnet.h>
 #endif
-#include "Minecraft.World/ConsoleHelpers/C4JThread.h"
+#include "console_helpers/C4JThread.h"
 #include "NetworkPlayerInterface.h"
 #include "PlatformNetworkManagerStub.h"
 #include "SessionInfo.h"
diff --git a/minecraft/Minecraft.Client/Common/src/Network/PlatformNetworkManagerInterface.h b/minecraft/Minecraft.Client/Common/src/Network/PlatformNetworkManagerInterface.h
index 5c37d5f5d..21eae2db7 100644
--- a/minecraft/Minecraft.Client/Common/src/Network/PlatformNetworkManagerInterface.h
+++ b/minecraft/Minecraft.Client/Common/src/Network/PlatformNetworkManagerInterface.h
@@ -4,7 +4,7 @@
 #if !defined(__linux__)
 #include <qnet.h>
 #endif
-#include "Minecraft.World/ConsoleHelpers/C4JThread.h"
+#include "console_helpers/C4JThread.h"
 #include "Minecraft.Client/include/NetTypes.h"
 #include "Minecraft.Client/include/XboxStubs.h"
 #include "Minecraft.Client/include/SkinBox.h"
diff --git a/minecraft/Minecraft.Client/Common/src/Network/PlatformNetworkManagerStub.cpp b/minecraft/Minecraft.Client/Common/src/Network/PlatformNetworkManagerStub.cpp
index e94839bcb..7c49252b4 100644
--- a/minecraft/Minecraft.Client/Common/src/Network/PlatformNetworkManagerStub.cpp
+++ b/minecraft/Minecraft.Client/Common/src/Network/PlatformNetworkManagerStub.cpp
@@ -9,7 +9,7 @@
 #include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
-#include "Minecraft.World/ConsoleHelpers/C4JThread.h"
+#include "console_helpers/C4JThread.h"
 
 CPlatformNetworkManagerStub* g_pPlatformNetworkManager;
 
diff --git a/minecraft/Minecraft.Client/Common/src/Network/PlatformNetworkManagerStub.h b/minecraft/Minecraft.Client/Common/src/Network/PlatformNetworkManagerStub.h
index d34494b0b..516abc754 100644
--- a/minecraft/Minecraft.Client/Common/src/Network/PlatformNetworkManagerStub.h
+++ b/minecraft/Minecraft.Client/Common/src/Network/PlatformNetworkManagerStub.h
@@ -4,7 +4,7 @@
 #include <vector>
 #include <string>
 
-#include "Minecraft.World/ConsoleHelpers/C4JThread.h"
+#include "console_helpers/C4JThread.h"
 #include "NetworkPlayerInterface.h"
 #include "PlatformNetworkManagerInterface.h"
 #include "SessionInfo.h"
diff --git a/minecraft/Minecraft.Client/Common/src/Network/Socket.h b/minecraft/Minecraft.Client/Common/src/Network/Socket.h
index f3dbfd5f0..99f911e61 100644
--- a/minecraft/Minecraft.Client/Common/src/Network/Socket.h
+++ b/minecraft/Minecraft.Client/Common/src/Network/Socket.h
@@ -11,8 +11,8 @@
 
 #include "java/InputOutputStream/InputStream.h"
 #include "java/InputOutputStream/OutputStream.h"
-#include "Minecraft.World/ConsoleHelpers/C4JThread.h" // 4jcraft TODO
-#include "Minecraft.World/ConsoleHelpers/ThreadName.h" // 4jcraft TODO
+#include "console_helpers/C4JThread.h" // 4jcraft TODO
+#include "console_helpers/ThreadName.h" // 4jcraft TODO
 #include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h"
 #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h"
 
diff --git a/minecraft/Minecraft.Client/Common/src/Tutorial/Tutorial.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/Tutorial.cpp
index ff0657eb5..60c4dd3db 100644
--- a/minecraft/Minecraft.Client/Common/src/Tutorial/Tutorial.cpp
+++ b/minecraft/Minecraft.Client/Common/src/Tutorial/Tutorial.cpp
@@ -1,6 +1,6 @@
 #include "Minecraft.Client/include/stdafx.h"
 
-#include "Minecraft.World/ConsoleHelpers/PlatformTime.h"
+#include "console_helpers/PlatformTime.h"
 #include "Minecraft.World/net/minecraft/stats/net.minecraft.stats.h"
 #include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h"
 #include "Minecraft.World/net/minecraft/world/entity/Entity.h"
@@ -19,7 +19,7 @@
 #include "Minecraft.Client/Common/src/Tutorial/Tasks/TutorialTasks.h"
 #include "Minecraft.Client/Common/src/Tutorial/Constraints/TutorialConstraints.h"
 #include "Minecraft.Client/Common/src/Tutorial/Hints/TutorialHints.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 
 #include "4J.Common/4J_InputActions.h"
 
diff --git a/minecraft/Minecraft.Client/Common/src/Tutorial/TutorialMode.cpp b/minecraft/Minecraft.Client/Common/src/Tutorial/TutorialMode.cpp
index 434164720..1ae59e168 100644
--- a/minecraft/Minecraft.Client/Common/src/Tutorial/TutorialMode.cpp
+++ b/minecraft/Minecraft.Client/Common/src/Tutorial/TutorialMode.cpp
@@ -1,5 +1,5 @@
 #include "Minecraft.World/stdafx.h"
-#include "Minecraft.World/ConsoleHelpers/PlatformTime.h"
+#include "console_helpers/PlatformTime.h"
 #include <memory>
 
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
diff --git a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.cpp b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.cpp
index 440656500..14e780f1d 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.cpp	
+++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.cpp	
@@ -2,8 +2,8 @@
 #include <cstdlib>
 #include <utility>
 
-#include "Minecraft.World/ConsoleHelpers/PortableFileIO.h"
-#include "Minecraft.World/ConsoleHelpers/compression.h"
+#include "console_helpers/PortableFileIO.h"
+#include "console_helpers/compression.h"
 #include "ArchiveFile.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
diff --git a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.cpp
index 690f6ffbd..02d349231 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.cpp	
+++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_PauseMenu.cpp	
@@ -13,9 +13,9 @@
 #include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h"
 #include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h"
 #include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/src/DLC/DLCPack.h"
-#include "Minecraft.World/ConsoleHelpers/compression.h"
+#include "console_helpers/compression.h"
 #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h"
 
 int IUIScene_PauseMenu::ExitGameDialogReturned(
diff --git a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_TradingMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_TradingMenu.cpp
index 354ae8b0f..19714b279 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_TradingMenu.cpp	
+++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/IUIScene_TradingMenu.cpp	
@@ -7,7 +7,7 @@
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h"
 #include "IUIScene_TradingMenu.h"
 
diff --git a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h
index 0f308727c..f43f49402 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h	
+++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h	
@@ -7,7 +7,7 @@
 
 #include "UIEnums.h"
 #include "Minecraft.Client/Common/App_Defines.h"
-#include "Minecraft.World/ConsoleHelpers/C4JThread.h"
+#include "console_helpers/C4JThread.h"
 #include "4J.Storage/4J_Storage.h"
 
 class Container;
diff --git a/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_PressStartToPlay.cpp b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_PressStartToPlay.cpp
index 866e14257..3651e2133 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_PressStartToPlay.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_PressStartToPlay.cpp
@@ -2,7 +2,7 @@
 
 #include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIComponent_PressStartToPlay.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 
 UIComponent_PressStartToPlay::UIComponent_PressStartToPlay(int iPad,
                                                            void* initData,
diff --git a/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_Tooltips.cpp b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_Tooltips.cpp
index c02fb17b7..a12abbfc1 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_Tooltips.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_Tooltips.cpp
@@ -5,7 +5,7 @@
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Linux_UIController.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 
 UIComponent_Tooltips::UIComponent_Tooltips(int iPad, void* initData,
                                            UILayer* parentLayer)
diff --git a/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.cpp b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.cpp
index bc33ee375..595cde6a1 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Components/UIComponent_TutorialPopup.cpp
@@ -3,7 +3,7 @@
 #include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIComponent_TutorialPopup.h"
 #include "Minecraft.Client/Common/src/Tutorial/Tutorial.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h"
diff --git a/minecraft/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.cpp b/minecraft/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.cpp
index bb770564d..0673cb1e3 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Components/UIScene_HUD.cpp
@@ -9,7 +9,7 @@
 #include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h"
 #include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h"
 #include "Minecraft.World/net/minecraft/world/effect/net.minecraft.world.effect.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/net/minecraft/client/gui/Gui.h"
 
 UIScene_HUD::UIScene_HUD(int iPad, void* initData, UILayer* parentLayer)
diff --git a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Base.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Base.cpp
index 3342cc3a6..e4e2e6747 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Base.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Base.cpp
@@ -2,7 +2,7 @@
 #include <vector>
 
 #include "UIControl.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Common/src/UI/UIString.h"
diff --git a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.cpp
index e42d76341..961ceccc4 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.cpp
@@ -2,7 +2,7 @@
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_BitmapIcon.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 
 bool UIControl_BitmapIcon::setupControl(UIScene* scene, IggyValuePath* parent,
                                         const std::string& controlName) {
diff --git a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Button.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Button.cpp
index dcb8d8b18..61a7d6a46 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Button.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Button.cpp
@@ -3,7 +3,7 @@
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 
 UIControl_Button::UIControl_Button() {}
 
diff --git a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.cpp
index 7ebbdc6d6..c6ac8eaed 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.cpp
@@ -4,7 +4,7 @@
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Iggy/include/rrCore.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 
 UIControl_ButtonList::UIControl_ButtonList() {
     m_itemCount = 0;
diff --git a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.cpp
index 41086df8e..7e2f4132e 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_CheckBox.cpp
@@ -4,7 +4,7 @@
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Iggy/include/rrCore.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 
 UIControl_CheckBox::UIControl_CheckBox() {}
 
diff --git a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.cpp
index 45f5ad030..ed17095be 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_DLCList.cpp
@@ -4,7 +4,7 @@
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Iggy/include/rrCore.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 
 bool UIControl_DLCList::setupControl(UIScene* scene, IggyValuePath* parent,
                                      const std::string& controlName) {
diff --git a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.cpp
index 3bc6aab0e..1ca74bcb4 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_DynamicLabel.cpp
@@ -3,7 +3,7 @@
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 
 UIControl_DynamicLabel::UIControl_DynamicLabel() {}
 
diff --git a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.cpp
index ed1f51334..370a071bc 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.cpp
@@ -7,7 +7,7 @@
 #include "UIControl_EnchantmentButton.h"
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_EnchantmentButton.h"
 #include "4J.Render/4J_Render.h"
 #include "Minecraft.Client/Common/App_enums.h"
diff --git a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Label.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Label.cpp
index 755447e5e..ad3223b9c 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Label.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Label.cpp
@@ -1,5 +1,5 @@
 #include "UIControl_Label.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Label.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h"
diff --git a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.cpp
index 3908455a3..a4f67cdcd 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_LeaderboardList.cpp
@@ -3,7 +3,7 @@
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 
 UIControl_LeaderboardList::UIControl_LeaderboardList() {}
 
diff --git a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.cpp
index b5d0305b5..7fa24b863 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerList.cpp
@@ -4,7 +4,7 @@
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Iggy/include/rrCore.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 
 bool UIControl_PlayerList::setupControl(UIScene* scene, IggyValuePath* parent,
                                         const std::string& controlName) {
diff --git a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.cpp
index 6d608b456..d7df26b28 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Progress.cpp
@@ -3,7 +3,7 @@
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 
 UIControl_Progress::UIControl_Progress() {
     m_min = 0;
diff --git a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.cpp
index b395c29e3..bec4dd632 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_SaveList.cpp
@@ -4,7 +4,7 @@
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_ButtonList.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Iggy/include/rrCore.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 
 bool UIControl_SaveList::setupControl(UIScene* scene, IggyValuePath* parent,
                                       const std::string& controlName) {
diff --git a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.cpp
index 8e36ec288..840c4ede2 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_Slider.cpp
@@ -4,7 +4,7 @@
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Linux_UIController.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.World/net/minecraft/sounds/SoundTypes.h"
 
 UIControl_Slider::UIControl_Slider() {
diff --git a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_SpaceIndicatorBar.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_SpaceIndicatorBar.cpp
index 380d2bec7..6b4ae90d2 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_SpaceIndicatorBar.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_SpaceIndicatorBar.cpp
@@ -3,7 +3,7 @@
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 
 UIControl_SpaceIndicatorBar::UIControl_SpaceIndicatorBar() {
     m_min = 0;
diff --git a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.cpp
index 87c3ccdd2..0244586a0 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.cpp
@@ -1,5 +1,5 @@
 #include "UIControl_TextInput.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_TextInput.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h"
diff --git a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.cpp b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.cpp
index 23df169ff..a240482b6 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Controls/UIControl_TexturePackList.cpp
@@ -4,7 +4,7 @@
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_Base.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Common/src/UI/UIString.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 
 UIControl_TexturePackList::UIControl_TexturePackList() {}
 
diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp
index 62fa0fa85..9e55e9cfc 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugCreateSchematic.cpp
@@ -9,14 +9,14 @@
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Linux_UIController.h"
-#include "Minecraft.World/ConsoleHelpers/compression.h"
+#include "console_helpers/compression.h"
 #include "Minecraft.World/net/minecraft/world/level/Level.h"
 #include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h"
 
 class UILayer;
 #ifdef _DEBUG_MENUS_ENABLED
 #include "UIScene_DebugCreateSchematic.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 
 UIScene_DebugCreateSchematic::UIScene_DebugCreateSchematic(int iPad,
                                                            void* initData,
diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp
index a39196bd1..e7887a865 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugOverlay.cpp
@@ -30,7 +30,7 @@ class UILayer;
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 
 UIScene_DebugOverlay::UIScene_DebugOverlay(int iPad, void* initData,
                                            UILayer* parentLayer)
diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp
index a229acc16..6a96b4c5c 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Debug/UIScene_DebugSetCamera.cpp
@@ -16,7 +16,7 @@ class UILayer;
 #include "UIScene_DebugSetCamera.h"
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 
 UIScene_DebugSetCamera::UIScene_DebugSetCamera(int iPad, void* initData,
                                                UILayer* parentLayer)
diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp
index a5389799f..8632592a9 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp	
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp	
@@ -7,7 +7,7 @@
 #include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h"
 #include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h"
 #include "Minecraft.World/net/minecraft/world/level/LevelSettings.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.World/net/minecraft/world/level/biome/BiomeSource.h"
 #include "Minecraft.World/net/minecraft/world/level/LevelType.h"
 #include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h"
diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp
index 7d3d0c971..aa6ba85d7 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp	
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp	
@@ -1,7 +1,7 @@
 
 #include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIScene_DLCOffersMenu.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 
 #define PLAYER_ONLINE_TIMER_ID 0
 #define PLAYER_ONLINE_TIMER_TIME 100
diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp
index 091a4aeec..1f1c96d24 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp	
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_EULA.cpp	
@@ -1,7 +1,7 @@
 
 #include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIScene_EULA.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 
 UIScene_EULA::UIScene_EULA(int iPad, void* initData, UILayer* parentLayer)
     : UIScene(iPad, parentLayer) {
diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp
index 9b74c3b0a..ddad8032e 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp	
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp	
@@ -1,7 +1,7 @@
 #include "Minecraft.Client/include/stdafx.h"
 
 #include "Minecraft.Client/Common/src/UI/UI.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "UIScene_LaunchMoreOptionsMenu.h"
 #include "4J_Input.h"
 
diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp
index 023801d44..4eab0aebc 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp	
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp	
@@ -6,7 +6,7 @@
 #include "Minecraft.Client/net/minecraft/client/Options.h"
 #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h"
 #include "Minecraft.World/net/minecraft/world/level/LevelSettings.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h"
 #include "Minecraft.Client/Common/src/DLC/DLCPack.h"
 
diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp
index bd761c06a..0d91cb2ec 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp	
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp	
@@ -5,14 +5,14 @@
 #include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIScene_LoadOrJoinMenu.h"
 
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h"
 #include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h"
 #include "Minecraft.World/net/minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h"
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFile.h"
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h"
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.h"
-#include "Minecraft.World/ConsoleHelpers/PortableFileIO.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h"
+#include "console_helpers/PortableFileIO.h"
 #include "Minecraft.Client/net/minecraft/client/ProgressRenderer.h"
 #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h"
 #include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h"
diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp
index 229f9ba1f..a4111aa9d 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp	
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp	
@@ -1,6 +1,6 @@
 
 #include "Minecraft.World/net/minecraft/util/Mth.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "java/Random.h"
 #include "Minecraft.Client/net/minecraft/client/User.h"
 #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h"
diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp
index 7da0125eb..39df0296a 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp	
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Frontend Menu screens/UIScene_NewUpdateMessage.cpp	
@@ -1,7 +1,7 @@
 
 #include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIScene_NewUpdateMessage.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 
 UIScene_NewUpdateMessage::UIScene_NewUpdateMessage(int iPad, void* initData,
                                                    UILayer* parentLayer)
diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_Credits.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_Credits.cpp
index d9b75e263..b39fa3073 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_Credits.cpp	
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_Credits.cpp	
@@ -1,6 +1,6 @@
 
 #include "Minecraft.Client/Common/src/UI/UI.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "UIScene_Credits.h"
 
 #define CREDIT_ICON -2
diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp
index 41a7726c2..abbad09cb 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp	
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_HowToPlay.cpp	
@@ -1,7 +1,7 @@
 
 #include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIScene_HowToPlay.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 
 static UIScene_HowToPlay::SHowToPlayPageDef gs_aPageDefs[eHowToPlay_NumPages] =
     {
diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp
index 7f87b9484..106d3f8c4 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp	
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp	
@@ -1,7 +1,7 @@
 
 #include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIScene_SkinSelectMenu.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/src/DLC/DLCPack.h"
 #include "Minecraft.Client/Common/src/DLC/DLCSkinFile.h"
 #include "Minecraft.Client/Common/Minecraft_Macros.h"
diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h
index 3a51dc9c7..f36c98b83 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h	
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h	
@@ -1,7 +1,7 @@
 #pragma once
 #include <cstdint>
 
-#include "Minecraft.World/ConsoleHelpers/Definitions.h"
+#include "console_helpers/Definitions.h"
 #include "Minecraft.Client/Common/src/UI/UIScene.h"
 #include "Minecraft.Client/Common/src/UI/Controls/UIControl_PlayerSkinPreview.h"
 
diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp
index 340107dbc..18eae3db8 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp	
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.cpp	
@@ -4,7 +4,7 @@
 #include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "UIScene_AnvilMenu.h"
 
 UIScene_AnvilMenu::UIScene_AnvilMenu(int iPad, void* _initData,
diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp
index 5ce7cc5d7..df021049e 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp	
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.cpp	
@@ -15,7 +15,7 @@
 #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialEnum.h"
 
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 
 #define INVENTORY_UPDATE_EFFECTS_TIMER_ID (10)
 #define INVENTORY_UPDATE_EFFECTS_TIMER_TIME (1000)  // 1 second
diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp
index 41785028f..1c1df6a28 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp	
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/Containers/UIScene_TradingMenu.cpp	
@@ -5,7 +5,7 @@
 #include "Minecraft.World/net/minecraft/world/item/trading/net.minecraft.world.item.trading.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 #include "UIScene_TradingMenu.h"
 
diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp
index 2b5c9b45a..ad5ade4fe 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp	
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp	
@@ -4,7 +4,7 @@
 #include "Minecraft.Client/Common/src/UI/UIBitmapFont.h"
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/net/minecraft/client/gui/Font.h"
 
 UIScene_EndPoem::UIScene_EndPoem(int iPad, void* initData, UILayer* parentLayer)
diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp
index 0c7658808..ea481bc47 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp	
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp	
@@ -6,7 +6,7 @@
 #include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h"
 #include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h"
 #include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
 #include "Minecraft.Client/Common/src/DLC/DLCPack.h"
 
diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp
index 80e587760..81c0fc017 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp	
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp	
@@ -1,6 +1,6 @@
 
 #include "Minecraft.Client/Common/src/UI/UI.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "UIScene_SignEntryMenu.h"
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
diff --git a/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_Keyboard.cpp b/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_Keyboard.cpp
index 00319f772..cb82ce51e 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_Keyboard.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/Scenes/UIScene_Keyboard.cpp
@@ -3,7 +3,7 @@
 #include "Minecraft.Client/Common/src/UI/UI.h"
 #include "UIScene_Keyboard.h"
 
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 
 
 #define KEYBOARD_DONE_TIMER_ID 0
diff --git a/minecraft/Minecraft.Client/Common/src/UI/UIController.cpp b/minecraft/Minecraft.Client/Common/src/UI/UIController.cpp
index e6897a4ad..971686143 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/UIController.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/UIController.cpp
@@ -1,9 +1,9 @@
 #include "Minecraft.World/stdafx.h"
-#include "Minecraft.World/ConsoleHelpers/PlatformTime.h"
+#include "console_helpers/PlatformTime.h"
 #include "UIController.h"
 #include "UI.h"
 #include "UIScene.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/include/BufferedImage.h"
 #include "Minecraft.Client/net/minecraft/client/player/LocalPlayer.h"
 #include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h"
@@ -13,7 +13,7 @@
 #include "Minecraft.Client/net/minecraft/client/renderer/entity/EnderDragonRenderer.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "Minecraft.Client/net/minecraft/client/title/TitleScreen.h"
-#include "Minecraft.World/ConsoleHelpers/PerformanceTimer.h"
+#include "console_helpers/PerformanceTimer.h"
 #include "UIFontData.h"
 #include "4J_Input.h"
 
diff --git a/minecraft/Minecraft.Client/Common/src/UI/UIScene.cpp b/minecraft/Minecraft.Client/Common/src/UI/UIScene.cpp
index 79397b6b3..3d69b4f5f 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/UIScene.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/UIScene.cpp
@@ -17,7 +17,7 @@
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Linux_UIController.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.World/net/minecraft/sounds/SoundTypes.h"
 #include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h"
 #include "Minecraft.World/net/minecraft/world/item/ItemInstance.h"
diff --git a/minecraft/Minecraft.Client/Common/src/UI/UIString.cpp b/minecraft/Minecraft.Client/Common/src/UI/UIString.cpp
index b6d46cef1..0a260900f 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/UIString.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/UIString.cpp
@@ -1,4 +1,4 @@
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "UIString.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/include/NetTypes.h"
diff --git a/minecraft/Minecraft.Client/Common/src/UI/UITTFFont.cpp b/minecraft/Minecraft.Client/Common/src/UI/UITTFFont.cpp
index 600e65c78..e7b5bdcb5 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/UITTFFont.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/UITTFFont.cpp
@@ -1,11 +1,11 @@
 #include <assert.h>
 #include <cstdio>
 
-#include "Minecraft.World/ConsoleHelpers/PortableFileIO.h"
+#include "console_helpers/PortableFileIO.h"
 #include "UITTFFont.h"
 #include "Minecraft.Client/Linux/Iggy/include/iggy.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 
 UITTFFont::UITTFFont(const std::string& name, const std::string& path,
                      S32 fallbackCharacter)
diff --git a/minecraft/Minecraft.Client/Linux/Linux_App.cpp b/minecraft/Minecraft.Client/Linux/Linux_App.cpp
index a0fd77425..131cd46e9 100644
--- a/minecraft/Minecraft.Client/Linux/Linux_App.cpp
+++ b/minecraft/Minecraft.Client/Linux/Linux_App.cpp
@@ -13,7 +13,7 @@
 #include "4J_Storage.h"
 #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h"
-#include "Minecraft.World/ConsoleHelpers/C4JThread.h"
+#include "console_helpers/C4JThread.h"
 
 CConsoleMinecraftApp app;
 
diff --git a/minecraft/Minecraft.Client/Linux/Linux_Minecraft.cpp b/minecraft/Minecraft.Client/Linux/Linux_Minecraft.cpp
index 9ce0a8e78..d533425cf 100644
--- a/minecraft/Minecraft.Client/Linux/Linux_Minecraft.cpp
+++ b/minecraft/Minecraft.Client/Linux/Linux_Minecraft.cpp
@@ -43,7 +43,7 @@ static void sigsegv_handler(int sig) {
 #include "Minecraft.World/net/minecraft/world/item/crafting/Recipes.h"
 #include "Minecraft.World/net/minecraft/world/item/crafting/Recipy.h"
 #include "Minecraft.World/net/minecraft/locale/Language.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.World/net/minecraft/world/phys/AABB.h"
 #include "Minecraft.World/net/minecraft/world/phys/Vec3.h"
 #include "Minecraft.World/net/minecraft/world/level/Level.h"
@@ -52,7 +52,7 @@ static void sigsegv_handler(int sig) {
 #include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h"
 #include "Minecraft.Client/net/minecraft/client/User.h"
 #include "Minecraft.Client/Common/src/Network/Socket.h"
-#include "Minecraft.World/ConsoleHelpers/ThreadName.h"
+#include "console_helpers/ThreadName.h"
 #include "Minecraft.Client/net/minecraft/stats/StatsCounter.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/ConnectScreen.h"
 // #include "Minecraft.Client/Common/src/Leaderboards/LeaderboardManager.h"
@@ -61,7 +61,7 @@ static void sigsegv_handler(int sig) {
 #include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h"
 #include "Minecraft.Client/net/minecraft/client/Options.h"
 #include "Minecraft.Client/net/minecraft/client/renderer/Textures.h"
-#include "Minecraft.World/ConsoleHelpers/compression.h"
+#include "console_helpers/compression.h"
 #include "Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.h"
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 #include "Minecraft.Client/Common/App_Defines.h"
diff --git a/minecraft/Minecraft.Client/Linux/Linux_ShutdownManager.cpp b/minecraft/Minecraft.Client/Linux/Linux_ShutdownManager.cpp
index b46250ee9..bf9893888 100644
--- a/minecraft/Minecraft.Client/Linux/Linux_ShutdownManager.cpp
+++ b/minecraft/Minecraft.Client/Linux/Linux_ShutdownManager.cpp
@@ -1,7 +1,7 @@
 // Linux stub implementations for ShutdownManager
 // The PS3/PSVita versions have full implementations; on Linux these are no-ops.
 #include "Minecraft.Client/Common/ShutdownManager.h"
-#include "Minecraft.World/ConsoleHelpers/C4JThread.h"
+#include "console_helpers/C4JThread.h"
 
 void ShutdownManager::Initialise() {}
 void ShutdownManager::StartShutdown() {}
diff --git a/minecraft/Minecraft.Client/Windows64/Source Files/Windows64_Minecraft.cpp b/minecraft/Minecraft.Client/Windows64/Source Files/Windows64_Minecraft.cpp
index d41e387ee..5fac51455 100644
--- a/minecraft/Minecraft.Client/Windows64/Source Files/Windows64_Minecraft.cpp	
+++ b/minecraft/Minecraft.Client/Windows64/Source Files/Windows64_Minecraft.cpp	
@@ -12,7 +12,7 @@
 #include "Minecraft.World/net/minecraft/world/item/crafting/Recipes.h"
 #include "Minecraft.World/net/minecraft/world/item/crafting/Recipy.h"
 #include "Minecraft.World/net/minecraft/locale/Language.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.World/net/minecraft/world/phys/AABB.h"
 #include "Minecraft.World/net/minecraft/world/phys/Vec3.h"
 #include "Minecraft.World/net/minecraft/world/level/Level.h"
@@ -21,7 +21,7 @@
 #include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h"
 #include "Minecraft.Client/net/minecraft/client/User.h"
 #include "Minecraft.Client/Common/src/Network/Socket.h"
-#include "Minecraft.World/ConsoleHelpers/ThreadName.h"
+#include "console_helpers/ThreadName.h"
 #include "Minecraft.Client/net/minecraft/stats/StatsCounter.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/ConnectScreen.h"
 // #include "Social/SocialManager.h"
@@ -33,7 +33,7 @@
 #include "Sentient/SentientManager.h"
 #include "Minecraft.Client/net/minecraft/client/renderer/Textures.h"
 #include "../Resource.h"
-#include "Minecraft.World/ConsoleHelpers/compression.h"
+#include "console_helpers/compression.h"
 #include "Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.h"
 
 HINSTANCE hMyInst;
diff --git a/minecraft/Minecraft.Client/meson.build b/minecraft/Minecraft.Client/meson.build
index ac68c1590..b22e578e9 100644
--- a/minecraft/Minecraft.Client/meson.build
+++ b/minecraft/Minecraft.Client/meson.build
@@ -61,6 +61,7 @@ client_dependencies = [
   dependency('zlib'),
   miniaudio_dep,
   stb_dep,
+  console_helpers_dep,
 ]
 
 if get_option('enable_vsync')
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.cpp b/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.cpp
index 5361afa69..931b75201 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.cpp
@@ -84,7 +84,7 @@
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h"
 #include "Minecraft.Client/Common/src/DLC/DLCPack.h"
 #include "Minecraft.Client/Common/src/ConsoleGameMode.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.World/net/minecraft/world/item/alchemy/PotionMacros.h"
 #include "Minecraft.Client/Common/Minecraft_Macros.h"
 #include "Minecraft.Client/Common/src/Colours/ColourTable.h"
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.h b/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.h
index 384a4f925..afd305d6d 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.h
+++ b/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.h
@@ -42,7 +42,7 @@ class LivingEntity;
 
 #include "java/File.h"
 #include "Minecraft.World/net/minecraft/network/packet/DisconnectPacket.h"
-#include "Minecraft.World/ConsoleHelpers/C4JThread.h"
+#include "console_helpers/C4JThread.h"
 #include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h"
 #include "4J.Common/4J_Compat.h"
 
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/Options.cpp b/minecraft/Minecraft.Client/net/minecraft/client/Options.cpp
index 3899be8a6..c6402becc 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/Options.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/Options.cpp
@@ -9,7 +9,7 @@
 #include "java/InputOutputStream/FileInputStream.h"
 #include "java/InputOutputStream/FileOutputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/src/Audio/SoundEngine.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.World/net/minecraft/locale/I18n.h"
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/ChatScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/ChatScreen.cpp
index d30086dba..346854798 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/gui/ChatScreen.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/ChatScreen.cpp
@@ -3,7 +3,7 @@
 #include "ChatScreen.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "Minecraft.World/net/minecraft/SharedConstants.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 #include "Minecraft.Client/net/minecraft/client/gui/Gui.h"
 #include "Minecraft.Client/net/minecraft/client/gui/Screen.h"
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/CreateWorldScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/CreateWorldScreen.cpp
index 723b79a6e..a1abfd022 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/gui/CreateWorldScreen.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/CreateWorldScreen.cpp
@@ -6,7 +6,7 @@
 #include "CreateWorldScreen.h"
 #include "EditBox.h"
 #include "Button.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.World/net/minecraft/SharedConstants.h"
 #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h"
 #include "Minecraft.Client/net/minecraft/client/Options.h"
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/DeathScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/DeathScreen.cpp
index 9392d3503..2b9192c2d 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/gui/DeathScreen.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/DeathScreen.cpp
@@ -2,7 +2,7 @@
 #include <string>
 #include <vector>
 
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "DeathScreen.h"
 #include "Button.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/Font.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/Font.cpp
index 6c3b62cb0..652520411 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/gui/Font.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/Font.cpp
@@ -7,7 +7,7 @@
 #include "Minecraft.Client/net/minecraft/client/Options.h"
 #include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h"
 #include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "java/Random.h"
 #include "Minecraft.Client/net/minecraft/client/gui/Font.h"
 #include "4J.Render/4J_Render.h"
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/Gui.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/Gui.cpp
index a338c671d..c5d0f7adf 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/gui/Gui.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/Gui.cpp
@@ -37,7 +37,7 @@
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h"
 #include "Minecraft.Client/net/minecraft/client/gui/Font.h"
 #include "Minecraft.World/net/minecraft/util/Mth.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "4J.Common/4J_Compat.h"
 
 ResourceLocation Gui::PUMPKIN_BLUR_LOCATION =
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/InBedChatScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/InBedChatScreen.cpp
index 15b136d24..194db0fb9 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/gui/InBedChatScreen.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/InBedChatScreen.cpp
@@ -5,7 +5,7 @@
 #include "InBedChatScreen.h"
 #include "Button.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.World/net/minecraft/locale/Language.h"
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 #include "Minecraft.Client/net/minecraft/client/gui/ChatScreen.h"
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/JoinMultiplayerScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/JoinMultiplayerScreen.cpp
index 706012eb9..390de9604 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/gui/JoinMultiplayerScreen.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/JoinMultiplayerScreen.cpp
@@ -4,7 +4,7 @@
 #include "Button.h"
 #include "EditBox.h"
 #include "Minecraft.Client/net/minecraft/client/Options.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.World/net/minecraft/locale/Language.h"
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 #include "Minecraft.Client/net/minecraft/client/gui/Screen.h"
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/NameEntryScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/NameEntryScreen.cpp
index 48c1b7e59..55f721454 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/gui/NameEntryScreen.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/NameEntryScreen.cpp
@@ -2,7 +2,7 @@
 
 #include "NameEntryScreen.h"
 #include "Button.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 #include "Minecraft.Client/net/minecraft/client/gui/Screen.h"
 #include "Minecraft.Client/include/stubs.h"
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/RenameWorldScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/RenameWorldScreen.cpp
index 69e6b1ae6..158cd24ae 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/gui/RenameWorldScreen.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/RenameWorldScreen.cpp
@@ -3,7 +3,7 @@
 #include "RenameWorldScreen.h"
 #include "EditBox.h"
 #include "Button.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.World/net/minecraft/locale/Language.h"
 #include "Minecraft.World/net/minecraft/world/level/storage/LevelStorageSource.h"
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/SelectWorldScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/SelectWorldScreen.cpp
index b4bf723a8..c1cc792e6 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/gui/SelectWorldScreen.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/SelectWorldScreen.cpp
@@ -10,7 +10,7 @@
 #include "4J_Profile.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.World/net/minecraft/locale/Language.h"
 #include "Minecraft.World/net/minecraft/world/level/storage/LevelStorageSource.h"
 #include "Minecraft.World/net/minecraft/world/level/storage/LevelSummary.h"
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/StatsScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/StatsScreen.cpp
index c6a7f7c09..e5449a86f 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/StatsScreen.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/achievement/StatsScreen.cpp
@@ -4,7 +4,7 @@
 #include "Minecraft.Client/net/minecraft/client/gui/Button.h"
 #include "Minecraft.Client/net/minecraft/client/gui/Font.h"
 #include "Minecraft.Client/Common/src/Audio/SoundEngine.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.World/net/minecraft/sounds/SoundTypes.h"
 #include "Minecraft.World/net/minecraft/locale/I18n.h"
 #include "Minecraft.World/net/minecraft/locale/Language.h"
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.cpp b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.cpp
index c87214f39..0192095ca 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.cpp
@@ -1,5 +1,5 @@
 #include "Minecraft.Client/include/stdafx.h"
-#include "Minecraft.World/ConsoleHelpers/PlatformTime.h"
+#include "console_helpers/PlatformTime.h"
 #include "ClientConnection.h"
 #include <cfloat>
 #include <limits>
@@ -55,7 +55,7 @@
 #include "Minecraft.Client/Common/src/Tutorial/TutorialMode.h"
 #include "Minecraft.Client/Common/src/Tutorial/FullTutorialMode.h"
 #include "Minecraft.Client/Common/src/DLC/DLCPack.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "4J_Input.h"
 
 ClientConnection::ClientConnection(Minecraft* minecraft, const std::wstring& ip,
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp
index 99b100386..7927fa57b 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerChunkCache.cpp
@@ -3,7 +3,7 @@
 
 #include "MultiPlayerChunkCache.h"
 #include "Minecraft.Client/net/minecraft/server/level/ServerChunkCache.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h"
 #include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h
index af2754c1d..8b1c06ae5 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h
+++ b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h
@@ -6,7 +6,7 @@
 #include <unordered_set>
 #include <vector>
 
-#include "Minecraft.World/ConsoleHelpers/HashExtension.h"
+#include "console_helpers/HashExtension.h"
 #include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h"
 #include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h"
 #include "java/JavaIntHash.h"
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/particle/ParticleEngine.cpp b/minecraft/Minecraft.Client/net/minecraft/client/particle/ParticleEngine.cpp
index cf5f1273f..70ce3b6ed 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/particle/ParticleEngine.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/particle/ParticleEngine.cpp
@@ -11,7 +11,7 @@
 #include "TerrainParticle.h"
 #include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h"
 #include "Minecraft.Client/net/minecraft/client/Camera.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "4J.Render/4J_Render.h"
 #include "Minecraft.World/net/minecraft/SharedConstants.h"
 #include "Minecraft.World/net/minecraft/world/entity/Entity.h"
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.cpp
index 6c9d77e4a..d52450c51 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.cpp
@@ -34,7 +34,7 @@
 #include "Minecraft.Client/net/minecraft/client/Camera.h"
 #include "Minecraft.World/net/minecraft/sounds/SoundTypes.h"
 #include "Minecraft.Client/net/minecraft/client/model/HumanoidModel.h"
-#include "Minecraft.World/ConsoleHelpers/compression.h"
+#include "console_helpers/compression.h"
 #include "Minecraft.Client/Common/ShutdownManager.h"
 #include "BossMobGuiInfo.h"
 #include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h"
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.h
index a98bf0670..c4459f2cb 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.h
+++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.h
@@ -6,7 +6,7 @@
 #include <vector>
 
 #include "Minecraft.World/net/minecraft/util/SmoothFloat.h"
-#include "Minecraft.World/ConsoleHelpers/C4JThread.h"
+#include "console_helpers/C4JThread.h"
 #include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h"
 #include "Minecraft.Client/Common/App_Defines.h"
 #include "Minecraft.World/net/minecraft/world/phys/Vec3.h"
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.cpp
index 7d7db16f7..93d7d3595 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.cpp
@@ -49,7 +49,7 @@
 #include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h"
 #include "java/JavaMath.h"
 #include "java/System.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h"
 #include "Minecraft.World/net/minecraft/sounds/SoundTypes.h"
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h
index ade9ebc4f..b5f56d3ca 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h
+++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h
@@ -1,10 +1,10 @@
 #pragma once
 #include "Minecraft.World/net/minecraft/world/level/LevelListener.h"
-#include "Minecraft.World/ConsoleHelpers/Definitions.h"
+#include "console_helpers/Definitions.h"
 #include "OffsettedRenderList.h"
 #include "java/JavaIntHash.h"
 #include "Minecraft.World/net/minecraft/world/level/Level.h"
-#include "Minecraft.World/ConsoleHelpers/C4JThread.h"
+#include "console_helpers/C4JThread.h"
 #include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h"
 #include "Minecraft.World/net/minecraft/world/phys/AABB.h"
 #include "Minecraft.Client/include/NetTypes.h"
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Textures.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/Textures.cpp
index 1f3579d50..80055c8b7 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Textures.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/Textures.cpp
@@ -16,7 +16,7 @@
 #include "Minecraft.Client/include/MobSkinMemTextureProcessor.h"
 #include "Minecraft.Client/net/minecraft/client/renderer/texture/PreStitchedTextureMap.h"
 #include "Minecraft.Client/net/minecraft/client/renderer/texture/Texture.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h"
 #include "Minecraft.World/net/minecraft/world/entity/item/ItemEntity.h"
 #include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h"
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/HumanoidMobRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/HumanoidMobRenderer.cpp
index 977a03264..96a9d5528 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/HumanoidMobRenderer.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/HumanoidMobRenderer.cpp
@@ -7,7 +7,7 @@
 #include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h"
 #include "EntityRenderDispatcher.h"
 #include "4J.Render/4J_Render.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.World/net/minecraft/Facing.h"
 #include "Minecraft.World/net/minecraft/SharedConstants.h"
 #include "Minecraft.World/net/minecraft/world/entity/Entity.h"
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.cpp
index 3d883f3f3..724120505 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.cpp
@@ -7,7 +7,7 @@
 #include "Minecraft.Client/net/minecraft/client/renderer/TileRenderer.h"
 #include "EntityRenderDispatcher.h"
 #include "java/JavaMath.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/net/minecraft/client/Options.h"
 #include "Minecraft.Client/net/minecraft/client/renderer/texture/TextureAtlas.h"
 #include "Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.h"
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/StitchSlot.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/StitchSlot.cpp
index 0cb1f6e22..45a35fca2 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/StitchSlot.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/StitchSlot.cpp
@@ -2,7 +2,7 @@
 #include <vector>
 
 #include "TextureHolder.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "StitchSlot.h"
 
 StitchSlot::StitchSlot(int originX, int originY, int width, int height)
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/StitchedTexture.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/StitchedTexture.cpp
index af993dbd4..dfdcdd412 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/StitchedTexture.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/StitchedTexture.cpp
@@ -1,7 +1,7 @@
 #include <stdio.h>
 
 #include "Texture.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/net/minecraft/client/renderer/texture/custom/ClockTexture.h"
 #include "Minecraft.Client/net/minecraft/client/renderer/texture/custom/CompassTexture.h"
 #include "StitchedTexture.h"
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureHolder.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureHolder.cpp
index bb9847cd2..7a31c6d21 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureHolder.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/texture/TextureHolder.cpp
@@ -2,7 +2,7 @@
 
 #include "Stitcher.h"
 #include "Texture.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "TextureHolder.h"
 
 TextureHolder::TextureHolder(Texture* texture) {
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/skins/AbstractTexturePack.cpp b/minecraft/Minecraft.Client/net/minecraft/client/skins/AbstractTexturePack.cpp
index 7e1c1a8a5..0daf55b2e 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/skins/AbstractTexturePack.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/skins/AbstractTexturePack.cpp
@@ -4,7 +4,7 @@
 
 #include "Minecraft.Client/net/minecraft/client/renderer/Textures.h"
 #include "AbstractTexturePack.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/include/BufferedImage.h"
 #include "Minecraft.Client/Common/src/Colours/ColourTable.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.cpp b/minecraft/Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.cpp
index 9d4773a42..ac4e5ae62 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.cpp
@@ -9,7 +9,7 @@
 #include "Minecraft.Client/Common/src/DLC/DLCUIDataFile.h"
 #include "Minecraft.Client/Common/src/DLC/DLCTextureFile.h"
 #include "Minecraft.Client/Common/src/DLC/DLCLocalisationFile.h"
-#include "Minecraft.World/ConsoleHelpers/PortableFileIO.h"
+#include "console_helpers/PortableFileIO.h"
 #include "Minecraft.Client/Common/src/Localisation/StringTable.h"
 #include "Minecraft.Client/Common/src/DLC/DLCAudioFile.h"
 #include "4J_Profile.h"
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/skins/DefaultTexturePack.cpp b/minecraft/Minecraft.Client/net/minecraft/client/skins/DefaultTexturePack.cpp
index a260fd4db..fa2ed3bcc 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/skins/DefaultTexturePack.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/skins/DefaultTexturePack.cpp
@@ -1,7 +1,7 @@
 
 #include "DefaultTexturePack.h"
 #include "Minecraft.Client/net/minecraft/client/renderer/Textures.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 
 DefaultTexturePack::DefaultTexturePack()
     : AbstractTexturePack(0, nullptr, L"Minecraft", nullptr) {
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.cpp b/minecraft/Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.cpp
index 0820d69e4..880ba07fa 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.cpp
@@ -7,7 +7,7 @@
 #include "DLCTexturePack.h"
 #include "Minecraft.Client/net/minecraft/client/Options.h"
 #include "java/File.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/net/minecraft/client/gui/Minimap.h"
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 #include "Minecraft.Client/Common/src/DLC/DLCManager.h"
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/title/TitleScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/title/TitleScreen.cpp
index 978cdf18f..ff01e7468 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/title/TitleScreen.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/title/TitleScreen.cpp
@@ -6,7 +6,7 @@
 #include "Minecraft.Client/net/minecraft/client/gui/SelectWorldScreen.h"
 #include "Minecraft.Client/net/minecraft/client/gui/JoinMultiplayerScreen.h"
 #include "Minecraft.Client/net/minecraft/client/renderer/Textures.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "java/Random.h"
 #include "TitleScreen.h"
 #include "4J.Render/4J_Render.h"
diff --git a/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.cpp b/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.cpp
index 85e65462a..e35a5c4c0 100644
--- a/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.cpp
@@ -27,22 +27,22 @@
 #include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h"
 #include "Minecraft.World/net/minecraft/Pos.h"
 #include "java/System.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
-#include "Minecraft.World/ConsoleHelpers/PlatformTime.h"
+#include "console_helpers/StringHelpers.h"
+#include "console_helpers/PlatformTime.h"
 #if defined(SPLIT_SAVES)
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h"
 #endif
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h"
 #include "Minecraft.Client/Common/src/Network/Socket.h"
 #include "Minecraft.World/net/minecraft/world/entity/net.minecraft.world.entity.h"
 #include "Minecraft.Client/net/minecraft/client/ProgressRenderer.h"
 #include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h"
 #include "Minecraft.Client/net/minecraft/client/renderer/GameRenderer.h"
-#include "Minecraft.World/ConsoleHelpers/ThreadName.h"
+#include "console_helpers/ThreadName.h"
 #include "Minecraft.World/net/minecraft/world/level/chunk/CompressedTileStorage.h"
 #include "Minecraft.World/net/minecraft/world/level/chunk/SparseLightStorage.h"
 #include "Minecraft.World/net/minecraft/world/level/chunk/SparseDataStorage.h"
-#include "Minecraft.World/ConsoleHelpers/compression.h"
+#include "console_helpers/compression.h"
 #include "Minecraft.World/net/minecraft/world/level/biome/BiomeSource.h"
 #include "Minecraft.Client/Common/ShutdownManager.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/UIStructs.h"
diff --git a/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.h b/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.h
index f55f7dd94..01e5c78c6 100644
--- a/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.h
+++ b/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.h
@@ -4,8 +4,8 @@
 
 #include "ConsoleInputSource.h"
 #include "Minecraft.World/net/minecraft/SharedConstants.h"
-#include "Minecraft.World/ConsoleHelpers/C4JThread.h"
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h"
+#include "console_helpers/C4JThread.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
 #include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h"
 
 class ServerConnection;
diff --git a/minecraft/Minecraft.Client/net/minecraft/server/Settings.cpp b/minecraft/Minecraft.Client/net/minecraft/server/Settings.cpp
index 1aa13c156..64855e841 100644
--- a/minecraft/Minecraft.Client/net/minecraft/server/Settings.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/server/Settings.cpp
@@ -1,5 +1,5 @@
 #include "Settings.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 
 // 4J - TODO - serialise/deserialise from file
 Settings::Settings(File* file) {}
diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/EntityTracker.h b/minecraft/Minecraft.Client/net/minecraft/server/level/EntityTracker.h
index 98d191ebb..5c6c1564b 100644
--- a/minecraft/Minecraft.Client/net/minecraft/server/level/EntityTracker.h
+++ b/minecraft/Minecraft.Client/net/minecraft/server/level/EntityTracker.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Minecraft.World/ConsoleHelpers/HashExtension.h"
+#include "console_helpers/HashExtension.h"
 #include "java/JavaIntHash.h"
 
 #include <unordered_set>
diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerChunkCache.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerChunkCache.cpp
index 347e7051a..4695933ed 100644
--- a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerChunkCache.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerChunkCache.cpp
@@ -7,7 +7,7 @@
 #include "ServerLevel.h"
 #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h"
 #include "Minecraft.World/net/minecraft/util/ProgressListener.h"
-#include "Minecraft.World/ConsoleHelpers/compression.h"
+#include "console_helpers/compression.h"
 #include "Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerChunkCache.h b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerChunkCache.h
index 9e60f2197..8c991ebbe 100644
--- a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerChunkCache.h
+++ b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerChunkCache.h
@@ -10,7 +10,7 @@
 #include "Minecraft.World/net/minecraft/world/level/storage/net.minecraft.world.level.storage.h"
 #include "java/JavaIntHash.h"
 #include "Minecraft.World/net/minecraft/world/level/levelgen/RandomLevelSource.h"
-#include "Minecraft.World/ConsoleHelpers/C4JThread.h"
+#include "console_helpers/C4JThread.h"
 #include "Minecraft.World/net/minecraft/world/level/biome/Biome.h"
 #include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h"
 
diff --git a/minecraft/Minecraft.Client/net/minecraft/server/network/ServerConnection.cpp b/minecraft/Minecraft.Client/net/minecraft/server/network/ServerConnection.cpp
index b493543d9..67ddd43e4 100644
--- a/minecraft/Minecraft.Client/net/minecraft/server/network/ServerConnection.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/server/network/ServerConnection.cpp
@@ -6,7 +6,7 @@
 #include "Minecraft.Client/net/minecraft/server/level/ServerPlayer.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.World/net/minecraft/network/Connection.h"
 #include "Minecraft.World/net/minecraft/network/packet/DisconnectPacket.h"
 #include "Minecraft.World/net/minecraft/network/packet/ServerSettingsChangedPacket.h"
diff --git a/minecraft/Minecraft.Client/src/BufferedImage.cpp b/minecraft/Minecraft.Client/src/BufferedImage.cpp
index 96d07b060..0d612a201 100644
--- a/minecraft/Minecraft.Client/src/BufferedImage.cpp
+++ b/minecraft/Minecraft.Client/src/BufferedImage.cpp
@@ -1,5 +1,5 @@
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
-#include "Minecraft.World/ConsoleHelpers/PathHelper.h"
+#include "console_helpers/StringHelpers.h"
+#include "console_helpers/PathHelper.h"
 #include "Minecraft.Client/include/BufferedImage.h"
 #include "4J.Render/4J_Render.h"
 #include "Minecraft.Client/Common/src/DLC/DLCFile.h"
diff --git a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileIO.h b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileIO.h
deleted file mode 100644
index 8dfa17f5e..000000000
--- a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileIO.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#include "FileHeader.h"
-#include "ConsoleSaveFile.h"
-#include "ConsoleSaveFileInputStream.h"
-#include "ConsoleSaveFileOutputStream.h"
-#include "ConsoleSavePath.h"
\ No newline at end of file
diff --git a/minecraft/Minecraft.World/meson.build b/minecraft/Minecraft.World/meson.build
index ca0524f58..aa35455cb 100644
--- a/minecraft/Minecraft.World/meson.build
+++ b/minecraft/Minecraft.World/meson.build
@@ -25,11 +25,6 @@ world_sources = run_command(
   check : true,
 ).stdout().strip().split('\n')
 
-simdutf_dep = dependency('simdutf', 
-  fallback: ['simdutf', 'simdutf_dep'], 
-  default_options: ['utf8=true', 'utf16=true', 'utf32=true']
-)
-
 lib_world = static_library('Minecraft.World',
   world_sources,
   dependencies : [
@@ -37,7 +32,7 @@ lib_world = static_library('Minecraft.World',
     java_dep,
     assets_localisation_dep,
     platform_dep,
-    simdutf_dep,
+    console_helpers_dep,
   ],
   include_directories : include_directories('..'),
   cpp_args : global_cpp_args + global_cpp_defs,
diff --git a/minecraft/Minecraft.World/net/minecraft/network/Connection.cpp b/minecraft/Minecraft.World/net/minecraft/network/Connection.cpp
index 5db3655ff..f2133021d 100644
--- a/minecraft/Minecraft.World/net/minecraft/network/Connection.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/network/Connection.cpp
@@ -5,10 +5,10 @@
 #include "Minecraft.Client/Common/src/Network/Socket.h"
 #include "Connection.h"
 #include "Minecraft.Client/Common/ShutdownManager.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/src/Network/GameNetworkManager.h"
 #include "Minecraft.Client/Common/src/Network/NetworkPlayerInterface.h"
-#include "Minecraft.World/ConsoleHelpers/compression.h"
+#include "console_helpers/compression.h"
 #include "java/InputOutputStream/BufferedOutputStream.h"
 #include "java/InputOutputStream/ByteArrayOutputStream.h"
 #include "java/InputOutputStream/DataInputStream.h"
diff --git a/minecraft/Minecraft.World/net/minecraft/network/Connection.h b/minecraft/Minecraft.World/net/minecraft/network/Connection.h
index 0888cfa79..91697c1f2 100644
--- a/minecraft/Minecraft.World/net/minecraft/network/Connection.h
+++ b/minecraft/Minecraft.World/net/minecraft/network/Connection.h
@@ -10,9 +10,9 @@
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.h"
-#include "Minecraft.World/ConsoleHelpers/C4JThread.h"
+#include "console_helpers/C4JThread.h"
 #include "Minecraft.Client/Common/src/Network/Socket.h"
-#include "Minecraft.World/ConsoleHelpers/C4JThread.h"
+#include "console_helpers/C4JThread.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
 #include "Minecraft.World/net/minecraft/network/packet/DisconnectPacket.h"
 
diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/BlockRegionUpdatePacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/BlockRegionUpdatePacket.cpp
index 950202e7c..5c396f30f 100644
--- a/minecraft/Minecraft.World/net/minecraft/network/packet/BlockRegionUpdatePacket.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/network/packet/BlockRegionUpdatePacket.cpp
@@ -6,7 +6,7 @@
 #include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h"
 #include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "Minecraft.World/ConsoleHelpers/compression.h"
+#include "console_helpers/compression.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "Minecraft.World/net/minecraft/world/level/Level.h"
diff --git a/minecraft/Minecraft.World/net/minecraft/stats/Stat.cpp b/minecraft/Minecraft.World/net/minecraft/stats/Stat.cpp
index 322084bd4..f85786674 100644
--- a/minecraft/Minecraft.World/net/minecraft/stats/Stat.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/stats/Stat.cpp
@@ -6,7 +6,7 @@
 #include "StatFormatter.h"
 #include "Stats.h"
 #include "Stat.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 
 Stat::DefaultFormat* Stat::defaultFormatter = new DefaultFormat();
 Stat::TimeFormatter* Stat::timeFormatter = new TimeFormatter();
diff --git a/minecraft/Minecraft.World/net/minecraft/stats/Stats.cpp b/minecraft/Minecraft.World/net/minecraft/stats/Stats.cpp
index 845194314..876cb4c32 100644
--- a/minecraft/Minecraft.World/net/minecraft/stats/Stats.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/stats/Stats.cpp
@@ -6,7 +6,7 @@
 #include "GeneralStat.h"
 #include "Stats.h"
 #include "Minecraft.Client/net/minecraft/stats/StatsCounter.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.World/net/minecraft/stats/Stat.h"
 #include "Minecraft.World/net/minecraft/world/item/FishingRodItem.h"
 #include "Minecraft.World/net/minecraft/world/item/Item.h"
diff --git a/minecraft/Minecraft.World/net/minecraft/util/HtmlString.cpp b/minecraft/Minecraft.World/net/minecraft/util/HtmlString.cpp
index 9b33da0c6..0ff263299 100644
--- a/minecraft/Minecraft.World/net/minecraft/util/HtmlString.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/util/HtmlString.cpp
@@ -3,7 +3,7 @@
 #include <vector>
 
 #include "HtmlString.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 
 HtmlString::HtmlString(std::wstring text, eMinecraftColour hexColor,
diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/Entity.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/Entity.cpp
index 3ef4ed843..e0cce3fb0 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/entity/Entity.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/entity/Entity.cpp
@@ -19,7 +19,7 @@
 #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h"
 #include "Minecraft.Client/net/minecraft/server/level/ServerLevel.h"
 #include "Minecraft.Client/net/minecraft/server/PlayerList.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/Entity.h b/minecraft/Minecraft.World/net/minecraft/world/entity/Entity.h
index 9031ae452..516ee8e8d 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/entity/Entity.h
+++ b/minecraft/Minecraft.World/net/minecraft/world/entity/Entity.h
@@ -10,7 +10,7 @@
 #include "java/Class.h"
 
 #include "Minecraft.World/net/minecraft/world/phys/Vec3.h"
-#include "Minecraft.World/ConsoleHelpers/Definitions.h"
+#include "console_helpers/Definitions.h"
 #include "Minecraft.World/net/minecraft/world/phys/AABB.h"
 
 class LivingEntity;
diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/Mob.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/Mob.cpp
index 53cde668b..e19436d73 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/entity/Mob.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/entity/Mob.cpp
@@ -12,7 +12,7 @@
 #include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h"
 #include "net/minecraft/world/entity/item/ItemEntity.h"
 #include "net/minecraft/world/entity/Mob.h"
-#include "ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "java/Class.h"
 #include "java/Random.h"
 #include "nbt/CompoundTag.h"
diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.cpp
index de4bad195..7b944bd2c 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/EntityHorse.cpp
@@ -5,7 +5,7 @@
 
 #include "Minecraft.Client/net/minecraft/client/renderer/Textures.h"
 #include "EntityHorse.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h"
 #include "Minecraft.World/net/minecraft/sounds/SoundTypes.h"
diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Ocelot.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Ocelot.cpp
index 35bcca95d..e6e2a6393 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Ocelot.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Ocelot.cpp
@@ -7,7 +7,7 @@
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "Minecraft.World/net/minecraft/stats/GenericStats.h"
 #include "Ocelot.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.World/net/minecraft/sounds/SoundTypes.h"
 #include "java/Random.h"
diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Wolf.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Wolf.cpp
index adcc3febe..1ad2d0bb8 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Wolf.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/entity/animal/Wolf.cpp
@@ -4,7 +4,7 @@
 
 #include "Sheep.h"
 #include "Wolf.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h"
 #include "Minecraft.World/net/minecraft/sounds/SoundTypes.h"
 #include "java/Random.h"
diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/player/Player.h b/minecraft/Minecraft.World/net/minecraft/world/entity/player/Player.h
index 70fc5a5fe..625889693 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/entity/player/Player.h
+++ b/minecraft/Minecraft.World/net/minecraft/world/entity/player/Player.h
@@ -6,14 +6,14 @@
 #include <string>
 
 #include "Minecraft.World/net/minecraft/world/entity/LivingEntity.h"
-#include "Minecraft.World/ConsoleHelpers/Definitions.h"
+#include "console_helpers/Definitions.h"
 #include "Abilities.h"
 #include "Minecraft.World/net/minecraft/world/food/FoodData.h"
 #include "Minecraft.World/net/minecraft/world/inventory/PlayerEnderChestContainer.h"
 #include "Minecraft.World/net/minecraft/commands/CommandSender.h"
 #include "Minecraft.World/net/minecraft/world/scores/ScoreHolder.h"
 #include "4J.Common/4J_Compat.h"
-#include "Minecraft.World/ConsoleHelpers/Definitions.h"
+#include "console_helpers/Definitions.h"
 #include "java/Class.h"
 #include "Minecraft.World/net/minecraft/network/packet/ChatPacket.h"
 #include "Minecraft.World/net/minecraft/world/entity/Entity.h"
diff --git a/minecraft/Minecraft.World/net/minecraft/world/inventory/AnvilMenu.cpp b/minecraft/Minecraft.World/net/minecraft/world/inventory/AnvilMenu.cpp
index 58ed2a795..0b2daa9f7 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/inventory/AnvilMenu.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/inventory/AnvilMenu.cpp
@@ -5,7 +5,7 @@
 #include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h"
 #include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h"
 #include "Minecraft.World/net/minecraft/world/item/enchantment/net.minecraft.world.item.enchantment.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "AnvilMenu.h"
 
 AnvilMenu::AnvilMenu(std::shared_ptr<Inventory> inventory, Level* level, int xt,
diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/FireworksItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/FireworksItem.cpp
index d9b170ac7..60f02f5fe 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/item/FireworksItem.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/item/FireworksItem.cpp
@@ -5,7 +5,7 @@
 #include "net.minecraft.world.item.h"
 #include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h"
 #include "FireworksItem.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 
 const std::wstring FireworksItem::TAG_FIREWORKS = L"Fireworks";
 const std::wstring FireworksItem::TAG_EXPLOSION = L"Explosion";
diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/ItemInstance.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/ItemInstance.cpp
index af36cc137..b7ba2f481 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/item/ItemInstance.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/item/ItemInstance.cpp
@@ -11,7 +11,7 @@
 #include "Item.h"
 #include "Minecraft.World/net/minecraft/util/HtmlString.h"
 #include "Minecraft.World/net/minecraft/world/item/ItemInstance.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.World/net/minecraft/world/item/alchemy/PotionMacros.h"
 #include "nbt/CompoundTag.h"
 #include "nbt/IntTag.h"
diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/MapItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/MapItem.cpp
index b74ee56e9..909e777cc 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/item/MapItem.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/item/MapItem.cpp
@@ -6,7 +6,7 @@
 
 #include "MapItem.h"
 #include "java/JavaMath.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "java/Class.h"
 #include "Minecraft.World/net/minecraft/network/packet/ComplexItemDataPacket.h"
 #include "Minecraft.World/net/minecraft/util/Mth.h"
diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/PotionItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/PotionItem.cpp
index 5677185bb..f16c7afca 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/item/PotionItem.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/item/PotionItem.cpp
@@ -9,7 +9,7 @@
 #include "Minecraft.World/net/minecraft/world/entity/projectile/net.minecraft.world.entity.projectile.h"
 #include "Minecraft.World/net/minecraft/world/net.minecraft.world.h"
 #include "Minecraft.World/net/minecraft/world/effect/MobEffectInstance.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.World/net/minecraft/SharedConstants.h"
 #include "PotionItem.h"
 #include "Minecraft.World/net/minecraft/sounds/SoundTypes.h"
diff --git a/minecraft/Minecraft.World/net/minecraft/world/item/SpawnEggItem.cpp b/minecraft/Minecraft.World/net/minecraft/world/item/SpawnEggItem.cpp
index 41cd6925f..3291d72fb 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/item/SpawnEggItem.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/item/SpawnEggItem.cpp
@@ -14,7 +14,7 @@
 #include "Minecraft.World/net/minecraft/util/Mth.h"
 #include "Minecraft.Client/Common/src/Colours/ColourTable.h"
 
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 
 SpawnEggItem::SpawnEggItem(int id) : Item(id) {
     setMaxStackSize(16);  // 4J-PB brought forward. It is 64 on PC, but we'll
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/ChunkPos.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/ChunkPos.cpp
index 9fe462106..89c4a9f31 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/ChunkPos.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/ChunkPos.cpp
@@ -4,7 +4,7 @@
 #include <string>
 
 #include "Minecraft.World/net/minecraft/world/level/ChunkPos.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.World/net/minecraft/world/entity/Entity.h"
 #include "Minecraft.World/net/minecraft/world/level/ChunkPos.h"
 #include "Minecraft.World/net/minecraft/world/level/TilePos.h"
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/Level.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/Level.cpp
index 81bdfe3d8..346766f9b 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/Level.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/Level.cpp
@@ -11,7 +11,7 @@
 #include "Explosion.h"
 #include "LevelListener.h"
 #include "Level.h"
-#include "ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFile.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 #include "Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h"
 #include "Minecraft.Client/include/FrameProfiler.h"
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/Level.h b/minecraft/Minecraft.World/net/minecraft/world/level/Level.h
index a3d28bd79..1b84a29a7 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/Level.h
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/Level.h
@@ -14,10 +14,10 @@
 #include "ChunkPos.h"
 #include "TickNextTickData.h"
 #include "Minecraft.World/net/minecraft/world/level/saveddata/SavedData.h"
-#include "Minecraft.World/ConsoleHelpers/Definitions.h"
+#include "console_helpers/Definitions.h"
 #include "Minecraft.World/net/minecraft/core/particles/ParticleTypes.h"
 #include "Minecraft.World/net/minecraft/world/level/biome/Biome.h"
-#include "Minecraft.World/ConsoleHelpers/C4JThread.h"
+#include "console_helpers/C4JThread.h"
 #include "4J.Common/4J_Compat.h"
 #include "java/Class.h"
 #include "Minecraft.World/net/minecraft/world/level/ChunkPos.h"
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/CompressedTileStorage.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/CompressedTileStorage.cpp
index c768eb59c..c90d9a3b5 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/CompressedTileStorage.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/CompressedTileStorage.cpp
@@ -4,7 +4,7 @@
 #include <vector>
 
 #include "CompressedTileStorage.h"
-#include "Minecraft.World/ConsoleHelpers/Definitions.h"
+#include "console_helpers/Definitions.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/EmptyLevelChunk.h b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/EmptyLevelChunk.h
index 4ce3ce5a1..435664ca2 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/EmptyLevelChunk.h
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/EmptyLevelChunk.h
@@ -5,7 +5,7 @@
 #include <typeinfo>
 
 #include "LevelChunk.h"
-#include "Minecraft.World/ConsoleHelpers/Definitions.h"
+#include "console_helpers/Definitions.h"
 #include "Minecraft.World/net/minecraft/world/level/LightLayer.h"
 
 class Level;
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/WaterLevelChunk.h b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/WaterLevelChunk.h
index 24a05e4ec..3e97d316c 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/WaterLevelChunk.h
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/WaterLevelChunk.h
@@ -5,7 +5,7 @@
 #include <typeinfo>
 
 #include "LevelChunk.h"
-#include "Minecraft.World/ConsoleHelpers/Definitions.h"
+#include "console_helpers/Definitions.h"
 #include "Minecraft.World/net/minecraft/world/level/LightLayer.h"
 
 class Level;
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp
index 0f970c969..8f48d9d5d 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp
@@ -5,18 +5,18 @@
 #include <chrono>
 #include <utility>
 
-#include "Minecraft.World/ConsoleHelpers/ThreadName.h"
+#include "console_helpers/ThreadName.h"
 #include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h"
 #include "McRegionChunkStorage.h"
-#include "Minecraft.World/ConsoleHelpers/C4JThread.h"
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFile.h"
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h"
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h"
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSavePath.h"
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h"
+#include "console_helpers/C4JThread.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
 #include "Minecraft.Client/Common/src/Console_Debug_enum.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "Minecraft.World/ConsoleHelpers/compression.h"
+#include "console_helpers/compression.h"
 #include "java/InputOutputStream/BufferedOutputStream.h"
 #include "java/InputOutputStream/ByteArrayInputStream.h"
 #include "java/InputOutputStream/ByteArrayOutputStream.h"
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.cpp
index 8530c8109..a0a80c383 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.cpp
@@ -9,8 +9,8 @@
 
 #include "java/File.h"
 #include "OldChunkStorage.h"
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h"
-#include "Minecraft.World/ConsoleHelpers/Definitions.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
+#include "console_helpers/Definitions.h"
 #include "Minecraft.Client/Common/src/Console_Debug_enum.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "java/InputOutputStream/DataInputStream.h"
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.cpp
index f31350314..25ae635e9 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.cpp
@@ -6,10 +6,10 @@
 #include "java/System.h"
 #include "java/File.h"
 #include "RegionFile.h"
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFile.h"
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
-#include "Minecraft.World/ConsoleHelpers/compression.h"
+#include "console_helpers/compression.h"
 #include "java/InputOutputStream/ByteArrayInputStream.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.h b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.h
index 75077c917..f69cdfe09 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.h
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.h
@@ -3,7 +3,7 @@
 #include <format>
 #include <vector>
 
-#include "Minecraft.World/ConsoleHelpers/compression.h"
+#include "console_helpers/compression.h"
 #include "java/InputOutputStream/InputOutputStream.h"
 #include "java/InputOutputStream/ByteArrayOutputStream.h"
 
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFileCache.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFileCache.cpp
index 6a739e13a..d93df099b 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFileCache.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFileCache.cpp
@@ -2,8 +2,8 @@
 
 #include "java/File.h"
 #include "RegionFileCache.h"
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFile.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.h"
 
 class DataInputStream;
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFileCache.h b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFileCache.h
index 9f106dbae..eab2a6670 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFileCache.h
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFileCache.h
@@ -5,7 +5,7 @@
 #include "RegionFile.h"
 #include "java/Reference.h"
 #include "java/File.h"
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
 
 class ConsoleSaveFile;
 class DataInputStream;
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/RandomLevelSource.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/RandomLevelSource.cpp
index e33686213..60290d9ed 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/RandomLevelSource.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/RandomLevelSource.cpp
@@ -2,7 +2,7 @@
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
-#include "Minecraft.World/ConsoleHelpers/PlatformTime.h"
+#include "console_helpers/PlatformTime.h"
 #include "java/Random.h"
 #include "Minecraft.World/net/minecraft/util/Mth.h"
 #include "Minecraft.World/net/minecraft/world/entity/MobCategory.h"
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/flat/FlatGeneratorInfo.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/flat/FlatGeneratorInfo.cpp
index f6e8ca718..75a719ed8 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/flat/FlatGeneratorInfo.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/flat/FlatGeneratorInfo.cpp
@@ -1,5 +1,5 @@
 #include "FlatGeneratorInfo.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.World/net/minecraft/world/level/biome/Biome.h"
 #include "Minecraft.World/net/minecraft/world/level/levelgen/flat/FlatLayerInfo.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/flat/FlatLayerInfo.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/flat/FlatLayerInfo.cpp
index fcb85bf4e..a5cb28666 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/flat/FlatLayerInfo.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/flat/FlatLayerInfo.cpp
@@ -1,5 +1,5 @@
 #include "FlatLayerInfo.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 
 void FlatLayerInfo::_init(int height, int id) {
     this->height = height;
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.cpp
index a353469ee..3c100a944 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.cpp
@@ -6,7 +6,7 @@
 #include "BoundingBox.h"
 #include "Minecraft.World/net/minecraft/Direction.h"
 #include "java/JavaMath.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "nbt/IntArrayTag.h"
 #include "Minecraft.World/net/minecraft/world/level/levelgen/structure/BoundingBox.h"
 
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdPieces.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdPieces.cpp
index e0274ede7..20d7b54e3 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdPieces.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StrongholdPieces.cpp
@@ -6,8 +6,8 @@
 #include "StrongholdPieces.h"
 #include "Minecraft.World/net/minecraft/util/WeighedTreasure.h"
 #include "Minecraft.World/net/minecraft/Facing.h"
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "java/Random.h"
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.cpp
index 6075799a3..43a35bd59 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.cpp
@@ -1,7 +1,7 @@
 #include <string>
 
 #include "StructureFeatureSavedData.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "nbt/CompoundTag.h"
 #include "Minecraft.World/net/minecraft/world/level/levelgen/structure/StructureFeatureSavedData.h"
 #include "Minecraft.World/net/minecraft/world/level/saveddata/SavedData.h"
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/Node.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/Node.cpp
index c69a9c7e2..a6d4e5f01 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/Node.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/pathfinder/Node.cpp
@@ -4,7 +4,7 @@
 #include <stdint.h>
 #include <string>
 
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.World/net/minecraft/util/Mth.h"
 #include "Minecraft.World/net/minecraft/world/level/pathfinder/Node.h"
 
diff --git a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFile.h b/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h
similarity index 92%
rename from minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFile.h
rename to minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h
index 25f2c4803..871740ff7 100644
--- a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFile.h
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h
@@ -3,8 +3,8 @@
 #include <string>
 #include "java/File.h"
 
-#include "FileHeader.h"
-#include "ConsoleSavePath.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h"
 
 enum class SaveFileSeekOrigin { Begin, Current, End };
 
diff --git a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp
similarity index 98%
rename from minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp
rename to minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp
index ae867a9ac..7c92b022c 100644
--- a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.cpp
@@ -1,7 +1,7 @@
 #include "Minecraft.World/net/minecraft/world/level/chunk/storage/net.minecraft.world.level.chunk.storage.h"
 #include "Minecraft.World/net/minecraft/world/level/storage/net.minecraft.world.level.storage.h"
-#include "ConsoleSaveFileIO.h"
-#include "ConsoleSaveFileConverter.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileIO.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.h"
 #include "Minecraft.World/net/minecraft/util/ProgressListener.h"
 #include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h"
 
diff --git a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileConverter.h b/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.h
similarity index 100%
rename from minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileConverter.h
rename to minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.h
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileIO.h b/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileIO.h
new file mode 100644
index 000000000..f430eeb9a
--- /dev/null
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileIO.h
@@ -0,0 +1,7 @@
+#pragma once
+
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h"
\ No newline at end of file
diff --git a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileInputStream.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.cpp
similarity index 95%
rename from minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileInputStream.cpp
rename to minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.cpp
index 0e0e43910..07b2df05f 100644
--- a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileInputStream.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.cpp
@@ -2,8 +2,8 @@
 #include <cstdint>
 #include <vector>
 
-#include "ConsoleSaveFile.h"
-#include "ConsoleSaveFileInputStream.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h"
 
 class ConsoleSavePath;
 
diff --git a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h b/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h
similarity index 89%
rename from minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h
rename to minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h
index 71520bebb..9cde5f475 100644
--- a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h
@@ -5,7 +5,7 @@
 #include <stdint.h>
 
 #include "java/InputOutputStream/InputStream.h"
-#include "ConsoleSavePath.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h"
 
 class ConsoleSaveFile;
 class FileEntry;
diff --git a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp
similarity index 98%
rename from minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp
rename to minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp
index 166d2267e..6a9802359 100644
--- a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp
@@ -9,8 +9,8 @@
 #include <format>
 #include <vector>
 
-#include "Minecraft.World/ConsoleHelpers/PortableFileIO.h"
-#include "ConsoleSaveFileOriginal.h"
+#include "console_helpers/PortableFileIO.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h"
 #include "java/File.h"
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h"
@@ -19,13 +19,13 @@
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h"
 #include "4J.Common/4J_Compat.h"
 #include "platform/IPlatformStorage.h"
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFile.h"
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSavePath.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/src/BuildVer/BuildVer.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
-#include "Minecraft.World/ConsoleHelpers/compression.h"
+#include "console_helpers/compression.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "java/System.h"
diff --git a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h b/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h
similarity index 89%
rename from minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h
rename to minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h
index d6b7cd8e7..3cc02ee43 100644
--- a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h
@@ -2,11 +2,11 @@
 #include <mutex>
 #include <string>
 
-#include "FileHeader.h"
-#include "ConsoleSavePath.h"
-#include "ConsoleSaveFile.h"
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h"
-#include "Minecraft.World/ConsoleHelpers/Definitions.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
+#include "console_helpers/Definitions.h"
 
 class ConsoleSaveFileOriginal : public ConsoleSaveFile {
 private:
diff --git a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.cpp
similarity index 95%
rename from minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.cpp
rename to minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.cpp
index b5d8dd198..75bd7cfc6 100644
--- a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.cpp
@@ -2,8 +2,8 @@
 #include <cstdint>
 #include <vector>
 
-#include "ConsoleSaveFileOutputStream.h"
-#include "ConsoleSaveFile.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
 
 class ConsoleSavePath;
 
diff --git a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h b/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h
similarity index 89%
rename from minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h
rename to minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h
index bd9cb796f..7c5269c7f 100644
--- a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h
@@ -5,7 +5,7 @@
 #include <stdint.h>
 
 #include "java/InputOutputStream/OutputStream.h"
-#include "ConsoleSavePath.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h"
 
 class ConsoleSaveFile;
 class FileEntry;
diff --git a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp
similarity index 99%
rename from minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp
rename to minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp
index df4d458c1..1d444c7a0 100644
--- a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp
@@ -9,9 +9,9 @@
 #include <format>
 #include <utility>
 
-#include "Minecraft.World/ConsoleHelpers/PortableFileIO.h"
-#include "ConsoleSaveFileSplit.h"
-#include "ConsoleSaveFileConverter.h"
+#include "console_helpers/PortableFileIO.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileConverter.h"
 #include "java/File.h"
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h"
@@ -20,15 +20,15 @@
 #include "Minecraft.Client/Common/src/GameRules/LevelGeneration/LevelGenerationOptions.h"
 #include "4J.Common/4J_Compat.h"
 #include "platform/IPlatformStorage.h"
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFile.h"
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSavePath.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/App_enums.h"
 #include "Minecraft.Client/Common/src/BuildVer/BuildVer.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
-#include "Minecraft.World/ConsoleHelpers/compression.h"
-#include "Minecraft.World/ConsoleHelpers/PlatformTime.h"
+#include "console_helpers/compression.h"
+#include "console_helpers/PlatformTime.h"
 #include <ctime>
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
diff --git a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.h b/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h
similarity index 93%
rename from minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.h
rename to minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h
index 11678bd3d..656651318 100644
--- a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.h
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileSplit.h
@@ -5,11 +5,11 @@
 #include <unordered_map>
 #include <vector>
 
-#include "FileHeader.h"
-#include "ConsoleSavePath.h"
-#include "ConsoleSaveFile.h"
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h"
-#include "Minecraft.World/ConsoleHelpers/Definitions.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
+#include "console_helpers/Definitions.h"
 
 class ProgressRenderer;
 class ProgressListener;
diff --git a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSavePath.h b/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h
similarity index 100%
rename from minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSavePath.h
rename to minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h
diff --git a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.cpp
similarity index 98%
rename from minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.cpp
rename to minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.cpp
index e02b16982..c3768bbfb 100644
--- a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.cpp
@@ -10,9 +10,9 @@
 #include <string>
 #include <vector>
 
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h"
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h"
-#include "Minecraft.World/ConsoleHelpers/Definitions.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
+#include "console_helpers/Definitions.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
 #include "java/System.h"
diff --git a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h b/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h
similarity index 91%
rename from minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h
rename to minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h
index 5e9fa22d0..4bd87962b 100644
--- a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h
@@ -1,10 +1,17 @@
 #pragma once
 
-#include "java/System.h"
-#include "Minecraft.World/ConsoleHelpers/Definitions.h"
+#include "console_helpers/Definitions.h"
 
 #include <cstring>
 #include <string>
+#include <vector>
+#include <chrono>
+
+#define MAKE_FOURCC(ch0, ch1, ch2, ch3)                                   \
+    (static_cast<std::uint32_t>(static_cast<std::uint8_t>(ch0)) |         \
+     (static_cast<std::uint32_t>(static_cast<std::uint8_t>(ch1)) << 8) |  \
+     (static_cast<std::uint32_t>(static_cast<std::uint8_t>(ch2)) << 16) | \
+     (static_cast<std::uint32_t>(static_cast<std::uint8_t>(ch3)) << 24))
 
 // The first 4 bytes is the location of the header (the header itself is at the
 // end of the file) Then 4 bytes for the size of the header Then 2 bytes for the
@@ -132,7 +139,8 @@ public:
     }  // When using ConsoleSaveFileSplit only
 
     void updateLastModifiedTime() {
-        data.lastModifiedTime = System::currentRealTimeMillis();
+        auto now = std::chrono::system_clock::now().time_since_epoch();
+        data.lastModifiedTime = std::chrono::duration_cast<std::chrono::milliseconds>(now).count();
     }
 
     /*
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorage.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorage.cpp
index a6c65701e..4d28ea504 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorage.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorage.cpp
@@ -12,12 +12,12 @@
 #include "LevelData.h"
 #include "DirectoryLevelStorage.h"
 #include "platform/IPlatformStorage.h"
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFile.h"
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h"
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h"
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSavePath.h"
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.Client/Common/src/Console_Debug_enum.h"
 #include "Minecraft.Client/Common/src/GameRules/GameRuleManager.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorage.h b/minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorage.h
index 42aaf63ee..feced3664 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorage.h
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorage.h
@@ -35,7 +35,7 @@
 
 #include "LevelStorage.h"
 #include "PlayerIO.h"
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSavePath.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h"
 #include "4J.Common/4J_Compat.h"
 
 class ConsoleSaveFile;
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorageSource.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorageSource.cpp
index e993b3a74..b14debb83 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorageSource.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorageSource.cpp
@@ -5,11 +5,11 @@
 #include "LevelData.h"
 #include "DirectoryLevelStorage.h"
 #include "DirectoryLevelStorageSource.h"
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h"
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFile.h"
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h"
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h"
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSavePath.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h"
 #include "nbt/CompoundTag.h"
 #include "nbt/NbtIo.h"
 
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelStorage.h b/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelStorage.h
index 43d562b2a..4eb6a476c 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelStorage.h
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelStorage.h
@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSavePath.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h"
 #include "4J.Common/4J_Compat.h"
 
 class PlayerIO;
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelStorageProfilerDecorator.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelStorageProfilerDecorator.cpp
index 8430a5a58..94476edaf 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelStorageProfilerDecorator.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/LevelStorageProfilerDecorator.cpp
@@ -1,5 +1,5 @@
 #include "LevelStorageProfilerDecorator.h"
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSavePath.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h"
 #include "Minecraft.World/net/minecraft/world/level/chunk/storage/ChunkStorageProfileDecorator.h"
 #include "Minecraft.World/net/minecraft/world/level/storage/LevelStorage.h"
 
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/McRegionLevelStorage.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/storage/McRegionLevelStorage.cpp
index ee22cf277..a6f1c3078 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/McRegionLevelStorage.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/McRegionLevelStorage.cpp
@@ -5,8 +5,8 @@
 #include "LevelData.h"
 #include "java/File.h"
 #include "McRegionLevelStorage.h"
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFile.h"
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.World/net/minecraft/world/level/chunk/storage/McRegionChunkStorage.h"
 #include "Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFileCache.h"
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/MemoryLevelStorage.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/storage/MemoryLevelStorage.cpp
index e3fcb3355..3f3fedd23 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/MemoryLevelStorage.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/MemoryLevelStorage.cpp
@@ -5,7 +5,7 @@
 #include "nbt/com.mojang.nbt.h"
 #include "MemoryLevelStorage.h"
 
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileIO.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileIO.h"
 
 MemoryLevelStorage::MemoryLevelStorage() {}
 
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/MemoryLevelStorage.h b/minecraft/Minecraft.World/net/minecraft/world/level/storage/MemoryLevelStorage.h
index 02c645e5a..90594f051 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/MemoryLevelStorage.h
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/MemoryLevelStorage.h
@@ -9,7 +9,7 @@
 #include "Minecraft.World/net/minecraft/world/level/dimension/net.minecraft.world.level.dimension.h"
 #include "nbt/com.mojang.nbt.h"
 
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFile.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
 
 class MemoryLevelStorage : public LevelStorage, public PlayerIO {
 public:
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/MockedLevelStorage.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/storage/MockedLevelStorage.cpp
index 25e48cfd9..6e66507fe 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/MockedLevelStorage.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/MockedLevelStorage.cpp
@@ -1,5 +1,5 @@
 #include "MockedLevelStorage.h"
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSavePath.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h"
 
 LevelData* MockedLevelStorage::prepareLevel() { return nullptr; }
 
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/MockedLevelStorage.h b/minecraft/Minecraft.World/net/minecraft/world/level/storage/MockedLevelStorage.h
index 694ffcf9f..18f5a1761 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/MockedLevelStorage.h
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/MockedLevelStorage.h
@@ -3,7 +3,7 @@
 #include <string>
 
 #include "LevelStorage.h"
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSavePath.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h"
 
 class MockedLevelStorage : public LevelStorage {
 public:
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/SavedDataStorage.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/storage/SavedDataStorage.cpp
index 4ca206b27..dbacad519 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/SavedDataStorage.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/SavedDataStorage.cpp
@@ -3,10 +3,10 @@
 #include <utility>
 
 #include "SavedDataStorage.h"
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFile.h"
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h"
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h"
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSavePath.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFile.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileInputStream.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSaveFileOutputStream.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/ConsoleSavePath.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BaseRailTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/BaseRailTile.h
index 45725d833..c10bd6a06 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/BaseRailTile.h
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/BaseRailTile.h
@@ -4,7 +4,7 @@
 
 #include "Tile.h"
 #include "Minecraft.World/net/minecraft/world/level/TilePos.h"
-#include "Minecraft.World/ConsoleHelpers/Definitions.h"
+#include "console_helpers/Definitions.h"
 
 class Random;
 class HitResult;
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ButtonTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/ButtonTile.h
index 3f2530c3d..f3596547a 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ButtonTile.h
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/ButtonTile.h
@@ -2,7 +2,7 @@
 #include <memory>
 
 #include "Tile.h"
-#include "Minecraft.World/ConsoleHelpers/Definitions.h"
+#include "console_helpers/Definitions.h"
 
 class Player;
 class Random;
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CactusTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/CactusTile.h
index 3525c34de..9c380732b 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CactusTile.h
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/CactusTile.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "Tile.h"
 #include "Minecraft.World/net/minecraft/world/level/material/Material.h"
-#include "Minecraft.World/ConsoleHelpers/Definitions.h"
+#include "console_helpers/Definitions.h"
 
 class Random;
 class Level;
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CakeTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/CakeTile.h
index c12a1b248..3f9d37e7c 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CakeTile.h
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/CakeTile.h
@@ -3,7 +3,7 @@
 
 #include "Tile.h"
 #include "Minecraft.World/net/minecraft/world/level/material/Material.h"
-#include "Minecraft.World/ConsoleHelpers/Definitions.h"
+#include "console_helpers/Definitions.h"
 
 class Player;
 class Random;
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CarrotTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/CarrotTile.cpp
index bab472dc2..bd417c6c5 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CarrotTile.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/CarrotTile.cpp
@@ -1,7 +1,7 @@
 #include <string>
 
 #include "CarrotTile.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.World/net/minecraft/world/IconRegister.h"
 #include "Minecraft.World/net/minecraft/world/item/Item.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/CropTile.h"
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CropTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/CropTile.cpp
index c9235eb3c..fbaa74db6 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/CropTile.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/CropTile.cpp
@@ -2,7 +2,7 @@
 #include <string>
 
 #include "CropTile.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "java/Random.h"
 #include "Minecraft.World/net/minecraft/world/IconRegister.h"
 #include "Minecraft.World/net/minecraft/world/item/Item.h"
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DoorTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/DoorTile.h
index 2ec116712..3888b4bd2 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/DoorTile.h
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/DoorTile.h
@@ -3,7 +3,7 @@
 #include <string>
 
 #include "Tile.h"
-#include "Minecraft.World/ConsoleHelpers/Definitions.h"
+#include "console_helpers/Definitions.h"
 
 class Player;
 class HitResult;
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FarmTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/FarmTile.h
index 9801e0136..4bdb1cad4 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FarmTile.h
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/FarmTile.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "Tile.h"
-#include "Minecraft.World/ConsoleHelpers/Definitions.h"
+#include "console_helpers/Definitions.h"
 
 class Random;
 class ChunkRebuildData;
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FenceTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/FenceTile.h
index 2313bc5a8..9af0664ba 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FenceTile.h
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/FenceTile.h
@@ -3,7 +3,7 @@
 #include <string>
 
 #include "Tile.h"
-#include "Minecraft.World/ConsoleHelpers/Definitions.h"
+#include "console_helpers/Definitions.h"
 
 class LevelSource;
 class Material;
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FireTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/FireTile.h
index 20e7d6a23..e1cb2ab83 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/FireTile.h
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/FireTile.h
@@ -2,7 +2,7 @@
 #include <string>
 
 #include "Tile.h"
-#include "Minecraft.World/ConsoleHelpers/Definitions.h"
+#include "console_helpers/Definitions.h"
 
 class Random;
 class ChunkRebuildData;
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LadderTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/LadderTile.h
index f7396aaed..ead47ba02 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LadderTile.h
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/LadderTile.h
@@ -2,7 +2,7 @@
 #include <memory>
 
 #include "Tile.h"
-#include "Minecraft.World/ConsoleHelpers/Definitions.h"
+#include "console_helpers/Definitions.h"
 
 class Random;
 
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTile.h
index b00a56c2e..7ecc3c654 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTile.h
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/LiquidTile.h
@@ -3,7 +3,7 @@
 #include <string>
 
 #include "Tile.h"
-#include "Minecraft.World/ConsoleHelpers/Definitions.h"
+#include "console_helpers/Definitions.h"
 #include "Minecraft.World/net/minecraft/world/phys/Vec3.h"
 
 class Random;
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/NetherWartTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/NetherWartTile.cpp
index b2e300d11..635fcf69a 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/NetherWartTile.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/NetherWartTile.cpp
@@ -2,7 +2,7 @@
 #include <string>
 
 #include "NetherWartTile.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "java/Random.h"
 #include "Minecraft.World/net/minecraft/world/IconRegister.h"
 #include "Minecraft.World/net/minecraft/world/item/Item.h"
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PlantTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/PlantTile.h
index 60a10fbda..446f1f9ca 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PlantTile.h
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/PlantTile.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "Tile.h"
 #include "Minecraft.World/net/minecraft/world/level/material/Material.h"
-#include "Minecraft.World/ConsoleHelpers/Definitions.h"
+#include "console_helpers/Definitions.h"
 
 class Random;
 class Level;
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PortalTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/PortalTile.h
index 8387fd160..8e88240ef 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PortalTile.h
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/PortalTile.h
@@ -3,7 +3,7 @@
 #include <memory>
 
 #include "HalfTransparentTile.h"
-#include "Minecraft.World/ConsoleHelpers/Definitions.h"
+#include "console_helpers/Definitions.h"
 
 class Random;
 class Level;
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PotatoTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/PotatoTile.cpp
index 21f5c2be4..7af8cd87e 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/PotatoTile.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/PotatoTile.cpp
@@ -2,7 +2,7 @@
 #include <string>
 
 #include "PotatoTile.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "java/Random.h"
 #include "Minecraft.World/net/minecraft/world/IconRegister.h"
 #include "Minecraft.World/net/minecraft/world/item/Item.h"
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneDustTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneDustTile.h
index a84b988b7..0ae3e45fd 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneDustTile.h
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/RedStoneDustTile.h
@@ -4,7 +4,7 @@
 #include <unordered_set>
 
 #include "Tile.h"
-#include "Minecraft.World/ConsoleHelpers/Definitions.h"
+#include "console_helpers/Definitions.h"
 #include "Minecraft.World/net/minecraft/world/level/TilePos.h"
 
 class Random;
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ReedTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/ReedTile.h
index 2d436d820..a20c444a6 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ReedTile.h
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/ReedTile.h
@@ -3,7 +3,7 @@
 #include <optional>
 
 #include "Tile.h"
-#include "Minecraft.World/ConsoleHelpers/Definitions.h"
+#include "console_helpers/Definitions.h"
 
 class Random;
 class Level;
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SkullTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/SkullTile.cpp
index 4b3a58d03..8f1662277 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SkullTile.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/SkullTile.cpp
@@ -6,7 +6,7 @@
 #include "Minecraft.World/net/minecraft/world/entity/boss/wither/WitherBoss.h"
 #include "Minecraft.World/net/minecraft/net.minecraft.h"
 #include "SkullTile.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Minecraft.World/net/minecraft/util/Mth.h"
 
 SkullTile::SkullTile(int id) : BaseEntityTile(id, Material::decoration, false) {
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SoulSandTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/SoulSandTile.h
index 0f33d471a..2ebfc1c4c 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/SoulSandTile.h
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/SoulSandTile.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "Tile.h"
-#include "Minecraft.World/ConsoleHelpers/Definitions.h"
+#include "console_helpers/Definitions.h"
 
 class SoulSandTile : public Tile {
 public:
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ThinFenceTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/ThinFenceTile.h
index 4cf8a79a8..8722bac79 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/ThinFenceTile.h
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/ThinFenceTile.h
@@ -3,7 +3,7 @@
 #include <string>
 
 #include "Tile.h"
-#include "Minecraft.World/ConsoleHelpers/Definitions.h"
+#include "console_helpers/Definitions.h"
 
 class Icon;
 class Material;
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/Tile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/Tile.cpp
index 336c837ae..601eb02e2 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/Tile.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/Tile.cpp
@@ -17,7 +17,7 @@
 #include "Minecraft.World/net/minecraft/world/net.minecraft.world.h"
 #include "Minecraft.World/net/minecraft/net.minecraft.h"
 #include "Minecraft.World/net/minecraft/world/phys/Vec3.h"
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 #include "Tile.h"
 
 std::wstring Tile::TILE_DESCRIPTION_PREFIX = L"Tile.";
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/Tile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/Tile.h
index 9c97b4390..e66ea53be 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/Tile.h
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/Tile.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "Minecraft.World/net/minecraft/world/level/material/Material.h"
 #include "Minecraft.World/net/minecraft/world/phys/Vec3.h"
-#include "Minecraft.World/ConsoleHelpers/Definitions.h"
+#include "console_helpers/Definitions.h"
 #include "Minecraft.World/net/minecraft/sounds/SoundTypes.h"
 #include <cstdint>
 #include <optional>
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TorchTile.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TorchTile.h
index 65f876e7e..997e9dcab 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/TorchTile.h
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/TorchTile.h
@@ -2,7 +2,7 @@
 #include <memory>
 
 #include "Tile.h"
-#include "Minecraft.World/ConsoleHelpers/Definitions.h"
+#include "console_helpers/Definitions.h"
 
 class Random;
 class HitResult;
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h
index 81c8f8a57..5da51f5d1 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h
@@ -4,7 +4,7 @@
 #include <string>
 #include <unordered_map>
 
-#include "Minecraft.World/ConsoleHelpers/HashExtension.h"
+#include "console_helpers/HashExtension.h"
 #include "java/JavaIntHash.h"
 #include "java/Class.h"
 
diff --git a/minecraft/Minecraft.World/net/minecraft/world/phys/AABB.h b/minecraft/Minecraft.World/net/minecraft/world/phys/AABB.h
index 27b089d75..d170feae0 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/phys/AABB.h
+++ b/minecraft/Minecraft.World/net/minecraft/world/phys/AABB.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Vec3.h"
-#include "Minecraft.World/ConsoleHelpers/Definitions.h"
+#include "console_helpers/Definitions.h"
 
 class HitResult;
 
diff --git a/minecraft/Minecraft.World/ConsoleHelpers/C4JThread.h b/minecraft/console_helpers/include/console_helpers/C4JThread.h
similarity index 100%
rename from minecraft/Minecraft.World/ConsoleHelpers/C4JThread.h
rename to minecraft/console_helpers/include/console_helpers/C4JThread.h
diff --git a/minecraft/Minecraft.World/ConsoleHelpers/Definitions.h b/minecraft/console_helpers/include/console_helpers/Definitions.h
similarity index 100%
rename from minecraft/Minecraft.World/ConsoleHelpers/Definitions.h
rename to minecraft/console_helpers/include/console_helpers/Definitions.h
diff --git a/minecraft/Minecraft.World/ConsoleHelpers/HashExtension.h b/minecraft/console_helpers/include/console_helpers/HashExtension.h
similarity index 100%
rename from minecraft/Minecraft.World/ConsoleHelpers/HashExtension.h
rename to minecraft/console_helpers/include/console_helpers/HashExtension.h
diff --git a/minecraft/Minecraft.World/ConsoleHelpers/PathHelper.h b/minecraft/console_helpers/include/console_helpers/PathHelper.h
similarity index 100%
rename from minecraft/Minecraft.World/ConsoleHelpers/PathHelper.h
rename to minecraft/console_helpers/include/console_helpers/PathHelper.h
diff --git a/minecraft/Minecraft.World/ConsoleHelpers/PerformanceTimer.h b/minecraft/console_helpers/include/console_helpers/PerformanceTimer.h
similarity index 100%
rename from minecraft/Minecraft.World/ConsoleHelpers/PerformanceTimer.h
rename to minecraft/console_helpers/include/console_helpers/PerformanceTimer.h
diff --git a/minecraft/Minecraft.World/ConsoleHelpers/PlatformTime.h b/minecraft/console_helpers/include/console_helpers/PlatformTime.h
similarity index 100%
rename from minecraft/Minecraft.World/ConsoleHelpers/PlatformTime.h
rename to minecraft/console_helpers/include/console_helpers/PlatformTime.h
diff --git a/minecraft/Minecraft.World/ConsoleHelpers/PortableFileIO.h b/minecraft/console_helpers/include/console_helpers/PortableFileIO.h
similarity index 98%
rename from minecraft/Minecraft.World/ConsoleHelpers/PortableFileIO.h
rename to minecraft/console_helpers/include/console_helpers/PortableFileIO.h
index f9c2c2037..0c4256a06 100644
--- a/minecraft/Minecraft.World/ConsoleHelpers/PortableFileIO.h
+++ b/minecraft/console_helpers/include/console_helpers/PortableFileIO.h
@@ -4,7 +4,7 @@
 #include <cstdio>
 #include <string>
 
-#include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 
 namespace PortableFileIO {
 enum class BinaryReadStatus {
diff --git a/minecraft/Minecraft.World/ConsoleHelpers/StringHelpers.h b/minecraft/console_helpers/include/console_helpers/StringHelpers.h
similarity index 100%
rename from minecraft/Minecraft.World/ConsoleHelpers/StringHelpers.h
rename to minecraft/console_helpers/include/console_helpers/StringHelpers.h
diff --git a/minecraft/Minecraft.World/ConsoleHelpers/ThreadName.h b/minecraft/console_helpers/include/console_helpers/ThreadName.h
similarity index 100%
rename from minecraft/Minecraft.World/ConsoleHelpers/ThreadName.h
rename to minecraft/console_helpers/include/console_helpers/ThreadName.h
diff --git a/minecraft/Minecraft.World/ConsoleHelpers/compression.h b/minecraft/console_helpers/include/console_helpers/compression.h
similarity index 97%
rename from minecraft/Minecraft.World/ConsoleHelpers/compression.h
rename to minecraft/console_helpers/include/console_helpers/compression.h
index cbd5b9470..18f84b72c 100644
--- a/minecraft/Minecraft.World/ConsoleHelpers/compression.h
+++ b/minecraft/console_helpers/include/console_helpers/compression.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <mutex>
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
 
 class Compression {
 public:
diff --git a/minecraft/console_helpers/meson.build b/minecraft/console_helpers/meson.build
new file mode 100644
index 000000000..32a7e3532
--- /dev/null
+++ b/minecraft/console_helpers/meson.build
@@ -0,0 +1,24 @@
+console_helpers_sources = files(
+    'src/C4JThread.cpp',
+    'src/PerformanceTimer.cpp',
+    'src/StringHelpers.cpp',
+    'src/ThreadName.cpp',
+    'src/compression.cpp',
+)
+
+simdutf_dep = dependency('simdutf', 
+  fallback: ['simdutf', 'simdutf_dep'], 
+  default_options: ['utf8=true', 'utf16=true', 'utf32=true']
+)
+
+lib_console_helpers = static_library('console_helpers',
+  console_helpers_sources,
+  dependencies: [simdutf_dep],
+  include_directories : include_directories('include', '..'),
+  cpp_args : global_cpp_args + global_cpp_defs,
+)
+
+console_helpers_dep = declare_dependency(
+  link_with : lib_console_helpers,
+  include_directories : include_directories('include'),
+)
diff --git a/minecraft/Minecraft.World/ConsoleHelpers/C4JThread.cpp b/minecraft/console_helpers/src/C4JThread.cpp
similarity index 99%
rename from minecraft/Minecraft.World/ConsoleHelpers/C4JThread.cpp
rename to minecraft/console_helpers/src/C4JThread.cpp
index d65c9d8f7..4893d04c9 100644
--- a/minecraft/Minecraft.World/ConsoleHelpers/C4JThread.cpp
+++ b/minecraft/console_helpers/src/C4JThread.cpp
@@ -30,8 +30,8 @@
 #endif
 
 #include "Minecraft.Client/Common/ShutdownManager.h"
-#include "Minecraft.World/ConsoleHelpers/C4JThread.h"
-#include "Minecraft.World/ConsoleHelpers/C4JThread.h"
+#include "console_helpers/C4JThread.h"
+#include "console_helpers/C4JThread.h"
 
 thread_local C4JThread* C4JThread::ms_currentThread = nullptr;
 
diff --git a/minecraft/Minecraft.World/ConsoleHelpers/PerformanceTimer.cpp b/minecraft/console_helpers/src/PerformanceTimer.cpp
similarity index 64%
rename from minecraft/Minecraft.World/ConsoleHelpers/PerformanceTimer.cpp
rename to minecraft/console_helpers/src/PerformanceTimer.cpp
index 36e036059..115b7c5ad 100644
--- a/minecraft/Minecraft.World/ConsoleHelpers/PerformanceTimer.cpp
+++ b/minecraft/console_helpers/src/PerformanceTimer.cpp
@@ -2,9 +2,7 @@
 #include <chrono>
 #include <string>
 
-#include "Minecraft.World/ConsoleHelpers/PerformanceTimer.h"
-#include "Minecraft.World/ConsoleHelpers/PerformanceTimer.h"
-#include "Minecraft.Client/Linux/Linux_App.h"
+#include "console_helpers/PerformanceTimer.h"
 
 PerformanceTimer::PerformanceTimer() { Reset(); }
 
@@ -16,6 +14,6 @@ void PerformanceTimer::PrintElapsedTime(const std::wstring& description) {
     const std::chrono::duration<float> elapsedTime =
         std::chrono::steady_clock::now() - m_startTime;
 
-    app.DebugPrintf("TIMER: %ls: Elapsed time %f\n", description.c_str(),
+    fprintf(stderr, "TIMER: %ls: Elapsed time %f\n", description.c_str(),
                     elapsedTime.count());
 }
diff --git a/minecraft/Minecraft.World/ConsoleHelpers/StringHelpers.cpp b/minecraft/console_helpers/src/StringHelpers.cpp
similarity index 100%
rename from minecraft/Minecraft.World/ConsoleHelpers/StringHelpers.cpp
rename to minecraft/console_helpers/src/StringHelpers.cpp
diff --git a/minecraft/Minecraft.World/ConsoleHelpers/ThreadName.cpp b/minecraft/console_helpers/src/ThreadName.cpp
similarity index 100%
rename from minecraft/Minecraft.World/ConsoleHelpers/ThreadName.cpp
rename to minecraft/console_helpers/src/ThreadName.cpp
diff --git a/minecraft/Minecraft.World/ConsoleHelpers/compression.cpp b/minecraft/console_helpers/src/compression.cpp
similarity index 98%
rename from minecraft/Minecraft.World/ConsoleHelpers/compression.cpp
rename to minecraft/console_helpers/src/compression.cpp
index 513cb1654..b934da8c6 100644
--- a/minecraft/Minecraft.World/ConsoleHelpers/compression.cpp
+++ b/minecraft/console_helpers/src/compression.cpp
@@ -4,9 +4,9 @@
 #include <cstdint>
 #include <mutex>
 
-#include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h"
-#include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
-#include "Minecraft.World/ConsoleHelpers/compression.h"
+// #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
+#include "Minecraft.World/net/minecraft/world/level/storage/ConsoleSaveFileIO/FileHeader.h"
+#include "console_helpers/compression.h"
 #include "Minecraft.Client/include/NetTypes.h"
 #include "Minecraft.Client/include/XboxStubs.h"
 #include "Minecraft.Client/include/SkinBox.h"
diff --git a/minecraft/java/include/java/ByteBuffer.h b/minecraft/java/include/java/ByteBuffer.h
index 8d7edb125..b940089c7 100644
--- a/minecraft/java/include/java/ByteBuffer.h
+++ b/minecraft/java/include/java/ByteBuffer.h
@@ -4,7 +4,7 @@
 #include <vector>
 
 #include "Buffer.h"
-#include "../../../Minecraft.World/ConsoleHelpers/Definitions.h" // 4jcraft TODO
+#include "console_helpers/Definitions.h" // 4jcraft TODO
 
 class IntBuffer;
 class FloatBuffer;
diff --git a/minecraft/java/include/java/System.h b/minecraft/java/include/java/System.h
index ff3fd6746..8f87afef7 100644
--- a/minecraft/java/include/java/System.h
+++ b/minecraft/java/include/java/System.h
@@ -44,9 +44,3 @@ public:
     static void ReverseULONGLONG(int64_t* pullVal);
     static void ReverseWCHARA(wchar_t* pwch, int iLen);
 };
-
-#define MAKE_FOURCC(ch0, ch1, ch2, ch3)                                   \
-    (static_cast<std::uint32_t>(static_cast<std::uint8_t>(ch0)) |         \
-     (static_cast<std::uint32_t>(static_cast<std::uint8_t>(ch1)) << 8) |  \
-     (static_cast<std::uint32_t>(static_cast<std::uint8_t>(ch2)) << 16) | \
-     (static_cast<std::uint32_t>(static_cast<std::uint8_t>(ch3)) << 24))
diff --git a/minecraft/java/meson.build b/minecraft/java/meson.build
index a0b7093d0..cf434f056 100644
--- a/minecraft/java/meson.build
+++ b/minecraft/java/meson.build
@@ -24,6 +24,7 @@ java_sources = files(
 
 lib_java = static_library('java',
   java_sources,
+  dependencies: [console_helpers_dep],
   # TODO: remove the .. path once arrayWithLength are evaporated
   include_directories: include_directories('include'),
   cpp_args : global_cpp_args + global_cpp_defs,
diff --git a/minecraft/java/src/File.cpp b/minecraft/java/src/File.cpp
index 25498ea89..699763c45 100644
--- a/minecraft/java/src/File.cpp
+++ b/minecraft/java/src/File.cpp
@@ -9,8 +9,8 @@
 
 #include "java/FileFilter.h"
 #include "java/File.h"
-#include "../../Minecraft.World/ConsoleHelpers/PathHelper.h" // 4jcraft TODO
-#include "../../Minecraft.World/ConsoleHelpers/StringHelpers.h" // 4jcraft TODO
+#include "console_helpers/PathHelper.h" // 4jcraft TODO
+#include "console_helpers/StringHelpers.h" // 4jcraft TODO
 
 const wchar_t File::pathSeparator = L'/';
 
diff --git a/minecraft/java/src/InputOutputStream/FileInputStream.cpp b/minecraft/java/src/InputOutputStream/FileInputStream.cpp
index c923299b2..33e2669e1 100644
--- a/minecraft/java/src/InputOutputStream/FileInputStream.cpp
+++ b/minecraft/java/src/InputOutputStream/FileInputStream.cpp
@@ -9,7 +9,7 @@
 
 #include "java/File.h"
 #include "java/InputOutputStream/FileInputStream.h"
-#include "../../../Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "console_helpers/StringHelpers.h"
 
 namespace {
 int64_t FileTell(std::FILE* file) {
diff --git a/minecraft/java/src/InputOutputStream/FileOutputStream.cpp b/minecraft/java/src/InputOutputStream/FileOutputStream.cpp
index 1f8da9112..7e6d67063 100644
--- a/minecraft/java/src/InputOutputStream/FileOutputStream.cpp
+++ b/minecraft/java/src/InputOutputStream/FileOutputStream.cpp
@@ -5,7 +5,7 @@
 #include "java/File.h"
 #include "java/InputOutputStream/FileOutputStream.h"
 
-#include "../../../Minecraft.World/ConsoleHelpers/StringHelpers.h" // 4jcraft TODO
+#include "console_helpers/StringHelpers.h" // 4jcraft TODO
 
 // Creates a file output stream to write to the file represented by the
 // specified File object. A new FileDescriptor object is created to represent