diff --git a/minecraft/Minecraft.Client/Common/src/DLC/DLCManager.cpp b/minecraft/Minecraft.Client/Common/src/DLC/DLCManager.cpp
index 90c843d9b..742c9a09a 100644
--- a/minecraft/Minecraft.Client/Common/src/DLC/DLCManager.cpp
+++ b/minecraft/Minecraft.Client/Common/src/DLC/DLCManager.cpp
@@ -6,7 +6,7 @@
 #include "DLCPack.h"
 #include "DLCFile.h"
 #include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
-#include "Minecraft.World/include/PortableFileIO.h"
+#include "Minecraft.World/ConsoleHelpers/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/UI/All Platforms/ArchiveFile.cpp b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.cpp
index 82a631ab8..0a29042e6 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.cpp	
+++ b/minecraft/Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.cpp	
@@ -2,7 +2,7 @@
 #include <cstdlib>
 #include <utility>
 
-#include "Minecraft.World/include/PortableFileIO.h"
+#include "Minecraft.World/ConsoleHelpers/PortableFileIO.h"
 #include "Minecraft.World/include/compression.h"
 #include "ArchiveFile.h"
 #include "Minecraft.Client/Common/src/UI/All Platforms/ArchiveFile.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 ed99aea5c..bd761c06a 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	
@@ -12,7 +12,7 @@
 #include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFile.h"
 #include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOriginal.h"
 #include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.h"
-#include "Minecraft.World/include/PortableFileIO.h"
+#include "Minecraft.World/ConsoleHelpers/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/UITTFFont.cpp b/minecraft/Minecraft.Client/Common/src/UI/UITTFFont.cpp
index d10187336..600e65c78 100644
--- a/minecraft/Minecraft.Client/Common/src/UI/UITTFFont.cpp
+++ b/minecraft/Minecraft.Client/Common/src/UI/UITTFFont.cpp
@@ -1,7 +1,7 @@
 #include <assert.h>
 #include <cstdio>
 
-#include "Minecraft.World/include/PortableFileIO.h"
+#include "Minecraft.World/ConsoleHelpers/PortableFileIO.h"
 #include "UITTFFont.h"
 #include "Minecraft.Client/Linux/Iggy/include/iggy.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 04701c43a..9d4773a42 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/include/PortableFileIO.h"
+#include "Minecraft.World/ConsoleHelpers/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.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp
index 35b267c0f..8cb14cc54 100644
--- a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp
+++ b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp
@@ -9,7 +9,7 @@
 #include <format>
 #include <vector>
 
-#include "Minecraft.World/include/PortableFileIO.h"
+#include "Minecraft.World/ConsoleHelpers/PortableFileIO.h"
 #include "ConsoleSaveFileOriginal.h"
 #include "java/File.h"
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
diff --git a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp
index 874680494..54fc0d1a2 100644
--- a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp
+++ b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp
@@ -9,7 +9,7 @@
 #include <format>
 #include <utility>
 
-#include "Minecraft.World/include/PortableFileIO.h"
+#include "Minecraft.World/ConsoleHelpers/PortableFileIO.h"
 #include "ConsoleSaveFileSplit.h"
 #include "ConsoleSaveFileConverter.h"
 #include "java/File.h"
diff --git a/minecraft/Minecraft.World/include/PortableFileIO.h b/minecraft/Minecraft.World/ConsoleHelpers/PortableFileIO.h
similarity index 100%
rename from minecraft/Minecraft.World/include/PortableFileIO.h
rename to minecraft/Minecraft.World/ConsoleHelpers/PortableFileIO.h
diff --git a/minecraft/Minecraft.World/include/LevelObjectInputStream.h b/minecraft/Minecraft.World/net/minecraft/world/level/LevelObjectInputStream.h
similarity index 100%
rename from minecraft/Minecraft.World/include/LevelObjectInputStream.h
rename to minecraft/Minecraft.World/net/minecraft/world/level/LevelObjectInputStream.h