diff --git a/targets/app/common/App_structs.h b/targets/app/common/App_structs.h
index 705ec9bcf..90ae49112 100644
--- a/targets/app/common/App_structs.h
+++ b/targets/app/common/App_structs.h
@@ -7,9 +7,9 @@
 #include "app/common/App_enums.h"
 #include "app/common/Tutorial/TutorialEnum.h"
 #include "app/common/UI/All Platforms/UIEnums.h"
-#include "app/common/NetTypes.h"
-#include "app/common/SkinBox.h"
-#include "app/common/XboxStubs.h"
+#include "platform/NetTypes.h"
+#include "minecraft/client/SkinBox.h"
+#include "platform/XboxStubs.h"
 
 typedef struct {
     wchar_t* wchFilename;
diff --git a/targets/app/common/DLC/DLCAudioFile.cpp b/targets/app/common/DLC/DLCAudioFile.cpp
index 234aadaf3..b7042a45e 100644
--- a/targets/app/common/DLC/DLCAudioFile.cpp
+++ b/targets/app/common/DLC/DLCAudioFile.cpp
@@ -10,7 +10,7 @@
 #include "DLCManager.h"
 #include "app/common/DLC/DLCFile.h"
 #include "app/linux/LinuxGame.h"
-#include "app/common/XboxStubs.h"
+#include "platform/XboxStubs.h"
 #if defined(_WINDOWS64)
 #include "app/windows/XML/ATGXmlParser.h"
 #include "app/windows/XML/xmlFilesCallback.h"
diff --git a/targets/app/common/DLC/DLCSkinFile.cpp b/targets/app/common/DLC/DLCSkinFile.cpp
index f03b60732..12a46dc9a 100644
--- a/targets/app/common/DLC/DLCSkinFile.cpp
+++ b/targets/app/common/DLC/DLCSkinFile.cpp
@@ -7,8 +7,8 @@
 #include "DLCManager.h"
 #include "app/common/DLC/DLCFile.h"
 #include "app/linux/LinuxGame.h"
-#include "app/common/SkinBox.h"
-#include "app/common/XboxStubs.h"
+#include "minecraft/client/SkinBox.h"
+#include "platform/XboxStubs.h"
 
 DLCSkinFile::DLCSkinFile(const std::wstring& path)
     : DLCFile(DLCManager::e_DLCType_Skin, path) {
diff --git a/targets/app/common/DLC/DLCSkinFile.h b/targets/app/common/DLC/DLCSkinFile.h
index 02d541624..c740d0cc2 100644
--- a/targets/app/common/DLC/DLCSkinFile.h
+++ b/targets/app/common/DLC/DLCSkinFile.h
@@ -6,7 +6,7 @@
 
 #include "DLCFile.h"
 #include "app/common/DLC/DLCManager.h"
-#include "app/common/SkinBox.h"
+#include "minecraft/client/SkinBox.h"
 #include "minecraft/client/model/HumanoidModel.h"
 
 class DLCSkinFile : public DLCFile {
diff --git a/targets/app/common/Game.cpp b/targets/app/common/Game.cpp
index 88cc6f77f..490cdfed7 100644
--- a/targets/app/common/Game.cpp
+++ b/targets/app/common/Game.cpp
@@ -21,9 +21,9 @@
 #include "app/linux/LinuxGame.h"
 #include "app/linux/Linux_UIController.h"
 #include "app/linux/Stubs/winapi_stubs.h"
-#include "app/common/NetTypes.h"
-#include "app/common/SkinBox.h"
-#include "app/common/XboxStubs.h"
+#include "platform/NetTypes.h"
+#include "minecraft/client/SkinBox.h"
+#include "platform/XboxStubs.h"
 #include "platform/PlatformServices.h"
 #include "java/Class.h"
 #include "java/File.h"
diff --git a/targets/app/common/Game.h b/targets/app/common/Game.h
index 5a688c23c..d0aaad5c0 100644
--- a/targets/app/common/Game.h
+++ b/targets/app/common/Game.h
@@ -19,9 +19,9 @@
 #include "app/common/Tutorial/TutorialEnum.h"
 #include "app/common/UI/All Platforms/ArchiveFile.h"
 #include "app/common/UI/All Platforms/UIStructs.h"
-#include "app/common/NetTypes.h"
-#include "app/common/SkinBox.h"
-#include "app/common/XboxStubs.h"
+#include "platform/NetTypes.h"
+#include "minecraft/client/SkinBox.h"
+#include "platform/XboxStubs.h"
 #include "minecraft/network/packet/DisconnectPacket.h"
 #include "minecraft/world/entity/item/MinecartHopper.h"
 
diff --git a/targets/app/common/Network/GameNetworkManager.cpp b/targets/app/common/Network/GameNetworkManager.cpp
index 7dc8275f3..2534ae59c 100644
--- a/targets/app/common/Network/GameNetworkManager.cpp
+++ b/targets/app/common/Network/GameNetworkManager.cpp
@@ -26,7 +26,7 @@
 #include "app/linux/Linux_UIController.h"
 #include "app/linux/Stubs/winapi_stubs.h"
 #include "Socket.h"
-#include "app/common/XboxStubs.h"
+#include "platform/XboxStubs.h"
 #include "util/StringHelpers.h"
 #include "platform/PlatformServices.h"
 #include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h"
diff --git a/targets/app/common/Network/GameNetworkManager.h b/targets/app/common/Network/GameNetworkManager.h
index 91073b4c3..834487b71 100644
--- a/targets/app/common/Network/GameNetworkManager.h
+++ b/targets/app/common/Network/GameNetworkManager.h
@@ -9,7 +9,7 @@
 #endif
 #include "platform/PlatformTypes.h"
 #include "platform/IPlatformNetwork.h"
-#include "app/common/NetTypes.h"
+#include "platform/NetTypes.h"
 #include "NetworkPlayerInterface.h"
 #include "PlatformNetworkManagerStub.h"
 #include "SessionInfo.h"
diff --git a/targets/app/common/Network/NetworkPlayerQNet.cpp b/targets/app/common/Network/NetworkPlayerQNet.cpp
index 5fe259314..a086f86fe 100644
--- a/targets/app/common/Network/NetworkPlayerQNet.cpp
+++ b/targets/app/common/Network/NetworkPlayerQNet.cpp
@@ -2,7 +2,7 @@
 
 #include <limits.h>
 
-#include "app/common/NetTypes.h"
+#include "platform/NetTypes.h"
 #include "java/System.h"
 
 NetworkPlayerQNet::NetworkPlayerQNet(IQNetPlayer* qnetPlayer) {
diff --git a/targets/app/common/Network/PlatformNetworkManagerInterface.h b/targets/app/common/Network/PlatformNetworkManagerInterface.h
index e93a38bc7..ff64fd247 100644
--- a/targets/app/common/Network/PlatformNetworkManagerInterface.h
+++ b/targets/app/common/Network/PlatformNetworkManagerInterface.h
@@ -5,9 +5,9 @@
 #if !defined(__linux__)
 #include <qnet.h>
 #endif
-#include "app/common/NetTypes.h"
-#include "app/common/SkinBox.h"
-#include "app/common/XboxStubs.h"
+#include "platform/NetTypes.h"
+#include "minecraft/client/SkinBox.h"
+#include "platform/XboxStubs.h"
 #include "NetworkPlayerInterface.h"
 #include "SessionInfo.h"
 #include "platform/C4JThread.h"
diff --git a/targets/app/common/Network/PlatformNetworkManagerStub.cpp b/targets/app/common/Network/PlatformNetworkManagerStub.cpp
index 646a2f97b..1c87f8347 100644
--- a/targets/app/common/Network/PlatformNetworkManagerStub.cpp
+++ b/targets/app/common/Network/PlatformNetworkManagerStub.cpp
@@ -9,7 +9,7 @@
 #include "app/common/Network/NetworkPlayerInterface.h"
 #include "app/linux/LinuxGame.h"
 #include "app/linux/Stubs/winapi_stubs.h"
-#include "app/common/NetTypes.h"
+#include "platform/NetTypes.h"
 #include "NetworkPlayerQNet.h"
 #include "Socket.h"
 #include "platform/C4JThread.h"
diff --git a/targets/app/common/Network/PlatformNetworkManagerStub.h b/targets/app/common/Network/PlatformNetworkManagerStub.h
index bf7c115d9..c2899b1b2 100644
--- a/targets/app/common/Network/PlatformNetworkManagerStub.h
+++ b/targets/app/common/Network/PlatformNetworkManagerStub.h
@@ -5,9 +5,9 @@
 #include <vector>
 
 #include "platform/PlatformTypes.h"
-#include "app/common/NetTypes.h"
-#include "app/common/SkinBox.h"
-#include "app/common/XboxStubs.h"
+#include "platform/NetTypes.h"
+#include "minecraft/client/SkinBox.h"
+#include "platform/XboxStubs.h"
 #include "NetworkPlayerInterface.h"
 #include "platform/IPlatformNetwork.h"
 #include "SessionInfo.h"
diff --git a/targets/app/common/Network/SessionInfo.h b/targets/app/common/Network/SessionInfo.h
index 077315e4a..bf8b7f1a6 100644
--- a/targets/app/common/Network/SessionInfo.h
+++ b/targets/app/common/Network/SessionInfo.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "app/common/NetTypes.h"
+#include "platform/NetTypes.h"
 
 // A struct that we store in the QoS data when we are hosting the session. Max
 // size 1020 bytes.
diff --git a/targets/app/common/Network/Socket.cpp b/targets/app/common/Network/Socket.cpp
index d0ea379c1..7fc736b95 100644
--- a/targets/app/common/Network/Socket.cpp
+++ b/targets/app/common/Network/Socket.cpp
@@ -10,7 +10,7 @@
 #include "platform/ShutdownManager.h"
 #include "app/common/Network/GameNetworkManager.h"
 #include "app/common/Network/NetworkPlayerInterface.h"
-#include "app/common/NetTypes.h"
+#include "platform/NetTypes.h"
 #include "minecraft/server/network/ServerConnection.h"
 
 class SocketAddress {};
diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp
index 4eec60098..f08adb7f5 100644
--- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp	
+++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp	
@@ -25,7 +25,7 @@
 #include "app/common/UI/UILayer.h"
 #include "app/linux/LinuxGame.h"
 #include "app/linux/Linux_UIController.h"
-#include "app/common/NetTypes.h"
+#include "platform/NetTypes.h"
 #include "util/StringHelpers.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/Options.h"
diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp
index d6c056899..0b0b0663e 100644
--- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp	
+++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp	
@@ -24,7 +24,7 @@
 #include "app/common/UI/UILayer.h"
 #include "app/linux/LinuxGame.h"
 #include "app/linux/Linux_UIController.h"
-#include "app/common/NetTypes.h"
+#include "platform/NetTypes.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/Options.h"
 #include "minecraft/client/skins/DLCTexturePack.h"
diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp
index 519c1a5dd..459a3d3b6 100644
--- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp	
+++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp	
@@ -21,7 +21,7 @@
 #include "app/common/UI/UIScene.h"
 #include "app/linux/LinuxGame.h"
 #include "app/linux/Linux_UIController.h"
-#include "app/common/NetTypes.h"
+#include "platform/NetTypes.h"
 #include "java/File.h"
 #include "java/InputOutputStream/FileInputStream.h"
 #include "minecraft/client/Minecraft.h"
diff --git a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp
index 38dd9a44e..f3a1566fa 100644
--- a/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp	
+++ b/targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp	
@@ -21,7 +21,7 @@
 #include "app/linux/LinuxGame.h"
 #include "app/linux/Linux_UIController.h"
 #include "app/linux/Stubs/winapi_stubs.h"
-#include "app/common/NetTypes.h"
+#include "platform/NetTypes.h"
 #include "util/StringHelpers.h"
 
 #include "java/InputOutputStream/BufferedReader.h"
diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_LanguageSelector.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_LanguageSelector.h
index 8f6b03cc5..fb951667e 100644
--- a/targets/app/common/UI/Scenes/Help & Options/UIScene_LanguageSelector.h	
+++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_LanguageSelector.h	
@@ -8,9 +8,9 @@
 #include "app/common/UI/Controls/UIControl_ButtonList.h"
 #include "app/common/UI/UIScene.h"
 #include "app/linux/Iggy/include/rrCore.h"
-#include "app/common/NetTypes.h"
-#include "app/common/SkinBox.h"
-#include "app/common/XboxStubs.h"
+#include "platform/NetTypes.h"
+#include "minecraft/client/SkinBox.h"
+#include "platform/XboxStubs.h"
 
 class UILayer;
 
diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp b/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp
index e0c16e89e..c6be93226 100644
--- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp	
+++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp	
@@ -20,7 +20,7 @@
 #include "app/common/UI/UIScene.h"
 #include "app/linux/LinuxGame.h"
 #include "app/linux/Linux_UIController.h"
-#include "app/common/SkinBox.h"
+#include "minecraft/client/SkinBox.h"
 #include "util/StringHelpers.h"
 
 #include "minecraft/client/Minecraft.h"
diff --git a/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h b/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h
index ae3d463d5..55541476c 100644
--- a/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h	
+++ b/targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.h	
@@ -15,7 +15,7 @@
 #include "app/linux/Stubs/iggy_stubs.h"
 #endif
 #include "app/linux/Iggy/include/rrCore.h"
-#include "app/common/SkinBox.h"
+#include "minecraft/client/SkinBox.h"
 #include "minecraft/world/entity/player/SkinTypes.h"
 #include "minecraft/client/renderer/Textures.h"
 
diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp
index 6830a88d4..a13eef5d8 100644
--- a/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp	
+++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp	
@@ -19,7 +19,7 @@
 #include "app/linux/Iggy/include/rrCore.h"
 #include "app/linux/LinuxGame.h"
 #include "app/linux/Linux_UIController.h"
-#include "app/common/XboxStubs.h"
+#include "platform/XboxStubs.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/player/LocalPlayer.h"
 #include "minecraft/sounds/SoundTypes.h"
diff --git a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h
index b92fa134a..9ac75f841 100644
--- a/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h	
+++ b/targets/app/common/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h	
@@ -9,7 +9,7 @@
 #include "app/common/UI/Controls/UIControl_PlayerList.h"
 #include "app/common/UI/UIScene.h"
 #include "app/linux/Iggy/include/rrCore.h"
-#include "app/common/NetTypes.h"
+#include "platform/NetTypes.h"
 
 class INetworkPlayer;
 class UILayer;
diff --git a/targets/app/common/UI/UIBitmapFont.cpp b/targets/app/common/UI/UIBitmapFont.cpp
index d01ac915c..74b41e2fa 100644
--- a/targets/app/common/UI/UIBitmapFont.cpp
+++ b/targets/app/common/UI/UIBitmapFont.cpp
@@ -5,7 +5,7 @@
 #include "app/linux/Stubs/iggy_stubs.h"
 #endif
 #include "app/linux/Iggy/include/rrCore.h"
-#include "app/common/BufferedImage.h"
+#include "minecraft/client/BufferedImage.h"
 #include "UIFontData.h"
 
 /////////////////////////////
diff --git a/targets/app/common/UI/UIController.cpp b/targets/app/common/UI/UIController.cpp
index 530b308a1..726d2efca 100644
--- a/targets/app/common/UI/UIController.cpp
+++ b/targets/app/common/UI/UIController.cpp
@@ -35,9 +35,9 @@
 #endif
 #include "app/linux/LinuxGame.h"
 #include "app/linux/Linux_UIController.h"
-#include "app/common/BufferedImage.h"
+#include "minecraft/client/BufferedImage.h"
 #include "UIFontData.h"
-#include "app/common/XboxStubs.h"
+#include "platform/XboxStubs.h"
 #include "platform/C4JThread.h"
 #include "util/Timer.h"
 
diff --git a/targets/app/common/UI/UIString.cpp b/targets/app/common/UI/UIString.cpp
index 4ead1f49f..7e6fcd5d2 100644
--- a/targets/app/common/UI/UIString.cpp
+++ b/targets/app/common/UI/UIString.cpp
@@ -1,7 +1,7 @@
 #include "UIString.h"
 
 #include "app/linux/LinuxGame.h"
-#include "app/common/XboxStubs.h"
+#include "platform/XboxStubs.h"
 #include "util/StringHelpers.h"
 
 bool UIString::setCurrentLanguage() {
diff --git a/targets/app/common/XboxStubs.cpp b/targets/app/common/XboxStubs.cpp
index 0475f0a9c..4020a7036 100644
--- a/targets/app/common/XboxStubs.cpp
+++ b/targets/app/common/XboxStubs.cpp
@@ -6,8 +6,8 @@
 
 #include "platform/PlatformTypes.h"
 #include "app/linux/Stubs/winapi_stubs.h"
-#include "app/common/NetTypes.h"
-#include "app/common/XboxStubs.h"
+#include "platform/NetTypes.h"
+#include "platform/XboxStubs.h"
 
 class INVITE_INFO;
 
diff --git a/targets/app/common/stubs.cpp b/targets/app/common/stubs.cpp
index ea141a25d..85132ba4d 100644
--- a/targets/app/common/stubs.cpp
+++ b/targets/app/common/stubs.cpp
@@ -1,5 +1,5 @@
 
-#include "app/common/stubs.h"
+#include "platform/stubs.h"
 
 #include "app/linux/LinuxGame.h"
 #if defined(__linux__)
diff --git a/targets/app/linux/LinuxGL.cpp b/targets/app/linux/LinuxGL.cpp
index 5c2bd1241..4217f1d66 100644
--- a/targets/app/linux/LinuxGL.cpp
+++ b/targets/app/linux/LinuxGL.cpp
@@ -1,7 +1,7 @@
 #ifdef __linux__
 
 #include "platform/sdl2/Render.h"
-#include "app/common/stubs.h"
+#include "platform/stubs.h"
 
 #include "java/ByteBuffer.h"
 #include "java/FloatBuffer.h"
diff --git a/targets/app/linux/linux_game_stubs.cpp b/targets/app/linux/linux_game_stubs.cpp
index b54318a2d..c36e73dab 100644
--- a/targets/app/linux/linux_game_stubs.cpp
+++ b/targets/app/linux/linux_game_stubs.cpp
@@ -1,7 +1,7 @@
 #ifdef __linux__
 
 #include "app/common/Game.h"
-#include "app/common/stubs.h"
+#include "platform/stubs.h"
 
 void Display::update() {}
 
diff --git a/targets/app/common/BufferedImage.cpp b/targets/minecraft/client/BufferedImage.cpp
similarity index 99%
rename from targets/app/common/BufferedImage.cpp
rename to targets/minecraft/client/BufferedImage.cpp
index 028ef2524..150c4a75e 100644
--- a/targets/app/common/BufferedImage.cpp
+++ b/targets/minecraft/client/BufferedImage.cpp
@@ -1,4 +1,4 @@
-#include "app/common/BufferedImage.h"
+#include "minecraft/client/BufferedImage.h"
 
 #include <string.h>
 
diff --git a/targets/app/common/BufferedImage.h b/targets/minecraft/client/BufferedImage.h
similarity index 100%
rename from targets/app/common/BufferedImage.h
rename to targets/minecraft/client/BufferedImage.h
diff --git a/targets/minecraft/client/Camera.cpp b/targets/minecraft/client/Camera.cpp
index 6b3f93926..29c5062cb 100644
--- a/targets/minecraft/client/Camera.cpp
+++ b/targets/minecraft/client/Camera.cpp
@@ -8,7 +8,7 @@
 #include <numbers>
 
 #include "MemoryTracker.h"
-#include "app/common/stubs.h"
+#include "platform/stubs.h"
 #include "java/FloatBuffer.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/player/Player.h"
diff --git a/targets/minecraft/client/Lighting.cpp b/targets/minecraft/client/Lighting.cpp
index 720bc13ee..e5adc421a 100644
--- a/targets/minecraft/client/Lighting.cpp
+++ b/targets/minecraft/client/Lighting.cpp
@@ -3,7 +3,7 @@
 #include <GL/gl.h>
 
 #include "platform/sdl2/Render.h"
-#include "app/common/stubs.h"
+#include "platform/stubs.h"
 #include "java/FloatBuffer.h"
 #include "minecraft/world/phys/Vec3.h"
 
diff --git a/targets/minecraft/client/Minecraft.cpp b/targets/minecraft/client/Minecraft.cpp
index e06691b99..59c664bca 100644
--- a/targets/minecraft/client/Minecraft.cpp
+++ b/targets/minecraft/client/Minecraft.cpp
@@ -25,7 +25,7 @@
 #include "app/linux/LinuxGame.h"
 #include "app/linux/Linux_UIController.h"
 #include "app/linux/Stubs/winapi_stubs.h"
-#include "app/common/XboxStubs.h"
+#include "platform/XboxStubs.h"
 #include "Options.h"
 #include "Pos.h"
 #include "ProgressRenderer.h"
@@ -110,7 +110,7 @@
 #include "app/common/Tutorial/FullTutorialMode.h"
 #include "app/common/UI/All Platforms/IUIScene_CreativeMenu.h"
 #include "app/common/UI/UIFontData.h"
-#include "app/common/stubs.h"
+#include "platform/stubs.h"
 #include "util/StringHelpers.h"
 #include "java/File.h"
 #include "java/System.h"
diff --git a/targets/minecraft/client/Options.cpp b/targets/minecraft/client/Options.cpp
index 2c5332133..ecfe1f509 100644
--- a/targets/minecraft/client/Options.cpp
+++ b/targets/minecraft/client/Options.cpp
@@ -3,7 +3,7 @@
 #include "KeyMapping.h"
 #include "app/common/Audio/SoundEngine.h"
 #include "app/linux/LinuxGame.h"
-#include "app/common/stubs.h"
+#include "platform/stubs.h"
 #include "util/StringHelpers.h"
 #include "java/File.h"
 #include "java/InputOutputStream/BufferedReader.h"
diff --git a/targets/app/common/SkinBox.h b/targets/minecraft/client/SkinBox.h
similarity index 100%
rename from targets/app/common/SkinBox.h
rename to targets/minecraft/client/SkinBox.h
diff --git a/targets/minecraft/client/gui/ChatScreen.cpp b/targets/minecraft/client/gui/ChatScreen.cpp
index 4fcfade47..617b71ca0 100644
--- a/targets/minecraft/client/gui/ChatScreen.cpp
+++ b/targets/minecraft/client/gui/ChatScreen.cpp
@@ -2,7 +2,7 @@
 
 #include <memory>
 
-#include "app/common/stubs.h"
+#include "platform/stubs.h"
 #include "util/StringHelpers.h"
 #include "minecraft/SharedConstants.h"
 #include "minecraft/client/Minecraft.h"
diff --git a/targets/minecraft/client/gui/CreateWorldScreen.cpp b/targets/minecraft/client/gui/CreateWorldScreen.cpp
index ac6ffdd85..5dde8ca00 100644
--- a/targets/minecraft/client/gui/CreateWorldScreen.cpp
+++ b/targets/minecraft/client/gui/CreateWorldScreen.cpp
@@ -16,8 +16,8 @@
 #include "app/common/UI/All Platforms/UIStructs.h"
 #include "app/linux/LinuxGame.h"
 #include "app/linux/Linux_UIController.h"
-#include "app/common/NetTypes.h"
-#include "app/common/stubs.h"
+#include "platform/NetTypes.h"
+#include "platform/stubs.h"
 #include "util/StringHelpers.h"
 #include "minecraft/SharedConstants.h"
 #include "minecraft/client/Minecraft.h"
diff --git a/targets/minecraft/client/gui/EditBox.cpp b/targets/minecraft/client/gui/EditBox.cpp
index ea167636c..3a785bd5f 100644
--- a/targets/minecraft/client/gui/EditBox.cpp
+++ b/targets/minecraft/client/gui/EditBox.cpp
@@ -1,6 +1,6 @@
 #include "EditBox.h"
 
-#include "app/common/stubs.h"
+#include "platform/stubs.h"
 #include "minecraft/SharedConstants.h"
 #include "minecraft/client/gui/Screen.h"
 
diff --git a/targets/minecraft/client/gui/Font.cpp b/targets/minecraft/client/gui/Font.cpp
index d5dd395fd..8d08bd9d2 100644
--- a/targets/minecraft/client/gui/Font.cpp
+++ b/targets/minecraft/client/gui/Font.cpp
@@ -6,7 +6,7 @@
 #include <vector>
 
 #include "platform/sdl2/Render.h"
-#include "app/common/BufferedImage.h"
+#include "minecraft/client/BufferedImage.h"
 #include "util/StringHelpers.h"
 #include "java/Random.h"
 #include "minecraft/SharedConstants.h"
diff --git a/targets/minecraft/client/gui/Gui.cpp b/targets/minecraft/client/gui/Gui.cpp
index 8adede127..c1520f0cf 100644
--- a/targets/minecraft/client/gui/Gui.cpp
+++ b/targets/minecraft/client/gui/Gui.cpp
@@ -11,7 +11,7 @@
 #include "app/common/App_structs.h"
 #include "app/linux/LinuxGame.h"
 #include "app/linux/Linux_UIController.h"
-#include "app/common/XboxStubs.h"
+#include "platform/XboxStubs.h"
 #include "util/StringHelpers.h"
 #include "java/JavaMath.h"
 #include "java/Random.h"
@@ -55,7 +55,7 @@
 #include "minecraft/world/level/storage/LevelData.h"
 #include "minecraft/world/level/tile/PortalTile.h"
 #include "minecraft/world/level/tile/Tile.h"
-#include "app/common/stubs.h"
+#include "platform/stubs.h"
 
 #include "strings.h"
 
diff --git a/targets/minecraft/client/gui/GuiComponent.cpp b/targets/minecraft/client/gui/GuiComponent.cpp
index d8c5be69b..a0d61fc0f 100644
--- a/targets/minecraft/client/gui/GuiComponent.cpp
+++ b/targets/minecraft/client/gui/GuiComponent.cpp
@@ -4,7 +4,7 @@
 #include <math.h>
 
 #include "platform/sdl2/Render.h"
-#include "app/common/stubs.h"
+#include "platform/stubs.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/gui/Font.h"
 #include "minecraft/client/gui/Gui.h"
diff --git a/targets/minecraft/client/gui/InBedChatScreen.cpp b/targets/minecraft/client/gui/InBedChatScreen.cpp
index 7da518d5d..fb4fa57a8 100644
--- a/targets/minecraft/client/gui/InBedChatScreen.cpp
+++ b/targets/minecraft/client/gui/InBedChatScreen.cpp
@@ -5,7 +5,7 @@
 #include <vector>
 
 #include "Button.h"
-#include "app/common/stubs.h"
+#include "platform/stubs.h"
 #include "util/StringHelpers.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/gui/ChatScreen.h"
diff --git a/targets/minecraft/client/gui/JoinMultiplayerScreen.cpp b/targets/minecraft/client/gui/JoinMultiplayerScreen.cpp
index d2fa35e7d..99c987d51 100644
--- a/targets/minecraft/client/gui/JoinMultiplayerScreen.cpp
+++ b/targets/minecraft/client/gui/JoinMultiplayerScreen.cpp
@@ -4,7 +4,7 @@
 
 #include "Button.h"
 #include "EditBox.h"
-#include "app/common/stubs.h"
+#include "platform/stubs.h"
 #include "util/StringHelpers.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/Options.h"
diff --git a/targets/minecraft/client/gui/Minimap.cpp b/targets/minecraft/client/gui/Minimap.cpp
index f294ffa56..f37182957 100644
--- a/targets/minecraft/client/gui/Minimap.cpp
+++ b/targets/minecraft/client/gui/Minimap.cpp
@@ -11,7 +11,7 @@
 #include "Font.h"
 #include "app/common/App_enums.h"
 #include "app/common/Colours/ColourTable.h"
-#include "app/common/BufferedImage.h"
+#include "minecraft/client/BufferedImage.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/renderer/Tesselator.h"
 #include "minecraft/client/renderer/Textures.h"
diff --git a/targets/minecraft/client/gui/NameEntryScreen.cpp b/targets/minecraft/client/gui/NameEntryScreen.cpp
index 647f8574c..18acb3d38 100644
--- a/targets/minecraft/client/gui/NameEntryScreen.cpp
+++ b/targets/minecraft/client/gui/NameEntryScreen.cpp
@@ -3,7 +3,7 @@
 #include <vector>
 
 #include "Button.h"
-#include "app/common/stubs.h"
+#include "platform/stubs.h"
 #include "util/StringHelpers.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/gui/Screen.h"
diff --git a/targets/minecraft/client/gui/RenameWorldScreen.cpp b/targets/minecraft/client/gui/RenameWorldScreen.cpp
index de312d0e5..e0e937276 100644
--- a/targets/minecraft/client/gui/RenameWorldScreen.cpp
+++ b/targets/minecraft/client/gui/RenameWorldScreen.cpp
@@ -4,7 +4,7 @@
 
 #include "Button.h"
 #include "EditBox.h"
-#include "app/common/stubs.h"
+#include "platform/stubs.h"
 #include "util/StringHelpers.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/gui/Screen.h"
diff --git a/targets/minecraft/client/gui/Screen.cpp b/targets/minecraft/client/gui/Screen.cpp
index 880a8ad99..8e7f94a23 100644
--- a/targets/minecraft/client/gui/Screen.cpp
+++ b/targets/minecraft/client/gui/Screen.cpp
@@ -8,7 +8,7 @@
 #include "app/common/Audio/SoundEngine.h"
 #include "app/common/Network/GameNetworkManager.h"
 #include "app/linux/LinuxGame.h"
-#include "app/common/stubs.h"
+#include "platform/stubs.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/gui/Screen.h"
 #include "minecraft/client/gui/particle/GuiParticles.h"
diff --git a/targets/minecraft/client/gui/achievement/AchievementScreen.cpp b/targets/minecraft/client/gui/achievement/AchievementScreen.cpp
index f63215b83..95f031cd7 100644
--- a/targets/minecraft/client/gui/achievement/AchievementScreen.cpp
+++ b/targets/minecraft/client/gui/achievement/AchievementScreen.cpp
@@ -6,7 +6,7 @@
 #include <vector>
 
 #include "platform/sdl2/Render.h"
-#include "app/common/stubs.h"
+#include "platform/stubs.h"
 #include "minecraft/client/KeyMapping.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/Options.h"
diff --git a/targets/minecraft/client/gui/achievement/StatsScreen.cpp b/targets/minecraft/client/gui/achievement/StatsScreen.cpp
index 14584f195..2ae8ad43c 100644
--- a/targets/minecraft/client/gui/achievement/StatsScreen.cpp
+++ b/targets/minecraft/client/gui/achievement/StatsScreen.cpp
@@ -1,7 +1,7 @@
 #include "StatsScreen.h"
 
 #include "app/common/Audio/SoundEngine.h"
-#include "app/common/stubs.h"
+#include "platform/stubs.h"
 #include "util/StringHelpers.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/gui/Button.h"
diff --git a/targets/minecraft/client/gui/inventory/AbstractContainerScreen.cpp b/targets/minecraft/client/gui/inventory/AbstractContainerScreen.cpp
index 87f8baa23..9456dfd3e 100644
--- a/targets/minecraft/client/gui/inventory/AbstractContainerScreen.cpp
+++ b/targets/minecraft/client/gui/inventory/AbstractContainerScreen.cpp
@@ -5,7 +5,7 @@
 #include <vector>
 
 #include "app/linux/LinuxGame.h"
-#include "app/common/stubs.h"
+#include "platform/stubs.h"
 #include "minecraft/client/KeyMapping.h"
 #include "minecraft/client/Lighting.h"
 #include "minecraft/client/Minecraft.h"
diff --git a/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp b/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp
index a7da8ae18..ac5edd501 100644
--- a/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp
+++ b/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp
@@ -11,7 +11,7 @@
 #include "AbstractContainerScreen.h"
 #include "app/common/UI/All Platforms/IUIScene_CreativeMenu.h"
 #include "app/linux/LinuxGame.h"
-#include "app/common/stubs.h"
+#include "platform/stubs.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/Lighting.h"
 #include "minecraft/client/gui/Screen.h"
diff --git a/targets/minecraft/client/gui/inventory/TextEditScreen.cpp b/targets/minecraft/client/gui/inventory/TextEditScreen.cpp
index 094f315c1..356665fbc 100644
--- a/targets/minecraft/client/gui/inventory/TextEditScreen.cpp
+++ b/targets/minecraft/client/gui/inventory/TextEditScreen.cpp
@@ -3,7 +3,7 @@
 #include <vector>
 
 #include "platform/sdl2/Render.h"
-#include "app/common/stubs.h"
+#include "platform/stubs.h"
 #include "minecraft/SharedConstants.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/gui/Button.h"
diff --git a/targets/minecraft/client/gui/particle/GuiParticle.cpp b/targets/minecraft/client/gui/particle/GuiParticle.cpp
index 51e37513b..c7aae80d0 100644
--- a/targets/minecraft/client/gui/particle/GuiParticle.cpp
+++ b/targets/minecraft/client/gui/particle/GuiParticle.cpp
@@ -1,6 +1,6 @@
 #include "GuiParticle.h"
 
-#include "app/common/stubs.h"
+#include "platform/stubs.h"
 #include "java/Random.h"
 
 Random* GuiParticle::random = new Random();
diff --git a/targets/minecraft/client/model/HumanoidModel.h b/targets/minecraft/client/model/HumanoidModel.h
index 02dba22af..f42c4b428 100644
--- a/targets/minecraft/client/model/HumanoidModel.h
+++ b/targets/minecraft/client/model/HumanoidModel.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "app/common/SkinBox.h"
+#include "minecraft/client/SkinBox.h"
 #include "minecraft/client/model/geom/Model.h"
 
 class ModelPart;
diff --git a/targets/minecraft/client/model/geom/Model.h b/targets/minecraft/client/model/geom/Model.h
index e755e7e8f..276c58a95 100644
--- a/targets/minecraft/client/model/geom/Model.h
+++ b/targets/minecraft/client/model/geom/Model.h
@@ -5,7 +5,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "app/common/SkinBox.h"
+#include "minecraft/client/SkinBox.h"
 #include "java/Random.h"
 
 class Mob;
diff --git a/targets/minecraft/client/model/geom/ModelPart.h b/targets/minecraft/client/model/geom/ModelPart.h
index 9d673098b..72fe9aeea 100644
--- a/targets/minecraft/client/model/geom/ModelPart.h
+++ b/targets/minecraft/client/model/geom/ModelPart.h
@@ -2,7 +2,7 @@
 #include <string>
 #include <vector>
 
-#include "app/common/SkinBox.h"
+#include "minecraft/client/SkinBox.h"
 #include "Model.h"
 #include "minecraft/client/model/Polygon.h"
 #include "minecraft/client/model/Vertex.h"
diff --git a/targets/minecraft/client/renderer/Chunk.cpp b/targets/minecraft/client/renderer/Chunk.cpp
index 5d50383d4..989476468 100644
--- a/targets/minecraft/client/renderer/Chunk.cpp
+++ b/targets/minecraft/client/renderer/Chunk.cpp
@@ -12,7 +12,7 @@
 #include "platform/sdl2/Render.h"
 #include "LevelRenderer.h"
 #include "app/linux/Stubs/winapi_stubs.h"
-#include "app/common/FrameProfiler.h"
+#include "util/FrameProfiler.h"
 #include "TileRenderer.h"
 #include "minecraft/client/renderer/Tesselator.h"
 #include "minecraft/client/renderer/culling/Culler.h"
diff --git a/targets/minecraft/client/renderer/GameRenderer.cpp b/targets/minecraft/client/renderer/GameRenderer.cpp
index f8a8757fc..138c654f3 100644
--- a/targets/minecraft/client/renderer/GameRenderer.cpp
+++ b/targets/minecraft/client/renderer/GameRenderer.cpp
@@ -18,9 +18,9 @@
 #include "app/common/Colours/ColourTable.h"
 #include "app/linux/LinuxGame.h"
 #include "app/linux/Stubs/winapi_stubs.h"
-#include "app/common/BufferedImage.h"
-#include "app/common/FrameProfiler.h"
-#include "app/common/stubs.h"
+#include "minecraft/client/BufferedImage.h"
+#include "util/FrameProfiler.h"
+#include "platform/stubs.h"
 #include "Tesselator.h"
 #include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h"
 
diff --git a/targets/minecraft/client/renderer/LevelRenderer.cpp b/targets/minecraft/client/renderer/LevelRenderer.cpp
index ffd6a7561..6faeae699 100644
--- a/targets/minecraft/client/renderer/LevelRenderer.cpp
+++ b/targets/minecraft/client/renderer/LevelRenderer.cpp
@@ -23,9 +23,9 @@
 #include "app/common/Colours/ColourTable.h"
 #include "app/common/Console_Debug_enum.h"
 #include "app/linux/LinuxGame.h"
-#include "app/common/FrameProfiler.h"
-#include "app/common/MobSkinMemTextureProcessor.h"
-#include "app/common/stubs.h"
+#include "util/FrameProfiler.h"
+#include "minecraft/client/renderer/MobSkinMemTextureProcessor.h"
+#include "platform/stubs.h"
 #include "Tesselator.h"
 #include "util/StringHelpers.h"
 #include "java/Class.h"
diff --git a/targets/minecraft/client/renderer/LevelRenderer.h b/targets/minecraft/client/renderer/LevelRenderer.h
index 9b4f038f8..41a5aecdc 100644
--- a/targets/minecraft/client/renderer/LevelRenderer.h
+++ b/targets/minecraft/client/renderer/LevelRenderer.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "app/common/NetTypes.h"
-#include "app/common/SkinBox.h"
-#include "app/common/XboxStubs.h"
+#include "platform/NetTypes.h"
+#include "minecraft/client/SkinBox.h"
+#include "platform/XboxStubs.h"
 #include "OffsettedRenderList.h"
 #include "platform/C4JThread.h"
 #include "util/Definitions.h"
diff --git a/targets/minecraft/client/renderer/MemTexture.cpp b/targets/minecraft/client/renderer/MemTexture.cpp
index adbf8d0e8..a4d2b917a 100644
--- a/targets/minecraft/client/renderer/MemTexture.cpp
+++ b/targets/minecraft/client/renderer/MemTexture.cpp
@@ -1,9 +1,9 @@
-#include "app/common/MemTexture.h"
+#include "minecraft/client/renderer/MemTexture.h"
 
 #include <cstdint>
 #include <string>
 
-#include "app/common/BufferedImage.h"
+#include "minecraft/client/BufferedImage.h"
 
 class MemTextureProcessor;
 
diff --git a/targets/app/common/MemTexture.h b/targets/minecraft/client/renderer/MemTexture.h
similarity index 100%
rename from targets/app/common/MemTexture.h
rename to targets/minecraft/client/renderer/MemTexture.h
diff --git a/targets/app/common/MemTextureProcessor.h b/targets/minecraft/client/renderer/MemTextureProcessor.h
similarity index 100%
rename from targets/app/common/MemTextureProcessor.h
rename to targets/minecraft/client/renderer/MemTextureProcessor.h
diff --git a/targets/minecraft/client/renderer/MobSkinMemTextureProcessor.cpp b/targets/minecraft/client/renderer/MobSkinMemTextureProcessor.cpp
index 69f82f61b..08ee542ae 100644
--- a/targets/minecraft/client/renderer/MobSkinMemTextureProcessor.cpp
+++ b/targets/minecraft/client/renderer/MobSkinMemTextureProcessor.cpp
@@ -1,7 +1,7 @@
-#include "app/common/MobSkinMemTextureProcessor.h"
+#include "minecraft/client/renderer/MobSkinMemTextureProcessor.h"
 
-#include "app/common/BufferedImage.h"
-#include "app/common/stubs.h"
+#include "minecraft/client/BufferedImage.h"
+#include "platform/stubs.h"
 
 BufferedImage* MobSkinMemTextureProcessor::process(BufferedImage* in) {
     if (in == nullptr) return nullptr;
diff --git a/targets/app/common/MobSkinMemTextureProcessor.h b/targets/minecraft/client/renderer/MobSkinMemTextureProcessor.h
similarity index 86%
rename from targets/app/common/MobSkinMemTextureProcessor.h
rename to targets/minecraft/client/renderer/MobSkinMemTextureProcessor.h
index aa93beca9..131716ed0 100644
--- a/targets/app/common/MobSkinMemTextureProcessor.h
+++ b/targets/minecraft/client/renderer/MobSkinMemTextureProcessor.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "app/common/MemTextureProcessor.h"
+#include "minecraft/client/renderer/MemTextureProcessor.h"
 
 class MobSkinMemTextureProcessor : public MemTextureProcessor {
 private:
diff --git a/targets/minecraft/client/renderer/MobSkinTextureProcessor.cpp b/targets/minecraft/client/renderer/MobSkinTextureProcessor.cpp
index ae8bd1729..3c48ed8c8 100644
--- a/targets/minecraft/client/renderer/MobSkinTextureProcessor.cpp
+++ b/targets/minecraft/client/renderer/MobSkinTextureProcessor.cpp
@@ -1,7 +1,7 @@
 #include "MobSkinTextureProcessor.h"
 
-#include "app/common/BufferedImage.h"
-#include "app/common/stubs.h"
+#include "minecraft/client/BufferedImage.h"
+#include "platform/stubs.h"
 
 BufferedImage* MobSkinTextureProcessor::process(BufferedImage* in) {
     if (in == nullptr) return nullptr;
diff --git a/targets/minecraft/client/renderer/Tesselator.cpp b/targets/minecraft/client/renderer/Tesselator.cpp
index b652fb6e2..b9ea4caf3 100644
--- a/targets/minecraft/client/renderer/Tesselator.cpp
+++ b/targets/minecraft/client/renderer/Tesselator.cpp
@@ -6,7 +6,7 @@
 
 #include "platform/sdl2/Render.h"
 #include "app/linux/LinuxGame.h"
-#include "app/common/stubs.h"
+#include "platform/stubs.h"
 #include "minecraft/client/MemoryTracker.h"
 
 bool Tesselator::TRIANGLE_MODE = false;
diff --git a/targets/minecraft/client/renderer/Textures.cpp b/targets/minecraft/client/renderer/Textures.cpp
index 5943b8b31..ea184c456 100644
--- a/targets/minecraft/client/renderer/Textures.cpp
+++ b/targets/minecraft/client/renderer/Textures.cpp
@@ -10,10 +10,10 @@
 #include "platform/sdl2/Render.h"
 #include "HttpTexture.h"
 #include "app/linux/LinuxGame.h"
-#include "app/common/BufferedImage.h"
-#include "app/common/MemTexture.h"
-#include "app/common/MemTextureProcessor.h"
-#include "app/common/MobSkinMemTextureProcessor.h"
+#include "minecraft/client/BufferedImage.h"
+#include "minecraft/client/renderer/MemTexture.h"
+#include "minecraft/client/renderer/MemTextureProcessor.h"
+#include "minecraft/client/renderer/MobSkinMemTextureProcessor.h"
 #include "util/StringHelpers.h"
 
 #include "java/Buffer.h"
diff --git a/targets/minecraft/client/renderer/TileRenderer.cpp b/targets/minecraft/client/renderer/TileRenderer.cpp
index 9e76453c1..43f7a327e 100644
--- a/targets/minecraft/client/renderer/TileRenderer.cpp
+++ b/targets/minecraft/client/renderer/TileRenderer.cpp
@@ -14,7 +14,7 @@
 #include "GameRenderer.h"
 #include "app/common/App_enums.h"
 #include "app/common/Colours/ColourTable.h"
-#include "app/common/FrameProfiler.h"
+#include "util/FrameProfiler.h"
 #include "Tesselator.h"
 #include "minecraft/Direction.h"
 #include "minecraft/Facing.h"
diff --git a/targets/minecraft/client/renderer/entity/PlayerRenderer.h b/targets/minecraft/client/renderer/entity/PlayerRenderer.h
index 79c348a1f..8e20b4442 100644
--- a/targets/minecraft/client/renderer/entity/PlayerRenderer.h
+++ b/targets/minecraft/client/renderer/entity/PlayerRenderer.h
@@ -2,9 +2,9 @@
 #include <memory>
 #include <string>
 
-#include "app/common/NetTypes.h"
-#include "app/common/SkinBox.h"
-#include "app/common/XboxStubs.h"
+#include "platform/NetTypes.h"
+#include "minecraft/client/SkinBox.h"
+#include "platform/XboxStubs.h"
 #include "MobRenderer.h"
 #include "minecraft/client/renderer/entity/LivingEntityRenderer.h"
 #include "minecraft/world/entity/player/Player.h"
diff --git a/targets/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp b/targets/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp
index 07be9512a..65d3a574f 100644
--- a/targets/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp
+++ b/targets/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp
@@ -5,7 +5,7 @@
 
 #include "app/linux/LinuxGame.h"
 #include "app/linux/Stubs/winapi_stubs.h"
-#include "app/common/BufferedImage.h"
+#include "minecraft/client/BufferedImage.h"
 #include "SimpleIcon.h"
 #include "StitchedTexture.h"
 #include "Texture.h"
diff --git a/targets/minecraft/client/renderer/texture/Texture.cpp b/targets/minecraft/client/renderer/texture/Texture.cpp
index e62c47d27..ecf188999 100644
--- a/targets/minecraft/client/renderer/texture/Texture.cpp
+++ b/targets/minecraft/client/renderer/texture/Texture.cpp
@@ -7,7 +7,7 @@
 
 #include "platform/sdl2/Render.h"
 #include "app/linux/LinuxGame.h"
-#include "app/common/BufferedImage.h"
+#include "minecraft/client/BufferedImage.h"
 #include "TextureManager.h"
 #include "java/Buffer.h"
 #include "java/ByteBuffer.h"
diff --git a/targets/minecraft/client/renderer/texture/TextureManager.cpp b/targets/minecraft/client/renderer/texture/TextureManager.cpp
index 9014d4907..aed33c94c 100644
--- a/targets/minecraft/client/renderer/texture/TextureManager.cpp
+++ b/targets/minecraft/client/renderer/texture/TextureManager.cpp
@@ -6,7 +6,7 @@
 #include <vector>
 
 #include "app/linux/LinuxGame.h"
-#include "app/common/BufferedImage.h"
+#include "minecraft/client/BufferedImage.h"
 #include "Stitcher.h"
 #include "Texture.h"
 #include "java/File.h"
diff --git a/targets/minecraft/client/renderer/texture/TextureMap.cpp b/targets/minecraft/client/renderer/texture/TextureMap.cpp
index 0e50a73bf..bf973d163 100644
--- a/targets/minecraft/client/renderer/texture/TextureMap.cpp
+++ b/targets/minecraft/client/renderer/texture/TextureMap.cpp
@@ -7,7 +7,7 @@
 
 #include "app/linux/LinuxGame.h"
 #include "app/linux/Stubs/winapi_stubs.h"
-#include "app/common/BufferedImage.h"
+#include "minecraft/client/BufferedImage.h"
 #include "StitchSlot.h"
 #include "StitchedTexture.h"
 #include "Stitcher.h"
diff --git a/targets/minecraft/client/renderer/tileentity/SignRenderer.cpp b/targets/minecraft/client/renderer/tileentity/SignRenderer.cpp
index fe3885404..afaa763e9 100644
--- a/targets/minecraft/client/renderer/tileentity/SignRenderer.cpp
+++ b/targets/minecraft/client/renderer/tileentity/SignRenderer.cpp
@@ -8,7 +8,7 @@
 #include "app/common/App_enums.h"
 #include "app/common/Colours/ColourTable.h"
 #include "app/linux/LinuxGame.h"
-#include "app/common/XboxStubs.h"
+#include "platform/XboxStubs.h"
 
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/gui/Font.h"
diff --git a/targets/minecraft/client/skins/AbstractTexturePack.cpp b/targets/minecraft/client/skins/AbstractTexturePack.cpp
index b6e3352c4..5c3d36eb6 100644
--- a/targets/minecraft/client/skins/AbstractTexturePack.cpp
+++ b/targets/minecraft/client/skins/AbstractTexturePack.cpp
@@ -9,7 +9,7 @@
 #include "app/linux/LinuxGame.h"
 #include "app/linux/Linux_UIController.h"
 #include "app/linux/Stubs/winapi_stubs.h"
-#include "app/common/BufferedImage.h"
+#include "minecraft/client/BufferedImage.h"
 #include "util/StringHelpers.h"
 #include "java/File.h"
 #include "java/InputOutputStream/BufferedReader.h"
diff --git a/targets/minecraft/client/skins/DLCTexturePack.cpp b/targets/minecraft/client/skins/DLCTexturePack.cpp
index 74e2452b3..022d2cad8 100644
--- a/targets/minecraft/client/skins/DLCTexturePack.cpp
+++ b/targets/minecraft/client/skins/DLCTexturePack.cpp
@@ -26,7 +26,7 @@
 #include "app/linux/LinuxGame.h"
 #include "app/linux/Linux_UIController.h"
 #include "app/linux/Stubs/winapi_stubs.h"
-#include "app/common/BufferedImage.h"
+#include "minecraft/client/BufferedImage.h"
 #include "platform/PlatformServices.h"
 #include "java/File.h"
 #include "minecraft/client/Minecraft.h"
diff --git a/targets/minecraft/client/title/TitleScreen.cpp b/targets/minecraft/client/title/TitleScreen.cpp
index f097ba06e..7faa2c244 100644
--- a/targets/minecraft/client/title/TitleScreen.cpp
+++ b/targets/minecraft/client/title/TitleScreen.cpp
@@ -8,7 +8,7 @@
 #include "platform/sdl2/Render.h"
 #include "app/linux/LinuxGame.h"
 #include "app/linux/Stubs/winapi_stubs.h"
-#include "app/common/BufferedImage.h"
+#include "minecraft/client/BufferedImage.h"
 #include "util/StringHelpers.h"
 #include "java/InputOutputStream/BufferedReader.h"
 #include "java/InputOutputStream/ByteArrayInputStream.h"
diff --git a/targets/minecraft/network/packet/TextureAndGeometryPacket.h b/targets/minecraft/network/packet/TextureAndGeometryPacket.h
index 09261b9e3..604454666 100644
--- a/targets/minecraft/network/packet/TextureAndGeometryPacket.h
+++ b/targets/minecraft/network/packet/TextureAndGeometryPacket.h
@@ -5,7 +5,7 @@
 #include <string>
 #include <vector>
 
-#include "app/common/SkinBox.h"
+#include "minecraft/client/SkinBox.h"
 #include "Packet.h"
 #include "minecraft/client/model/geom/Model.h"
 #include "minecraft/network/packet/Packet.h"
diff --git a/targets/minecraft/server/PlayerList.cpp b/targets/minecraft/server/PlayerList.cpp
index ab48402ff..169604f5f 100644
--- a/targets/minecraft/server/PlayerList.cpp
+++ b/targets/minecraft/server/PlayerList.cpp
@@ -20,7 +20,7 @@
 #include "app/common/Tutorial/TutorialEnum.h"
 #include "app/linux/LinuxGame.h"
 #include "app/linux/Stubs/winapi_stubs.h"
-#include "app/common/NetTypes.h"
+#include "platform/NetTypes.h"
 #include "MinecraftServer.h"
 #include "Settings.h"
 #include "minecraft/world/entity/player/SkinTypes.h"
diff --git a/targets/minecraft/server/network/PendingConnection.cpp b/targets/minecraft/server/network/PendingConnection.cpp
index 408955bfa..a7665f366 100644
--- a/targets/minecraft/server/network/PendingConnection.cpp
+++ b/targets/minecraft/server/network/PendingConnection.cpp
@@ -13,7 +13,7 @@
 #include "platform/IPlatformNetwork.h"
 #include "app/linux/LinuxGame.h"
 #include "app/linux/Stubs/winapi_stubs.h"
-#include "app/common/NetTypes.h"
+#include "platform/NetTypes.h"
 #include "PlayerConnection.h"
 #include "ServerConnection.h"
 #include "java/Random.h"
diff --git a/targets/minecraft/server/network/PlayerConnection.cpp b/targets/minecraft/server/network/PlayerConnection.cpp
index 8fd7c8bcd..8cd9fe231 100644
--- a/targets/minecraft/server/network/PlayerConnection.cpp
+++ b/targets/minecraft/server/network/PlayerConnection.cpp
@@ -16,7 +16,7 @@
 #include "app/common/Network/NetworkPlayerInterface.h"
 #include "app/common/Network/Socket.h"
 #include "app/linux/LinuxGame.h"
-#include "app/common/SkinBox.h"
+#include "minecraft/client/SkinBox.h"
 #include "ServerConnection.h"
 #include "java/Class.h"
 #include "java/InputOutputStream/ByteArrayInputStream.h"
diff --git a/targets/minecraft/world/level/Level.cpp b/targets/minecraft/world/level/Level.cpp
index 63088bc1f..38cf58b57 100644
--- a/targets/minecraft/world/level/Level.cpp
+++ b/targets/minecraft/world/level/Level.cpp
@@ -21,7 +21,7 @@
 #include "app/common/Network/GameNetworkManager.h"
 #include "app/linux/LinuxGame.h"
 #include "app/linux/Stubs/winapi_stubs.h"
-#include "app/common/FrameProfiler.h"
+#include "util/FrameProfiler.h"
 #include "java/Random.h"
 #include "minecraft/Direction.h"
 #include "minecraft/Facing.h"
diff --git a/targets/minecraft/world/level/chunk/CompressedTileStorage.cpp b/targets/minecraft/world/level/chunk/CompressedTileStorage.cpp
index 407d8b8ea..ffeefde22 100644
--- a/targets/minecraft/world/level/chunk/CompressedTileStorage.cpp
+++ b/targets/minecraft/world/level/chunk/CompressedTileStorage.cpp
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "app/linux/Stubs/winapi_stubs.h"
-#include "app/common/NetTypes.h"
+#include "platform/NetTypes.h"
 #include "util/Definitions.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
diff --git a/targets/minecraft/world/level/chunk/SparseDataStorage.cpp b/targets/minecraft/world/level/chunk/SparseDataStorage.cpp
index ff6279c4e..5c7bf9c6c 100644
--- a/targets/minecraft/world/level/chunk/SparseDataStorage.cpp
+++ b/targets/minecraft/world/level/chunk/SparseDataStorage.cpp
@@ -7,7 +7,7 @@
 #include <vector>
 
 #include "app/linux/Stubs/winapi_stubs.h"
-#include "app/common/NetTypes.h"
+#include "platform/NetTypes.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
diff --git a/targets/minecraft/world/level/chunk/SparseLightStorage.cpp b/targets/minecraft/world/level/chunk/SparseLightStorage.cpp
index c0836b13d..8d507bc7b 100644
--- a/targets/minecraft/world/level/chunk/SparseLightStorage.cpp
+++ b/targets/minecraft/world/level/chunk/SparseLightStorage.cpp
@@ -7,7 +7,7 @@
 #include <vector>
 
 #include "app/linux/Stubs/winapi_stubs.h"
-#include "app/common/NetTypes.h"
+#include "platform/NetTypes.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
diff --git a/targets/platform/IPlatformNetwork.h b/targets/platform/IPlatformNetwork.h
index 7373be495..ce5c682b3 100644
--- a/targets/platform/IPlatformNetwork.h
+++ b/targets/platform/IPlatformNetwork.h
@@ -6,7 +6,7 @@
 #include <vector>
 
 #include "PlatformTypes.h"
-#include "app/common/NetTypes.h"
+#include "platform/NetTypes.h"
 
 #ifndef VER_NETWORK
 #define VER_NETWORK 560
diff --git a/targets/app/common/NetTypes.h b/targets/platform/NetTypes.h
similarity index 100%
rename from targets/app/common/NetTypes.h
rename to targets/platform/NetTypes.h
diff --git a/targets/app/common/XboxStubs.h b/targets/platform/XboxStubs.h
similarity index 100%
rename from targets/app/common/XboxStubs.h
rename to targets/platform/XboxStubs.h
diff --git a/targets/app/common/stubs.h b/targets/platform/stubs.h
similarity index 100%
rename from targets/app/common/stubs.h
rename to targets/platform/stubs.h
diff --git a/targets/app/common/FrameProfiler.cpp b/targets/util/FrameProfiler.cpp
similarity index 100%
rename from targets/app/common/FrameProfiler.cpp
rename to targets/util/FrameProfiler.cpp
diff --git a/targets/app/common/FrameProfiler.h b/targets/util/FrameProfiler.h
similarity index 100%
rename from targets/app/common/FrameProfiler.h
rename to targets/util/FrameProfiler.h
diff --git a/targets/util/meson.build b/targets/util/meson.build
index b0f4c4303..dab85918c 100644
--- a/targets/util/meson.build
+++ b/targets/util/meson.build
@@ -4,7 +4,7 @@ simdutf_dep = dependency('simdutf',
 )
 
 lib_util = static_library('util',
-  files('StringHelpers.cpp'),
+  files('StringHelpers.cpp', 'FrameProfiler.cpp'),
   dependencies: [simdutf_dep],
   include_directories : include_directories('.', '..'),
   cpp_args : global_cpp_args + global_cpp_defs,