fix: reformat includes, with correct slashes and capitalization

2026-08-20 09:57:09 +00:00 · 2026-03-04 12:41:52 -05:00 · 2026-03-04 12:41:52 -05:00 · 822d2af4fa
parent 9236e57af4
commit 822d2af4fa
824 changed files with 3206 additions and 3206 deletions
--- a/Minecraft.Client/AbstractContainerScreen.cpp
+++ b/Minecraft.Client/AbstractContainerScreen.cpp
@ -6,9 +6,9 @@
 #include "GameMode.h"
 #include "KeyMapping.h"
 #include "Options.h"
-#include "..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\Minecraft.World\net.minecraft.locale.h"
-#include "..\Minecraft.World\net.minecraft.world.item.h"
+#include "Minecraft.World/net.minecraft.world.inventory.h"
+#include "Minecraft.World/net.minecraft.locale.h"
+#include "Minecraft.World/net.minecraft.world.item.h"

 ItemRenderer *AbstractContainerScreen::itemRenderer = new ItemRenderer();

--- a/Minecraft.Client/AbstractProjectileDispenseBehavior.cpp
+++ b/Minecraft.Client/AbstractProjectileDispenseBehavior.cpp
@ -1,8 +1,8 @@
 #include "stdafx.h"
-#include "..\Minecraft.World\net.minecraft.core.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.projectile.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
-#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "Minecraft.World/net.minecraft.core.h"
+#include "Minecraft.World/net.minecraft.world.entity.projectile.h"
+#include "Minecraft.World/net.minecraft.world.level.tile.h"
+#include "Minecraft.World/net.minecraft.world.level.h"
 #include "AbstractProjectileDispenseBehavior.h"

 shared_ptr<ItemInstance> AbstractProjectileDispenseBehavior::execute(BlockSource *source, shared_ptr<ItemInstance> dispensed)
--- a/Minecraft.Client/AbstractProjectileDispenseBehavior.h
+++ b/Minecraft.Client/AbstractProjectileDispenseBehavior.h
@ -1,6 +1,6 @@
 #pragma once

-#include "..\Minecraft.World\DefaultDispenseItemBehavior.h"
+#include "Minecraft.World/DefaultDispenseItemBehavior.h"

 class Projectile;

--- a/Minecraft.Client/AbstractTexturePack.cpp
+++ b/Minecraft.Client/AbstractTexturePack.cpp
@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "Textures.h"
 #include "AbstractTexturePack.h"
-#include "..\Minecraft.World\InputOutputStream.h"
-#include "..\Minecraft.World\StringHelpers.h"
+#include "Minecraft.World/InputOutputStream.h"
+#include "Minecraft.World/StringHelpers.h"

 AbstractTexturePack::AbstractTexturePack(DWORD id, File *file, const wstring &name, TexturePack *fallback) : id(id), name(name)
 {
--- a/Minecraft.Client/AchievementPopup.cpp
+++ b/Minecraft.Client/AchievementPopup.cpp
@ -4,10 +4,10 @@
 #include "Font.h"
 #include "Textures.h"
 #include "Lighting.h"
-#include "..\Minecraft.World\System.h"
-#include "..\Minecraft.World\net.minecraft.locale.h"
-#include "..\Minecraft.World\net.minecraft.stats.h"
-#include "..\Minecraft.World\SharedConstants.h"
+#include "Minecraft.World/System.h"
+#include "Minecraft.World/net.minecraft.locale.h"
+#include "Minecraft.World/net.minecraft.stats.h"
+#include "Minecraft.World/SharedConstants.h"

 AchievementPopup::AchievementPopup(Minecraft *mc)
 {
--- a/Minecraft.Client/AchievementScreen.cpp
+++ b/Minecraft.Client/AchievementScreen.cpp
@ -8,10 +8,10 @@
 #include "Textures.h"
 #include "StatsCounter.h"
 #include "ItemRenderer.h"
-#include "..\Minecraft.World\System.h"
-#include "..\Minecraft.World\net.minecraft.locale.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
-#include "..\Minecraft.World\JavaMath.h"
+#include "Minecraft.World/System.h"
+#include "Minecraft.World/net.minecraft.locale.h"
+#include "Minecraft.World/net.minecraft.world.level.tile.h"
+#include "Minecraft.World/JavaMath.h"



--- a/Minecraft.Client/AchievementScreen.h
+++ b/Minecraft.Client/AchievementScreen.h
@ -1,6 +1,6 @@
 #pragma once
 #include "Screen.h"
-#include "..\Minecraft.World\net.minecraft.stats.h"
+#include "Minecraft.World/net.minecraft.stats.h"
 class StatsCounter;

 class AchievementScreen : public Screen
--- a/Minecraft.Client/ArchiveFile.cpp
+++ b/Minecraft.Client/ArchiveFile.cpp
@ -1,7 +1,7 @@
 #include "stdafx.h"

-#include "..\Minecraft.World\StringHelpers.h"
-#include "..\Minecraft.World\compression.h"
+#include "Minecraft.World/StringHelpers.h"
+#include "Minecraft.World/compression.h"

 #include "ArchiveFile.h"

--- a/Minecraft.Client/ArchiveFile.h
+++ b/Minecraft.Client/ArchiveFile.h
@ -3,8 +3,8 @@
 #include <vector>
 #include <unordered_map>

-#include "..\Minecraft.World\File.h"
-#include "..\Minecraft.World\ArrayWithLength.h"
+#include "Minecraft.World/File.h"
+#include "Minecraft.World/ArrayWithLength.h"

 using namespace std;

--- a/Minecraft.Client/ArrowRenderer.cpp
+++ b/Minecraft.Client/ArrowRenderer.cpp
@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "ArrowRenderer.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.projectile.h"
-#include "..\Minecraft.World\Mth.h"
+#include "Minecraft.World/net.minecraft.world.entity.projectile.h"
+#include "Minecraft.World/Mth.h"

 ResourceLocation ArrowRenderer::ARROW_LOCATION = ResourceLocation(TN_ITEM_ARROWS);

--- a/Minecraft.Client/BatModel.cpp
+++ b/Minecraft.Client/BatModel.cpp
@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.ambient.h"
+#include "Minecraft.World/net.minecraft.world.entity.ambient.h"
 #include "BatModel.h"
 #include "ModelPart.h"

--- a/Minecraft.Client/BatRenderer.cpp
+++ b/Minecraft.Client/BatRenderer.cpp
@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.ambient.h"
+#include "Minecraft.World/net.minecraft.world.entity.ambient.h"
 #include "BatRenderer.h"
 #include "BatModel.h"

--- a/Minecraft.Client/BeaconRenderer.cpp
+++ b/Minecraft.Client/BeaconRenderer.cpp
@ -1,6 +1,6 @@
 #include "stdafx.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
-#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "Minecraft.World/net.minecraft.world.level.tile.entity.h"
+#include "Minecraft.World/net.minecraft.world.level.h"
 #include "BeaconRenderer.h"
 #include "Tesselator.h"

--- a/Minecraft.Client/BlazeModel.cpp
+++ b/Minecraft.Client/BlazeModel.cpp
@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "..\Minecraft.World\Mth.h"
+#include "Minecraft.World/Mth.h"
 #include "BlazeModel.h"
 #include "ModelPart.h"

--- a/Minecraft.Client/BlazeRenderer.cpp
+++ b/Minecraft.Client/BlazeRenderer.cpp
@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "BlazeModel.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.monster.h"
+#include "Minecraft.World/net.minecraft.world.entity.monster.h"
 #include "BlazeRenderer.h"

 ResourceLocation BlazeRenderer::BLAZE_LOCATION = ResourceLocation(TN_MOB_BLAZE);
--- a/Minecraft.Client/BoatRenderer.cpp
+++ b/Minecraft.Client/BoatRenderer.cpp
@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "BoatRenderer.h"
 #include "BoatModel.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.item.h"
-#include "..\Minecraft.World\Mth.h"
+#include "Minecraft.World/net.minecraft.world.entity.item.h"
+#include "Minecraft.World/Mth.h"

 ResourceLocation BoatRenderer::BOAT_LOCATION = ResourceLocation(TN_ITEM_BOAT);

--- a/Minecraft.Client/BookModel.cpp
+++ b/Minecraft.Client/BookModel.cpp
@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "..\Minecraft.World\Mth.h"
+#include "Minecraft.World/Mth.h"
 #include "BookModel.h"
 #include "ModelPart.h"

--- a/Minecraft.Client/BossMobGuiInfo.cpp
+++ b/Minecraft.Client/BossMobGuiInfo.cpp
@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "BossMobGuiInfo.h"
-#include "../Minecraft.World/BossMob.h"
+#include "Minecraft.World/BossMob.h"

 float BossMobGuiInfo::healthProgress = 0.0f;
 int BossMobGuiInfo::displayTicks = 0;
--- a/Minecraft.Client/BreakingItemParticle.cpp
+++ b/Minecraft.Client/BreakingItemParticle.cpp
@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "BreakingItemParticle.h"
 #include "Tesselator.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
-#include "..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\Minecraft.World\net.minecraft.world.h"
+#include "Minecraft.World/net.minecraft.world.level.tile.h"
+#include "Minecraft.World/net.minecraft.world.item.h"
+#include "Minecraft.World/net.minecraft.world.h"

 void BreakingItemParticle::_init(Item *item, Textures *textures, int data)
 {	
--- a/Minecraft.Client/BubbleParticle.cpp
+++ b/Minecraft.Client/BubbleParticle.cpp
@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "BubbleParticle.h"
-#include "..\Minecraft.World\Random.h"
-#include "..\Minecraft.World\Mth.h"
-#include "..\Minecraft.World\JavaMath.h"
-#include "..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\Minecraft.World\net.minecraft.world.level.material.h"
+#include "Minecraft.World/Random.h"
+#include "Minecraft.World/Mth.h"
+#include "Minecraft.World/JavaMath.h"
+#include "Minecraft.World/net.minecraft.world.level.h"
+#include "Minecraft.World/net.minecraft.world.level.material.h"

 BubbleParticle::BubbleParticle(Level *level, double x, double y, double z, double xa, double ya, double za) : Particle(level, x, y, z, xa, ya, za)
 	{
--- a/Minecraft.Client/BufferedImage.cpp
+++ b/Minecraft.Client/BufferedImage.cpp
@ -1,7 +1,7 @@
 #include "stdafx.h"	
-#include "..\Minecraft.World\StringHelpers.h"
+#include "Minecraft.World/StringHelpers.h"
 #include "Textures.h"
-#include "..\Minecraft.World\ArrayWithLength.h"
+#include "Minecraft.World/ArrayWithLength.h"
 #include "BufferedImage.h"

 #ifdef _XBOX
--- a/Minecraft.Client/Camera.cpp
+++ b/Minecraft.Client/Camera.cpp
@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Camera.h"
 #include "MemoryTracker.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.player.h"
-#include "..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
-#include "..\Minecraft.World\TilePos.h"
+#include "Minecraft.World/net.minecraft.world.entity.player.h"
+#include "Minecraft.World/net.minecraft.world.level.h"
+#include "Minecraft.World/net.minecraft.world.level.tile.h"
+#include "Minecraft.World/TilePos.h"

 float Camera::xPlayerOffs = 0.0f;
 float Camera::yPlayerOffs = 0.0f;
--- a/Minecraft.Client/Camera.h
+++ b/Minecraft.Client/Camera.h
@ -1,6 +1,6 @@
 #pragma once
-#include "..\Minecraft.World\FloatBuffer.h"
-#include "..\Minecraft.World\IntBuffer.h"
+#include "Minecraft.World/FloatBuffer.h"
+#include "Minecraft.World/IntBuffer.h"


 class TilePos;
--- a/Minecraft.Client/ChatScreen.cpp
+++ b/Minecraft.Client/ChatScreen.cpp
@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "ChatScreen.h"
 #include "MultiplayerLocalPlayer.h"
-#include "..\Minecraft.World\SharedConstants.h"
-#include "..\Minecraft.World\StringHelpers.h"
+#include "Minecraft.World/SharedConstants.h"
+#include "Minecraft.World/StringHelpers.h"

 const wstring ChatScreen::allowedChars = SharedConstants::acceptableLetters;

--- a/Minecraft.Client/ChestRenderer.cpp
+++ b/Minecraft.Client/ChestRenderer.cpp
@ -3,9 +3,9 @@
 #include "ChestModel.h"
 #include "LargeChestModel.h"
 #include "ModelPart.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
-#include "..\Minecraft.World\Calendar.h"
+#include "Minecraft.World/net.minecraft.world.level.tile.entity.h"
+#include "Minecraft.World/net.minecraft.world.level.tile.h"
+#include "Minecraft.World/Calendar.h"

 ResourceLocation ChestRenderer::CHEST_LARGE_TRAP_LOCATION = ResourceLocation(TN_TILE_LARGE_TRAP_CHEST);
 //ResourceLocation ChestRenderer::CHEST_LARGE_XMAS_LOCATION = ResourceLocation(TN_TILE_LARGE_XMAS_CHEST);
--- a/Minecraft.Client/ChickenModel.cpp
+++ b/Minecraft.Client/ChickenModel.cpp
@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "..\Minecraft.World\Mth.h"
+#include "Minecraft.World/Mth.h"
 #include "ChickenModel.h"
 #include "ModelPart.h"

--- a/Minecraft.Client/ChickenRenderer.cpp
+++ b/Minecraft.Client/ChickenRenderer.cpp
@ -1,7 +1,7 @@
 #include "stdafx.h"
-#include "..\Minecraft.World\Mth.h"
+#include "Minecraft.World/Mth.h"
 #include "ChickenRenderer.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
+#include "Minecraft.World/net.minecraft.world.entity.animal.h"

 ResourceLocation ChickenRenderer::CHICKEN_LOCATION = ResourceLocation(TN_MOB_CHICKEN);

--- a/Minecraft.Client/Chunk.cpp
+++ b/Minecraft.Client/Chunk.cpp
@ -2,16 +2,16 @@
 #include "Chunk.h"
 #include "TileRenderer.h"
 #include "TileEntityRenderDispatcher.h"
-#include "..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\Minecraft.World\net.minecraft.world.level.chunk.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
+#include "Minecraft.World/net.minecraft.world.level.h"
+#include "Minecraft.World/net.minecraft.world.level.chunk.h"
+#include "Minecraft.World/net.minecraft.world.level.tile.h"
+#include "Minecraft.World/net.minecraft.world.level.tile.entity.h"
 #include "LevelRenderer.h"

 #ifdef __PS3__
-#include "PS3\SPU_Tasks\ChunkUpdate\ChunkRebuildData.h"
-#include "PS3\SPU_Tasks\ChunkUpdate\TileRenderer_SPU.h"
-#include "PS3\SPU_Tasks\CompressedTile\CompressedTileStorage_SPU.h"
+#include "PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.h"
+#include "PS3/SPU_Tasks/ChunkUpdate/TileRenderer_SPU.h"
+#include "PS3/SPU_Tasks/CompressedTile/CompressedTileStorage_SPU.h"

 #include "C4JThread_SPU.h"
 #include "C4JSpursJob.h"
--- a/Minecraft.Client/Chunk.h
+++ b/Minecraft.Client/Chunk.h
@ -1,7 +1,7 @@
 #pragma once
 #include "AllowAllCuller.h"
 #include "Tesselator.h"
-#include "..\Minecraft.World\ArrayWithLength.h"
+#include "Minecraft.World/ArrayWithLength.h"
 #include "LevelRenderer.h"

 class Level;
--- a/Minecraft.Client/ClientConnection.cpp
+++ b/Minecraft.Client/ClientConnection.cpp
@ -9,46 +9,46 @@
 #include "TakeAnimationParticle.h"
 #include "CritParticle.h"
 #include "User.h"
-#include "..\Minecraft.World\net.minecraft.world.level.storage.h"
-#include "..\Minecraft.World\net.minecraft.world.level.chunk.h"
-#include "..\Minecraft.World\net.minecraft.stats.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.ai.attributes.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.player.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.npc.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.item.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.projectile.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.global.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.boss.enderdragon.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.monster.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
-#include "..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\Minecraft.World\net.minecraft.world.item.trading.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
-#include "..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\Minecraft.World\net.minecraft.world.h"
-#include "..\Minecraft.World\net.minecraft.world.level.saveddata.h"
-#include "..\Minecraft.World\net.minecraft.world.level.dimension.h"
-#include "..\Minecraft.World\net.minecraft.world.effect.h"
-#include "..\Minecraft.World\net.minecraft.world.food.h"
-#include "..\Minecraft.World\SharedConstants.h"
-#include "..\Minecraft.World\AABB.h"
-#include "..\Minecraft.World\Pos.h"
-#include "..\Minecraft.World\Socket.h"
+#include "Minecraft.World/net.minecraft.world.level.storage.h"
+#include "Minecraft.World/net.minecraft.world.level.chunk.h"
+#include "Minecraft.World/net.minecraft.stats.h"
+#include "Minecraft.World/net.minecraft.world.entity.h"
+#include "Minecraft.World/net.minecraft.world.entity.ai.attributes.h"
+#include "Minecraft.World/net.minecraft.world.entity.player.h"
+#include "Minecraft.World/net.minecraft.world.entity.animal.h"
+#include "Minecraft.World/net.minecraft.world.entity.npc.h"
+#include "Minecraft.World/net.minecraft.world.entity.item.h"
+#include "Minecraft.World/net.minecraft.world.entity.projectile.h"
+#include "Minecraft.World/net.minecraft.world.entity.global.h"
+#include "Minecraft.World/net.minecraft.world.entity.boss.enderdragon.h"
+#include "Minecraft.World/net.minecraft.world.entity.monster.h"
+#include "Minecraft.World/net.minecraft.world.level.tile.entity.h"
+#include "Minecraft.World/net.minecraft.world.item.h"
+#include "Minecraft.World/net.minecraft.world.item.trading.h"
+#include "Minecraft.World/net.minecraft.world.level.tile.h"
+#include "Minecraft.World/net.minecraft.world.inventory.h"
+#include "Minecraft.World/net.minecraft.world.h"
+#include "Minecraft.World/net.minecraft.world.level.saveddata.h"
+#include "Minecraft.World/net.minecraft.world.level.dimension.h"
+#include "Minecraft.World/net.minecraft.world.effect.h"
+#include "Minecraft.World/net.minecraft.world.food.h"
+#include "Minecraft.World/SharedConstants.h"
+#include "Minecraft.World/AABB.h"
+#include "Minecraft.World/Pos.h"
+#include "Minecraft.World/Socket.h"
 #include "Minecraft.h"
 #include "ProgressRenderer.h"
 #include "LevelRenderer.h"
 #include "Options.h"
 #include "MinecraftServer.h"
 #include "ClientConstants.h"
-#include "..\Minecraft.World\SoundTypes.h"
-#include "..\Minecraft.World\BasicTypeContainers.h"
+#include "Minecraft.World/SoundTypes.h"
+#include "Minecraft.World/BasicTypeContainers.h"
 #include "TexturePackRepository.h"
 #ifdef _XBOX
-#include "Common\XUI\XUI_Scene_Trading.h"
+#include "Common/XUI/XUI_Scene_Trading.h"
 #else
-#include "Common\UI\UI.h"
+#include "Common/UI/UI.h"
 #endif
 #ifdef __PS3__
 #include "PS3/Network/SonyVoiceChat.h"
@ -56,8 +56,8 @@
 #include "DLCTexturePack.h"

 #ifdef _DURANGO
-#include "..\Minecraft.World\DurangoStats.h"
-#include "..\Minecraft.World\GenericStats.h"
+#include "Minecraft.World/DurangoStats.h"
+#include "Minecraft.World/GenericStats.h"
 #endif

 ClientConnection::ClientConnection(Minecraft *minecraft, const wstring& ip, int port)
--- a/Minecraft.Client/ClientConnection.h
+++ b/Minecraft.Client/ClientConnection.h
@ -1,5 +1,5 @@
 #pragma once
-#include "..\Minecraft.World\net.minecraft.network.h"
+#include "Minecraft.World/net.minecraft.network.h"
 class Minecraft;
 class MultiPlayerLevel;
 class SavedDataStorage;
--- a/Minecraft.Client/ClockTexture.cpp
+++ b/Minecraft.Client/ClockTexture.cpp
@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "Minecraft.h"
-#include "..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\Minecraft.World\net.minecraft.world.level.dimension.h"
+#include "Minecraft.World/net.minecraft.world.level.h"
+#include "Minecraft.World/net.minecraft.world.level.dimension.h"
 #include "MultiplayerLocalPlayer.h"
-#include "..\Minecraft.World\JavaMath.h"
+#include "Minecraft.World/JavaMath.h"
 #include "Texture.h"
 #include "ClockTexture.h"

--- a/Minecraft.Client/Common/Audio/Consoles_SoundEngine.h
+++ b/Minecraft.Client/Common/Audio/Consoles_SoundEngine.h
@ -1,19 +1,19 @@
 #pragma once

-#include "..\..\..\Minecraft.World\SoundTypes.h"
+#include "Minecraft.World/SoundTypes.h"

 #ifdef _XBOX

 #elif defined (__PS3__)
 #undef __in
 #undef __out
-#include "..\..\PS3\Miles\include\mss.h"
+#include "Minecraft.Client/PS3/Miles/include/mss.h"
 #elif defined (__PSVITA__)
-#include "..\..\PSVITA\Miles\include\mss.h"
+#include "Minecraft.Client/PSVita/Miles/include/mss.h"
 #elif defined _DURANGO
 // 4J Stu - Temp define to get Miles to link, can likely be removed when we get a new version of Miles
 #define _SEKRIT
-#include "..\..\Durango\Miles\include\mss.h"
+#include "Minecraft.Client/Durango/Miles/include/mss.h"
 #elif defined _WINDOWS64
 #include <windows64/Miles/include/mss.h>
 #elif defined _CROSS64 
@ -21,7 +21,7 @@
 #else // PS4
 // 4J Stu - Temp define to get Miles to link, can likely be removed when we get a new version of Miles
 #define _SEKRIT2
-#include "..\..\Orbis\Miles\include\mss.h"
+#include "Minecraft.Client/Orbis/Miles/include/mss.h"
 #endif

 typedef struct
--- a/Minecraft.Client/Common/Audio/SoundEngine.cpp
+++ b/Minecraft.Client/Common/Audio/SoundEngine.cpp
@ -11,13 +11,13 @@
 #include <DLCTexturePack.h>
 #include <Common/DLC/DLCAudioFile.h>
 =======
-#include "..\Consoles_App.h"
-#include "..\..\MultiplayerLocalPlayer.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
+#include "Minecraft.Client/Common/Consoles_App.h"
+#include "Minecraft.Client/MultiPlayerLocalPlayer.h"
+#include "Minecraft.World/net.minecraft.world.level.h"
 #include "..\..\Minecraft.World\leveldata.h"
 #include "..\..\Minecraft.World\mth.h"
-#include "..\..\TexturePackRepository.h"
-#include "..\..\DLCTexturePack.h"
+#include "Minecraft.Client/TexturePackRepository.h"
+#include "Minecraft.Client/DLCTexturePack.h"
 #include "Common\DLC\DLCAudioFile.h"
 >>>>>>> parent of fef5c7b0 (the reformatting, pt 1)

--- a/Minecraft.Client/Common/Colours/ColourTable.cpp
+++ b/Minecraft.Client/Common/Colours/ColourTable.cpp
@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "ColourTable.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "Minecraft.World/StringHelpers.h"

 unordered_map<wstring,eMinecraftColour> ColourTable::s_colourNamesMap;

--- a/Minecraft.Client/Common/ConsoleGameMode.cpp
+++ b/Minecraft.Client/Common/ConsoleGameMode.cpp
@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "ConsoleGameMode.h"
-#include ".\Tutorial\Tutorial.h"
+#include "Tutorial/Tutorial.h"

 ConsoleGameMode::ConsoleGameMode(int iPad, Minecraft *minecraft, ClientConnection *connection)
 	: TutorialMode(iPad, minecraft, connection)
--- a/Minecraft.Client/Common/ConsoleGameMode.h
+++ b/Minecraft.Client/Common/ConsoleGameMode.h
@ -1,5 +1,5 @@
 #pragma once
-#include ".\Tutorial\TutorialMode.h"
+#include "Tutorial/TutorialMode.h"

 class ConsoleGameMode : public TutorialMode
 {
--- a/Minecraft.Client/Common/Consoles_App.cpp
+++ b/Minecraft.Client/Common/Consoles_App.cpp
@ -1,64 +1,64 @@

 #include "stdafx.h"
-#include "..\..\Minecraft.World\net.minecraft.world.entity.item.h"
-#include "..\..\Minecraft.World\net.minecraft.world.entity.player.h"
-#include "..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
-#include "..\..\Minecraft.World\net.minecraft.world.phys.h"
-#include "..\..\Minecraft.World\InputOutputStream.h"
-#include "..\..\Minecraft.World\compression.h"
-#include "..\Options.h"
-#include "..\MinecraftServer.h"
-#include "..\MultiPlayerLevel.h"
-#include "..\GameRenderer.h"
-#include "..\ProgressRenderer.h"
-#include "..\LevelRenderer.h"
-#include "..\MobSkinMemTextureProcessor.h"
-#include "..\Minecraft.h"
-#include "..\ClientConnection.h"
-#include "..\MultiPlayerLocalPlayer.h"
-#include "..\LocalPlayer.h"
-#include "..\..\Minecraft.World\Player.h"
-#include "..\..\Minecraft.World\Inventory.h"
-#include "..\..\Minecraft.World\Level.h"
-#include "..\..\Minecraft.World\FurnaceTileEntity.h"
-#include "..\..\Minecraft.World\Container.h"
-#include "..\..\Minecraft.World\DispenserTileEntity.h"
-#include "..\..\Minecraft.World\SignTileEntity.h"
-#include "..\StatsCounter.h"
-#include "..\GameMode.h"
-#include "..\Xbox\Social\SocialManager.h"
-#include "Tutorial\TutorialMode.h"
+#include "Minecraft.World/net.minecraft.world.entity.item.h"
+#include "Minecraft.World/net.minecraft.world.entity.player.h"
+#include "Minecraft.World/net.minecraft.world.level.tile.entity.h"
+#include "Minecraft.World/net.minecraft.world.phys.h"
+#include "Minecraft.World/InputOutputStream.h"
+#include "Minecraft.World/compression.h"
+#include "Minecraft.Client/Options.h"
+#include "Minecraft.Client/MinecraftServer.h"
+#include "Minecraft.Client/MultiPlayerLevel.h"
+#include "Minecraft.Client/GameRenderer.h"
+#include "Minecraft.Client/ProgressRenderer.h"
+#include "Minecraft.Client/LevelRenderer.h"
+#include "Minecraft.Client/MobSkinMemTextureProcessor.h"
+#include "Minecraft.Client/Minecraft.h"
+#include "Minecraft.Client/ClientConnection.h"
+#include "Minecraft.Client/MultiPlayerLocalPlayer.h"
+#include "Minecraft.Client/LocalPlayer.h"
+#include "Minecraft.World/Player.h"
+#include "Minecraft.World/Inventory.h"
+#include "Minecraft.World/Level.h"
+#include "Minecraft.World/FurnaceTileEntity.h"
+#include "Minecraft.World/Container.h"
+#include "Minecraft.World/DispenserTileEntity.h"
+#include "Minecraft.World/SignTileEntity.h"
+#include "Minecraft.Client/StatsCounter.h"
+#include "Minecraft.Client/GameMode.h"
+#include "Minecraft.Client/Xbox/Social/SocialManager.h"
+#include "Tutorial/TutorialMode.h"
 #if defined _XBOX || defined _WINDOWS64
-#include "..\Xbox\XML\ATGXmlParser.h"
-#include "..\Xbox\XML\xmlFilesCallback.h"
+#include "Minecraft.Client/Xbox/XML/ATGXmlParser.h"
+#include "Minecraft.Client/Xbox/XML/xmlFilesCallback.h"
 #endif
 #include "Minecraft_Macros.h"
-#include "..\PlayerList.h"
-#include "..\ServerPlayer.h"
-#include "GameRules\ConsoleGameRules.h"
-#include "GameRules\ConsoleSchematicFile.h"
-#include "..\User.h"
-#include "..\..\Minecraft.World\LevelData.h"
-#include "..\..\Minecraft.World\net.minecraft.world.entity.player.h"
-#include "..\EntityRenderDispatcher.h"
-#include "..\..\Minecraft.World\compression.h"
-#include "..\TexturePackRepository.h"
-#include "..\DLCTexturePack.h"
-#include "DLC\DLCPack.h"
-#include "..\StringTable.h"
+#include "Minecraft.Client/PlayerList.h"
+#include "Minecraft.Client/ServerPlayer.h"
+#include "GameRules/ConsoleGameRules.h"
+#include "GameRules/ConsoleSchematicFile.h"
+#include "Minecraft.Client/User.h"
+#include "Minecraft.World/LevelData.h"
+#include "Minecraft.World/net.minecraft.world.entity.player.h"
+#include "Minecraft.Client/EntityRenderDispatcher.h"
+#include "Minecraft.World/compression.h"
+#include "Minecraft.Client/TexturePackRepository.h"
+#include "Minecraft.Client/DLCTexturePack.h"
+#include "DLC/DLCPack.h"
+#include "Minecraft.Client/StringTable.h"
 #ifndef _XBOX
-#include "..\ArchiveFile.h"
+#include "Minecraft.Client/ArchiveFile.h"
 #endif
-#include "..\Minecraft.h"
+#include "Minecraft.Client/Minecraft.h"
 #ifdef _XBOX
-#include "..\Xbox\GameConfig\Minecraft.spa.h"
-#include "..\Xbox\Network\NetworkPlayerXbox.h"
-#include "XUI\XUI_TextEntry.h"
-#include "XUI\XUI_XZP_Icons.h"
-#include "XUI\XUI_PauseMenu.h"
+#include "Minecraft.Client/Xbox/GameConfig/Minecraft.spa.h"
+#include "Minecraft.Client/Xbox/Network/NetworkPlayerXbox.h"
+#include "XUI/XUI_TextEntry.h"
+#include "XUI/XUI_XZP_Icons.h"
+#include "XUI/XUI_PauseMenu.h"
 #else
-#include "UI\UI.h"
-#include "UI\UIScene_PauseMenu.h"
+#include "UI/UI.h"
+#include "UI/UIScene_PauseMenu.h"
 #endif
 #ifdef __PS3__
 #include <sys/tty.h>
@ -67,7 +67,7 @@
 #include <save_data_dialog.h>
 #endif

-#include "..\Common\Leaderboards\LeaderboardManager.h"
+#include "Leaderboards/LeaderboardManager.h"

 //CMinecraftApp app;
 unsigned int CMinecraftApp::m_uiLastSignInData = 0;
--- a/Minecraft.Client/Common/Consoles_App.h
+++ b/Minecraft.Client/Common/Consoles_App.h
@ -5,23 +5,23 @@ using namespace std;
 #include "Audio/Consoles_SoundEngine.h"

 #include <xuiapp.h>
-#include ".\Tutorial\TutorialEnum.h"
+#include "Tutorial/TutorialEnum.h"

 #ifdef _XBOX
-#include ".\XUI\XUI_Helper.h"
-#include ".\XUI\XUI_HelpCredits.h"
+#include "XUI/XUI_Helper.h"
+#include "XUI/XUI_HelpCredits.h"
 #endif
-#include "UI\UIStructs.h"
+#include "UI/UIStructs.h"

-#include "..\..\Minecraft.World\DisconnectPacket.h"
+#include "Minecraft.World/DisconnectPacket.h"
 #include <xsocialpost.h>

-#include "..\StringTable.h"
-#include ".\DLC\DLCManager.h"
-#include ".\GameRules\ConsoleGameRulesConstants.h"
-#include ".\GameRules\GameRuleManager.h"
-#include "..\SkinBox.h"
-#include "..\ArchiveFile.h"
+#include "Minecraft.Client/StringTable.h"
+#include "DLC/DLCManager.h"
+#include "GameRules/ConsoleGameRulesConstants.h"
+#include "GameRules/GameRuleManager.h"
+#include "Minecraft.Client/SkinBox.h"
+#include "Minecraft.Client/ArchiveFile.h"

 typedef struct _JoinFromInviteData
 {
--- a/Minecraft.Client/Common/DLC/DLCAudioFile.cpp
+++ b/Minecraft.Client/Common/DLC/DLCAudioFile.cpp
@ -2,8 +2,8 @@
 #include "DLCManager.h"
 #include "DLCAudioFile.h"
 #if defined _XBOX || defined _WINDOWS64
-#include "..\..\Xbox\XML\ATGXmlParser.h"
-#include "..\..\Xbox\XML\xmlFilesCallback.h"
+#include "Minecraft.Client/Xbox/XML/ATGXmlParser.h"
+#include "Minecraft.Client/Xbox/XML/xmlFilesCallback.h"
 #endif

 DLCAudioFile::DLCAudioFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_Audio,path)
--- a/Minecraft.Client/Common/DLC/DLCColourTableFile.cpp
+++ b/Minecraft.Client/Common/DLC/DLCColourTableFile.cpp
@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "DLCManager.h"
 #include "DLCColourTableFile.h"
-#include "..\..\Minecraft.h"
-#include "..\..\TexturePackRepository.h"
-#include "..\..\TexturePack.h"
+#include "Minecraft.Client/Minecraft.h"
+#include "Minecraft.Client/TexturePackRepository.h"
+#include "Minecraft.Client/TexturePack.h"

 DLCColourTableFile::DLCColourTableFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_ColourTable,path)
 {	
--- a/Minecraft.Client/Common/DLC/DLCGameRules.h
+++ b/Minecraft.Client/Common/DLC/DLCGameRules.h
@ -1,7 +1,7 @@
 #pragma once

 #include "DLCFile.h"
-#include "..\GameRules\LevelGenerationOptions.h"
+#include "Minecraft.Client/Common/GameRules/LevelGenerationOptions.h"

 class DLCGameRules : public DLCFile
 {
--- a/Minecraft.Client/Common/DLC/DLCGameRulesHeader.cpp
+++ b/Minecraft.Client/Common/DLC/DLCGameRulesHeader.cpp
@ -2,9 +2,9 @@

 #include <string>

-#include "..\..\..\Minecraft.World\File.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\..\Minecraft.World\InputOutputStream.h"
+#include "Minecraft.World/File.h"
+#include "Minecraft.World/StringHelpers.h"
+#include "Minecraft.World/InputOutputStream.h"

 #include "DLCManager.h"
 #include "DLCGameRulesHeader.h"
--- a/Minecraft.Client/Common/DLC/DLCGameRulesHeader.h
+++ b/Minecraft.Client/Common/DLC/DLCGameRulesHeader.h
@ -1,7 +1,7 @@
 #pragma once

 #include "DLCGameRules.h"
-#include "..\GameRules\LevelGenerationOptions.h"
+#include "Minecraft.Client/Common/GameRules/LevelGenerationOptions.h"

 class DLCGameRulesHeader : public DLCGameRules, public JustGrSource
 {
--- a/Minecraft.Client/Common/DLC/DLCLocalisationFile.cpp
+++ b/Minecraft.Client/Common/DLC/DLCLocalisationFile.cpp
@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "DLCManager.h"
 #include "DLCLocalisationFile.h"
-#include "..\..\StringTable.h"
+#include "Minecraft.Client/StringTable.h"

 DLCLocalisationFile::DLCLocalisationFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_LocalisationData,path)
 {	
--- a/Minecraft.Client/Common/DLC/DLCManager.cpp
+++ b/Minecraft.Client/Common/DLC/DLCManager.cpp
@ -3,9 +3,9 @@
 #include "DLCManager.h"
 #include "DLCPack.h"
 #include "DLCFile.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\Minecraft.h"
-#include "..\..\TexturePackRepository.h"
+#include "Minecraft.World/StringHelpers.h"
+#include "Minecraft.Client/Minecraft.h"
+#include "Minecraft.Client/TexturePackRepository.h"

 WCHAR *DLCManager::wchTypeNamesA[]=
 {
--- a/Minecraft.Client/Common/DLC/DLCPack.cpp
+++ b/Minecraft.Client/Common/DLC/DLCPack.cpp
@ -9,7 +9,7 @@
 #include "DLCGameRulesHeader.h"
 #include "DLCAudioFile.h"
 #include "DLCColourTableFile.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "Minecraft.World/StringHelpers.h"

 DLCPack::DLCPack(const wstring &name,DWORD dwLicenseMask)
 {
--- a/Minecraft.Client/Common/DLC/DLCSkinFile.cpp
+++ b/Minecraft.Client/Common/DLC/DLCSkinFile.cpp
@ -1,11 +1,11 @@
 #include "stdafx.h"
 #include "DLCManager.h"
 #include "DLCSkinFile.h"
-#include "..\..\ModelPart.h"
-#include "..\..\EntityRenderer.h"
-#include "..\..\EntityRenderDispatcher.h"
-#include "..\..\..\Minecraft.World\Player.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "Minecraft.Client/ModelPart.h"
+#include "Minecraft.Client/EntityRenderer.h"
+#include "Minecraft.Client/EntityRenderDispatcher.h"
+#include "Minecraft.World/Player.h"
+#include "Minecraft.World/StringHelpers.h"

 DLCSkinFile::DLCSkinFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_Skin,path)
 {
--- a/Minecraft.Client/Common/DLC/DLCSkinFile.h
+++ b/Minecraft.Client/Common/DLC/DLCSkinFile.h
@ -1,6 +1,6 @@
 #pragma once
 #include "DLCFile.h"
-#include "..\..\..\Minecraft.Client\HumanoidModel.h"
+#include "Minecraft.Client/HumanoidModel.h"

 class DLCSkinFile : public DLCFile
 {
--- a/Minecraft.Client/Common/GameRules/AddEnchantmentRuleDefinition.cpp
+++ b/Minecraft.Client/Common/GameRules/AddEnchantmentRuleDefinition.cpp
@ -1,7 +1,7 @@
 #include "stdafx.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.enchantment.h"
+#include "Minecraft.World/StringHelpers.h"
+#include "Minecraft.World/net.minecraft.world.item.h"
+#include "Minecraft.World/net.minecraft.world.item.enchantment.h"
 #include "AddEnchantmentRuleDefinition.h"

 AddEnchantmentRuleDefinition::AddEnchantmentRuleDefinition()
--- a/Minecraft.Client/Common/GameRules/AddItemRuleDefinition.cpp
+++ b/Minecraft.Client/Common/GameRules/AddItemRuleDefinition.cpp
@ -1,8 +1,8 @@
 #include "stdafx.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.h"
+#include "Minecraft.World/StringHelpers.h"
+#include "Minecraft.World/net.minecraft.world.item.h"
+#include "Minecraft.World/net.minecraft.world.inventory.h"
+#include "Minecraft.World/net.minecraft.world.entity.player.h"
 #include "AddItemRuleDefinition.h"
 #include "AddEnchantmentRuleDefinition.h"

--- a/Minecraft.Client/Common/GameRules/ApplySchematicRuleDefinition.cpp
+++ b/Minecraft.Client/Common/GameRules/ApplySchematicRuleDefinition.cpp
@ -1,10 +1,10 @@
 #include "stdafx.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.phys.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.dimension.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.chunk.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
+#include "Minecraft.World/StringHelpers.h"
+#include "Minecraft.World/net.minecraft.world.phys.h"
+#include "Minecraft.World/net.minecraft.world.level.h"
+#include "Minecraft.World/net.minecraft.world.level.dimension.h"
+#include "Minecraft.World/net.minecraft.world.level.chunk.h"
+#include "Minecraft.World/net.minecraft.world.level.tile.entity.h"
 #include "ApplySchematicRuleDefinition.h"
 #include "LevelGenerationOptions.h"
 #include "ConsoleSchematicFile.h"
--- a/Minecraft.Client/Common/GameRules/BiomeOverride.cpp
+++ b/Minecraft.Client/Common/GameRules/BiomeOverride.cpp
@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "Minecraft.World/StringHelpers.h"
 #include "BiomeOverride.h"

 BiomeOverride::BiomeOverride()
--- a/Minecraft.Client/Common/GameRules/CollectItemRuleDefinition.cpp
+++ b/Minecraft.Client/Common/GameRules/CollectItemRuleDefinition.cpp
@ -1,10 +1,10 @@
 #include "stdafx.h"
-#include "..\..\WstringLookup.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "Minecraft.Client/WstringLookup.h"
+#include "Minecraft.World/StringHelpers.h"
 #include "CollectItemRuleDefinition.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\..\..\Minecraft.World\Connection.h"
-#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h"
+#include "Minecraft.World/net.minecraft.world.item.h"
+#include "Minecraft.World/Connection.h"
+#include "Minecraft.World/net.minecraft.network.packet.h"

 CollectItemRuleDefinition::CollectItemRuleDefinition()
 {
--- a/Minecraft.Client/Common/GameRules/CompleteAllRuleDefinition.cpp
+++ b/Minecraft.Client/Common/GameRules/CompleteAllRuleDefinition.cpp
@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "CompleteAllRuleDefinition.h"
 #include "ConsoleGameRules.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\..\Minecraft.World\Connection.h"
-#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h"
+#include "Minecraft.World/StringHelpers.h"
+#include "Minecraft.World/Connection.h"
+#include "Minecraft.World/net.minecraft.network.packet.h"

 void CompleteAllRuleDefinition::getChildren(vector<GameRuleDefinition *> *children)
 {
--- a/Minecraft.Client/Common/GameRules/CompoundGameRuleDefinition.cpp
+++ b/Minecraft.Client/Common/GameRules/CompoundGameRuleDefinition.cpp
@ -1,6 +1,6 @@
 #include "stdafx.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
+#include "Minecraft.World/StringHelpers.h"
+#include "Minecraft.World/net.minecraft.world.item.h"
 #include "CompoundGameRuleDefinition.h"
 #include "ConsoleGameRules.h"

--- a/Minecraft.Client/Common/GameRules/ConsoleGenerateStructure.cpp
+++ b/Minecraft.Client/Common/GameRules/ConsoleGenerateStructure.cpp
@ -1,11 +1,11 @@
 #include "stdafx.h"
 #include "ConsoleGenerateStructure.h"
 #include "ConsoleGameRules.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.dimension.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.levelgen.structure.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\..\Minecraft.World\net.minecraft.h"
+#include "Minecraft.World/net.minecraft.world.level.h"
+#include "Minecraft.World/net.minecraft.world.level.dimension.h"
+#include "Minecraft.World/net.minecraft.world.level.levelgen.structure.h"
+#include "Minecraft.World/StringHelpers.h"
+#include "Minecraft.World/net.minecraft.h"

 ConsoleGenerateStructure::ConsoleGenerateStructure() : StructurePiece(0)
 {
--- a/Minecraft.Client/Common/GameRules/ConsoleGenerateStructure.h
+++ b/Minecraft.Client/Common/GameRules/ConsoleGenerateStructure.h
@ -1,6 +1,6 @@
 #pragma once
 #include "GameRuleDefinition.h"
-#include "..\..\..\Minecraft.World\StructurePiece.h"
+#include "Minecraft.World/StructurePiece.h"

 class Level;
 class Random;
--- a/Minecraft.Client/Common/GameRules/ConsoleSchematicFile.cpp
+++ b/Minecraft.Client/Common/GameRules/ConsoleSchematicFile.cpp
@ -1,16 +1,16 @@
 #include "stdafx.h"
 #include <vector>
-#include "..\..\..\Minecraft.World\com.mojang.nbt.h"
-#include "..\..\..\Minecraft.World\System.h"
+#include "Minecraft.World/com.mojang.nbt.h"
+#include "Minecraft.World/System.h"
 #include "ConsoleSchematicFile.h"
-#include "..\..\..\Minecraft.World\InputOutputStream.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.chunk.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.entity.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.entity.item.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.phys.h"
-#include "..\..\..\Minecraft.World\compression.h"
+#include "Minecraft.World/InputOutputStream.h"
+#include "Minecraft.World/net.minecraft.world.level.h"
+#include "Minecraft.World/net.minecraft.world.level.chunk.h"
+#include "Minecraft.World/net.minecraft.world.level.tile.entity.h"
+#include "Minecraft.World/net.minecraft.world.entity.h"
+#include "Minecraft.World/net.minecraft.world.entity.item.h"
+#include "Minecraft.World/net.minecraft.world.phys.h"
+#include "Minecraft.World/compression.h"

 ConsoleSchematicFile::ConsoleSchematicFile()
 {
--- a/Minecraft.Client/Common/GameRules/ConsoleSchematicFile.h
+++ b/Minecraft.Client/Common/GameRules/ConsoleSchematicFile.h
@ -4,7 +4,7 @@ using namespace std;
 #define XBOX_SCHEMATIC_ORIGINAL_VERSION 1
 #define XBOX_SCHEMATIC_CURRENT_VERSION 2

-#include "..\..\..\Minecraft.World\ArrayWithLength.h"
+#include "Minecraft.World/ArrayWithLength.h"

 class Level;
 class DataOutputStream;
--- a/Minecraft.Client/Common/GameRules/GameRuleDefinition.cpp
+++ b/Minecraft.Client/Common/GameRules/GameRuleDefinition.cpp
@ -1,6 +1,6 @@
 #include "stdafx.h"
-#include "..\..\WstringLookup.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "Minecraft.Client/WstringLookup.h"
+#include "Minecraft.World/StringHelpers.h"
 #include "ConsoleGameRules.h"

 GameRuleDefinition::GameRuleDefinition()
--- a/Minecraft.Client/Common/GameRules/GameRuleDefinition.h
+++ b/Minecraft.Client/Common/GameRules/GameRuleDefinition.h
@ -3,7 +3,7 @@ using namespace std;
 #include <unordered_map>
 #include <string>

-#include "..\..\..\Minecraft.World\ItemInstance.h"
+#include "Minecraft.World/ItemInstance.h"
 #include "ConsoleGameRulesConstants.h"

 #include "GameRulesInstance.h"
--- a/Minecraft.Client/Common/GameRules/GameRuleManager.cpp
+++ b/Minecraft.Client/Common/GameRules/GameRuleManager.cpp
@ -1,14 +1,14 @@
 #include "stdafx.h"
-#include "..\..\..\Minecraft.World\compression.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\..\Minecraft.World\File.h"
-#include "..\..\..\Minecraft.World\compression.h"
-#include "..\DLC\DLCPack.h"
-#include "..\DLC\DLCLocalisationFile.h"
-#include "..\DLC\DLCGameRulesFile.h"
-#include "..\DLC\DLCGameRules.h"
-#include "..\DLC\DLCGameRulesHeader.h"
-#include "..\..\StringTable.h"
+#include "Minecraft.World/compression.h"
+#include "Minecraft.World/StringHelpers.h"
+#include "Minecraft.World/File.h"
+#include "Minecraft.World/compression.h"
+#include "Minecraft.Client/Common/DLC/DLCPack.h"
+#include "Minecraft.Client/Common/DLC/DLCLocalisationFile.h"
+#include "Minecraft.Client/Common/DLC/DLCGameRulesFile.h"
+#include "Minecraft.Client/Common/DLC/DLCGameRules.h"
+#include "Minecraft.Client/Common/DLC/DLCGameRulesHeader.h"
+#include "Minecraft.Client/StringTable.h"
 #include "ConsoleGameRules.h"
 #include "GameRuleManager.h"

--- a/Minecraft.Client/Common/GameRules/LevelGenerationOptions.cpp
+++ b/Minecraft.Client/Common/GameRules/LevelGenerationOptions.cpp
@ -2,13 +2,13 @@

 #include <unordered_set>

-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\..\Minecraft.World\Pos.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.phys.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.chunk.h"
+#include "Minecraft.World/StringHelpers.h"
+#include "Minecraft.World/Pos.h"
+#include "Minecraft.World/net.minecraft.world.phys.h"
+#include "Minecraft.World/net.minecraft.world.level.h"
+#include "Minecraft.World/net.minecraft.world.level.chunk.h"
 #include "Common\DLC\DLCGameRulesHeader.h"
-#include "..\..\StringTable.h"
+#include "Minecraft.Client/StringTable.h"
 #include "LevelGenerationOptions.h"
 #include "ConsoleGameRules.h"

--- a/Minecraft.Client/Common/GameRules/LevelGenerationOptions.h
+++ b/Minecraft.Client/Common/GameRules/LevelGenerationOptions.h
@ -4,7 +4,7 @@ using namespace std;
 #pragma message("LevelGenerationOptions.h ")

 #include "GameRuleDefinition.h"
-#include "..\..\..\Minecraft.World\StructureFeature.h"
+#include "Minecraft.World/StructureFeature.h"

 class ApplySchematicRuleDefinition;
 class LevelChunk;
--- a/Minecraft.Client/Common/GameRules/LevelRuleset.cpp
+++ b/Minecraft.Client/Common/GameRules/LevelRuleset.cpp
@ -1,6 +1,6 @@
 #include "stdafx.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\StringTable.h"
+#include "Minecraft.World/StringHelpers.h"
+#include "Minecraft.Client/StringTable.h"
 #include "ConsoleGameRules.h"
 #include "LevelRuleset.h"

--- a/Minecraft.Client/Common/GameRules/NamedAreaRuleDefinition.cpp
+++ b/Minecraft.Client/Common/GameRules/NamedAreaRuleDefinition.cpp
@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "NamedAreaRuleDefinition.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.phys.h"
+#include "Minecraft.World/StringHelpers.h"
+#include "Minecraft.World/net.minecraft.world.phys.h"

 NamedAreaRuleDefinition::NamedAreaRuleDefinition()
 {
--- a/Minecraft.Client/Common/GameRules/StartFeature.cpp
+++ b/Minecraft.Client/Common/GameRules/StartFeature.cpp
@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "Minecraft.World/StringHelpers.h"
 #include "StartFeature.h"

 StartFeature::StartFeature()
--- a/Minecraft.Client/Common/GameRules/StartFeature.h
+++ b/Minecraft.Client/Common/GameRules/StartFeature.h
@ -2,7 +2,7 @@
 using namespace std;

 #include "GameRuleDefinition.h"
-#include "..\..\..\Minecraft.World\StructureFeature.h"
+#include "Minecraft.World/StructureFeature.h"

 class StartFeature : public GameRuleDefinition
 {
--- a/Minecraft.Client/Common/GameRules/UpdatePlayerRuleDefinition.cpp
+++ b/Minecraft.Client/Common/GameRules/UpdatePlayerRuleDefinition.cpp
@ -1,11 +1,11 @@
 #include "stdafx.h"
 #include "UpdatePlayerRuleDefinition.h"
 #include "ConsoleGameRules.h"
-#include "..\..\..\Minecraft.World\Pos.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.food.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
+#include "Minecraft.World/Pos.h"
+#include "Minecraft.World/StringHelpers.h"
+#include "Minecraft.World/net.minecraft.world.entity.player.h"
+#include "Minecraft.World/net.minecraft.world.food.h"
+#include "Minecraft.World/net.minecraft.world.item.h"

 UpdatePlayerRuleDefinition::UpdatePlayerRuleDefinition()
 {
--- a/Minecraft.Client/Common/GameRules/UseTileRuleDefinition.cpp
+++ b/Minecraft.Client/Common/GameRules/UseTileRuleDefinition.cpp
@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "Minecraft.World/StringHelpers.h"
 #include "UseTileRuleDefinition.h"

 UseTileRuleDefinition::UseTileRuleDefinition()
--- a/Minecraft.Client/Common/GameRules/UseTileRuleDefinition.h
+++ b/Minecraft.Client/Common/GameRules/UseTileRuleDefinition.h
@ -2,7 +2,7 @@
 using namespace std;

 #include "GameRuleDefinition.h"
-#include "..\..\..\Minecraft.World\Pos.h"
+#include "Minecraft.World/Pos.h"

 class UseTileRuleDefinition : public GameRuleDefinition
 {
--- a/Minecraft.Client/Common/GameRules/XboxStructureActionGenerateBox.cpp
+++ b/Minecraft.Client/Common/GameRules/XboxStructureActionGenerateBox.cpp
@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "XboxStructureActionGenerateBox.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.levelgen.structure.h"
+#include "Minecraft.World/StringHelpers.h"
+#include "Minecraft.World/net.minecraft.world.level.levelgen.structure.h"

 XboxStructureActionGenerateBox::XboxStructureActionGenerateBox()
 {
--- a/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceBlock.cpp
+++ b/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceBlock.cpp
@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "XboxStructureActionPlaceBlock.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.levelgen.structure.h"
+#include "Minecraft.World/StringHelpers.h"
+#include "Minecraft.World/net.minecraft.world.level.levelgen.structure.h"

 XboxStructureActionPlaceBlock::XboxStructureActionPlaceBlock()
 {
--- a/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceContainer.cpp
+++ b/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceContainer.cpp
@ -1,11 +1,11 @@
 #include "stdafx.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "Minecraft.World/StringHelpers.h"
 #include "XboxStructureActionPlaceContainer.h"
 #include "AddItemRuleDefinition.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.levelgen.structure.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "Minecraft.World/net.minecraft.world.level.levelgen.structure.h"
+#include "Minecraft.World/net.minecraft.world.level.h"
+#include "Minecraft.World/net.minecraft.world.level.tile.h"
+#include "Minecraft.World/net.minecraft.world.inventory.h"

 XboxStructureActionPlaceContainer::XboxStructureActionPlaceContainer()
 {
--- a/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceSpawner.cpp
+++ b/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceSpawner.cpp
@ -1,9 +1,9 @@
 #include "stdafx.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "Minecraft.World/StringHelpers.h"
 #include "XboxStructureActionPlaceSpawner.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.levelgen.structure.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
+#include "Minecraft.World/net.minecraft.world.level.levelgen.structure.h"
+#include "Minecraft.World/net.minecraft.world.level.h"
+#include "Minecraft.World/net.minecraft.world.level.tile.entity.h"

 XboxStructureActionPlaceSpawner::XboxStructureActionPlaceSpawner()
 {
--- a/Minecraft.Client/Common/Leaderboards/LeaderboardManager.cpp
+++ b/Minecraft.Client/Common/Leaderboards/LeaderboardManager.cpp
@ -1,6 +1,6 @@
 #include "stdafx.h"

-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "Minecraft.World/StringHelpers.h"

 #include "LeaderboardManager.h"

--- a/Minecraft.Client/Common/Leaderboards/SonyLeaderboardManager.cpp
+++ b/Minecraft.Client/Common/Leaderboards/SonyLeaderboardManager.cpp
@ -11,7 +11,7 @@
 #include "Common\Consoles_App.h"
 #include "Common\Network\Sony\SQRNetworkManager.h"

-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "Minecraft.World/StringHelpers.h"


 #ifdef __ORBIS__
@ -154,7 +154,7 @@ void SonyLeaderboardManager::scoreboardThreadInternal()
 		// The following NP call should be reserved for asynchronous multiplayer modes that require PS Plus to be accessed. 
 		//
 		//	Note 2: 
-		// The message is not displayed with a user without PlayStation®Plus subscription and they are able to access the Leaderboards.
+		// The message is not displayed with a user without PlayStationPlus subscription and they are able to access the Leaderboards.

 		// NotifyAsyncPlusFeature();

--- a/Minecraft.Client/Common/Network/GameNetworkManager.cpp
+++ b/Minecraft.Client/Common/Network/GameNetworkManager.cpp
@ -1,32 +1,32 @@
 #include "stdafx.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\..\Minecraft.World\AABB.h"
-#include "..\..\..\Minecraft.World\Vec3.h"
-#include "..\..\..\Minecraft.World\Socket.h"
-#include "..\..\..\Minecraft.World\ThreadName.h"
-#include "..\..\..\Minecraft.World\Entity.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
-#include "..\..\..\Minecraft.World\FireworksRecipe.h"
-#include "..\..\ClientConnection.h"
-#include "..\..\Minecraft.h"
-#include "..\..\User.h"
-#include "..\..\MinecraftServer.h"
-#include "..\..\PlayerList.h"
-#include "..\..\ServerPlayer.h"
-#include "..\..\PlayerConnection.h"
-#include "..\..\MultiPlayerLevel.h"
-#include "..\..\ProgressRenderer.h"
-#include "..\..\MultiPlayerLocalPlayer.h"
-#include "..\..\..\Minecraft.World\DisconnectPacket.h"
-#include "..\..\..\Minecraft.World\compression.h"
-#include "..\..\..\Minecraft.World\OldChunkStorage.h"
-#include "..\..\TexturePackRepository.h"
-#include "..\..\TexturePack.h"
+#include "Minecraft.World/StringHelpers.h"
+#include "Minecraft.World/AABB.h"
+#include "Minecraft.World/Vec3.h"
+#include "Minecraft.World/Socket.h"
+#include "Minecraft.World/ThreadName.h"
+#include "Minecraft.World/Entity.h"
+#include "Minecraft.World/net.minecraft.world.level.tile.h"
+#include "Minecraft.World/FireworksRecipe.h"
+#include "Minecraft.Client/ClientConnection.h"
+#include "Minecraft.Client/Minecraft.h"
+#include "Minecraft.Client/User.h"
+#include "Minecraft.Client/MinecraftServer.h"
+#include "Minecraft.Client/PlayerList.h"
+#include "Minecraft.Client/ServerPlayer.h"
+#include "Minecraft.Client/PlayerConnection.h"
+#include "Minecraft.Client/MultiPlayerLevel.h"
+#include "Minecraft.Client/ProgressRenderer.h"
+#include "Minecraft.Client/MultiPlayerLocalPlayer.h"
+#include "Minecraft.World/DisconnectPacket.h"
+#include "Minecraft.World/compression.h"
+#include "Minecraft.World/OldChunkStorage.h"
+#include "Minecraft.Client/TexturePackRepository.h"
+#include "Minecraft.Client/TexturePack.h"

-#include "..\..\Gui.h"
-#include "..\..\LevelRenderer.h"
-#include "..\..\..\Minecraft.World\IntCache.h"
-#include "..\GameRules\ConsoleGameRules.h"
+#include "Minecraft.Client/Gui.h"
+#include "Minecraft.Client/LevelRenderer.h"
+#include "Minecraft.World/IntCache.h"
+#include "Minecraft.Client/Common/GameRules/ConsoleGameRules.h"
 #include "GameNetworkManager.h"

 #ifdef _XBOX
@ -34,7 +34,7 @@
 #else
 #include "Common\UI\UI.h"
 #include "Common\UI\UIScene_PauseMenu.h"
-#include "..\..\Xbox\Network\NetworkPlayerXbox.h"
+#include "Minecraft.Client/Xbox/Network/NetworkPlayerXbox.h"
 #endif

 #ifdef _DURANGO
--- a/Minecraft.Client/Common/Network/GameNetworkManager.h
+++ b/Minecraft.Client/Common/Network/GameNetworkManager.h
@ -2,21 +2,21 @@
 using namespace std;
 #include <vector>
 #include <qnet.h>
-#include "..\..\..\Minecraft.World\C4JThread.h"
+#include "Minecraft.World/C4JThread.h"
 #include "NetworkPlayerInterface.h"
 #ifdef _XBOX
-#include "..\..\Xbox\Network\PlatformNetworkManagerXbox.h"
+#include "Minecraft.Client/Xbox/Network/PlatformNetworkManagerXbox.h"
 #elif defined __PS3__ || defined __ORBIS__ || defined __PSVITA__
-#include "..\..\Common\Network\Sony\PlatformNetworkManagerSony.h"
+#include "Sony/PlatformNetworkManagerSony.h"
 #elif defined _DURANGO
-#include "..\..\Durango\Network\PlatformNetworkManagerDurango.h"
+#include "Minecraft.Client/Durango/Network/PlatformNetworkManagerDurango.h"
 #else
 #include "PlatformNetworkManagerStub.h"
 #endif
 #include "SessionInfo.h"

 #ifdef __ORBIS__
-#include "..\..\Orbis\Network\PsPlusUpsellWrapper_Orbis.h"
+#include "Minecraft.Client/Orbis/Network/PsPlusUpsellWrapper_Orbis.h"
 #endif

 class ClientConnection;
--- a/Minecraft.Client/Common/Network/PlatformNetworkManagerInterface.h
+++ b/Minecraft.Client/Common/Network/PlatformNetworkManagerInterface.h
@ -2,7 +2,7 @@
 using namespace std;
 #include <vector>
 #include <qnet.h>
-#include "..\..\..\Minecraft.World\C4JThread.h"
+#include "Minecraft.World/C4JThread.h"
 #include "NetworkPlayerInterface.h"
 #include "SessionInfo.h"

--- a/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.cpp
+++ b/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.cpp
@ -1,12 +1,12 @@
 #include "stdafx.h"	
-#include "..\..\..\Minecraft.World\Socket.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "Minecraft.World/Socket.h"
+#include "Minecraft.World/StringHelpers.h"
 #include "PlatformNetworkManagerStub.h"
-#include "..\..\Xbox\Network\NetworkPlayerXbox.h"
+#include "Minecraft.Client/Xbox/Network/NetworkPlayerXbox.h"
 #ifdef _WINDOWS64
-#include "..\..\Windows64\Network\WinsockNetLayer.h"
-#include "..\..\Minecraft.h"
-#include "..\..\User.h"
+#include "Minecraft.Client/Windows64/Network/WinsockNetLayer.h"
+#include "Minecraft.Client/Minecraft.h"
+#include "Minecraft.Client/User.h"
 #endif

 CPlatformNetworkManagerStub *g_pPlatformNetworkManager;
--- a/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.h
+++ b/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.h
@ -1,7 +1,7 @@
 #pragma once
 using namespace std;
 #include <vector>
-#include "..\..\..\Minecraft.World\C4JThread.h"
+#include "Minecraft.World/C4JThread.h"
 #include "NetworkPlayerInterface.h"
 #include "PlatformNetworkManagerInterface.h"
 #include "SessionInfo.h"
--- a/Minecraft.Client/Common/Network/SessionInfo.h
+++ b/Minecraft.Client/Common/Network/SessionInfo.h
@ -1,7 +1,7 @@
 #pragma once

 #if defined(__PS3__) || defined(__ORBIS__)
-#include "..\..\Common\Network\Sony\SQRNetworkManager.h"
+#include "Sony/SQRNetworkManager.h"
 #endif


--- a/Minecraft.Client/Common/Telemetry/TelemetryManager.h
+++ b/Minecraft.Client/Common/Telemetry/TelemetryManager.h
@ -1,6 +1,6 @@
 #pragma once

-#include "..\..\Common\UI\UIEnums.h"
+#include "Minecraft.Client/Common/UI/UIEnums.h"

 class CTelemetryManager
 {
--- a/Minecraft.Client/Common/Trial/TrialMode.cpp
+++ b/Minecraft.Client/Common/Trial/TrialMode.cpp
@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "TrialMode.h"
-#include "..\Tutorial\FullTutorial.h"
+#include "Minecraft.Client/Common/Tutorial/FullTutorial.h"

 TrialMode::TrialMode(int iPad, Minecraft *minecraft, ClientConnection *connection)
 	: FullTutorialMode(iPad, minecraft, connection)
--- a/Minecraft.Client/Common/Trial/TrialMode.h
+++ b/Minecraft.Client/Common/Trial/TrialMode.h
@ -1,5 +1,5 @@
 #pragma once
-#include "..\Tutorial\FullTutorialMode.h"
+#include "Minecraft.Client/Common/Tutorial/FullTutorialMode.h"

 class TrialMode : public FullTutorialMode
 {
--- a/Minecraft.Client/Common/Tutorial/AreaConstraint.cpp
+++ b/Minecraft.Client/Common/Tutorial/AreaConstraint.cpp
@ -4,11 +4,11 @@
 #include <Minecraft.h>
 #include <MultiPlayerLocalPlayer.h>
 =======
-#include "..\..\Minecraft.h"
-#include "..\..\MultiplayerLocalPlayer.h"
+#include "Minecraft.Client/Minecraft.h"
+#include "Minecraft.Client/MultiPlayerLocalPlayer.h"
 >>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 #include "AreaConstraint.h"
-#include "..\..\..\Minecraft.World\AABB.h"
+#include "Minecraft.World/AABB.h"

 AreaConstraint::AreaConstraint( int descriptionId, double x0, double y0, double z0, double x1, double y1, double z1, bool contains /*= true*/, bool restrictsMovement /*=true*/ )
 	: TutorialConstraint( descriptionId )
--- a/Minecraft.Client/Common/Tutorial/AreaHint.cpp
+++ b/Minecraft.Client/Common/Tutorial/AreaHint.cpp
@ -4,11 +4,11 @@
 #include <Minecraft.h>
 #include <MultiPlayerLocalPlayer.h>
 =======
-#include "..\..\Minecraft.h"
-#include "..\..\MultiplayerLocalPlayer.h"
+#include "Minecraft.Client/Minecraft.h"
+#include "Minecraft.Client/MultiPlayerLocalPlayer.h"
 >>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 #include "AreaHint.h"
-#include "..\..\..\Minecraft.World\AABB.h"
+#include "Minecraft.World/AABB.h"
 #include "Tutorial.h"

 AreaHint::AreaHint(eTutorial_Hint id, Tutorial *tutorial, eTutorial_State displayState, eTutorial_State completeState,
--- a/Minecraft.Client/Common/Tutorial/ChangeStateConstraint.cpp
+++ b/Minecraft.Client/Common/Tutorial/ChangeStateConstraint.cpp
@ -6,14 +6,14 @@
 #include <MultiPlayerLocalPlayer.h>
 #include <Minecraft.World/net.minecraft.world.level.h>
 =======
-#include "..\..\Minecraft.h"
-#include "..\..\MultiplayerLocalPlayer.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
+#include "Minecraft.Client/Minecraft.h"
+#include "Minecraft.Client/MultiPlayerLocalPlayer.h"
+#include "Minecraft.World/net.minecraft.world.level.h"
 >>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 #include "ChangeStateConstraint.h"
-#include "..\..\..\Minecraft.World\AABB.h"
-#include "..\..\ClientConnection.h"
-#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h"
+#include "Minecraft.World/AABB.h"
+#include "Minecraft.Client/ClientConnection.h"
+#include "Minecraft.World/net.minecraft.network.packet.h"

 ChangeStateConstraint::ChangeStateConstraint( Tutorial *tutorial, eTutorial_State targetState, eTutorial_State sourceStates[], DWORD sourceStatesCount,
 	double x0, double y0, double z0, double x1, double y1, double z1, bool contains /*= true*/, bool changeGameMode /*= false*/, GameType *targetGameMode /*= 0*/ )
--- a/Minecraft.Client/Common/Tutorial/ChoiceTask.cpp
+++ b/Minecraft.Client/Common/Tutorial/ChoiceTask.cpp
@ -5,14 +5,14 @@
 #include <Minecraft.h>
 #include <MultiPlayerLocalPlayer.h>
 =======
-#include "..\..\Minecraft.h"
-#include "..\..\MultiplayerLocalPlayer.h"
+#include "Minecraft.Client/Minecraft.h"
+#include "Minecraft.Client/MultiPlayerLocalPlayer.h"
 >>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 #include "Tutorial.h"
 #include "TutorialConstraints.h"
 #include "ChoiceTask.h"
-#include "..\..\..\Minecraft.World\Material.h"
-#include "..\..\Windows64\KeyboardMouseInput.h"
+#include "Minecraft.World/Material.h"
+#include "Minecraft.Client/Windows64/KeyboardMouseInput.h"

 ChoiceTask::ChoiceTask(Tutorial *tutorial, int descriptionId, int promptId /*= -1*/, bool requiresUserInput /*= false*/,
 	int iConfirmMapping /*= 0*/, int iCancelMapping /*= 0*/,
--- a/Minecraft.Client/Common/Tutorial/CompleteUsingItemTask.cpp
+++ b/Minecraft.Client/Common/Tutorial/CompleteUsingItemTask.cpp
@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "..\..\..\Minecraft.World\ItemInstance.h"
+#include "Minecraft.World/ItemInstance.h"
 #include "CompleteUsingItemTask.h"

 CompleteUsingItemTask::CompleteUsingItemTask(Tutorial *tutorial, int descriptionId, int itemIds[], unsigned int itemIdsLength, bool enablePreCompletion)
--- a/Minecraft.Client/Common/Tutorial/ControllerTask.cpp
+++ b/Minecraft.Client/Common/Tutorial/ControllerTask.cpp
@ -5,8 +5,8 @@
 #include <Minecraft.h>
 #include <MultiPlayerLocalPlayer.h>
 =======
-#include "..\..\Minecraft.h"
-#include "..\..\MultiplayerLocalPlayer.h"
+#include "Minecraft.Client/Minecraft.h"
+#include "Minecraft.Client/MultiPlayerLocalPlayer.h"
 >>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 #include "Tutorial.h"
 #include "TutorialConstraints.h"
--- a/Minecraft.Client/Common/Tutorial/CraftTask.cpp
+++ b/Minecraft.Client/Common/Tutorial/CraftTask.cpp
@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "CraftTask.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
+#include "Minecraft.World/net.minecraft.world.item.h"

 CraftTask::CraftTask( int itemId, int auxValue, int  quantity,
 	Tutorial *tutorial, int descriptionId, bool enablePreCompletion /*= true*/, vector<TutorialConstraint *> *inConstraints /*= NULL*/,
--- a/Minecraft.Client/Common/Tutorial/DiggerItemHint.cpp
+++ b/Minecraft.Client/Common/Tutorial/DiggerItemHint.cpp
@ -1,8 +1,8 @@
 #include "stdafx.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.entity.h"
+#include "Minecraft.World/net.minecraft.world.level.h"
+#include "Minecraft.World/net.minecraft.world.level.tile.h"
+#include "Minecraft.World/net.minecraft.world.item.h"
+#include "Minecraft.World/net.minecraft.world.entity.h"
 #include "Tutorial.h"
 #include "DiggerItemHint.h"

--- a/Minecraft.Client/Common/Tutorial/EffectChangedTask.cpp
+++ b/Minecraft.Client/Common/Tutorial/EffectChangedTask.cpp
@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.effect.h"
+#include "Minecraft.World/net.minecraft.world.effect.h"
 #include "EffectChangedTask.h"

 EffectChangedTask::EffectChangedTask(Tutorial *tutorial, int descriptionId, MobEffect *effect, bool apply,
--- a/Minecraft.Client/Common/Tutorial/FullTutorial.cpp
+++ b/Minecraft.Client/Common/Tutorial/FullTutorial.cpp
@ -1,10 +1,10 @@
 #include "stdafx.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.phys.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.effect.h"
-#include "..\GameRules\ConsoleGameRules.h"
+#include "Minecraft.World/net.minecraft.world.item.h"
+#include "Minecraft.World/net.minecraft.world.level.h"
+#include "Minecraft.World/net.minecraft.world.level.tile.h"
+#include "Minecraft.World/net.minecraft.world.phys.h"
+#include "Minecraft.World/net.minecraft.world.effect.h"
+#include "Minecraft.Client/Common/GameRules/ConsoleGameRules.h"
 #include "DiggerItemHint.h"
 #include "TutorialTasks.h"
 #include "AreaHint.h"
--- a/Minecraft.Client/Common/Tutorial/FullTutorialMode.cpp
+++ b/Minecraft.Client/Common/Tutorial/FullTutorialMode.cpp
@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "..\..\Minecraft.h"
+#include "Minecraft.Client/Minecraft.h"
 #include "FullTutorial.h"
 #include "FullTutorialMode.h"

--- a/Minecraft.Client/Common/Tutorial/InfoTask.cpp
+++ b/Minecraft.Client/Common/Tutorial/InfoTask.cpp
@ -5,13 +5,13 @@
 #include <Minecraft.h>
 #include <MultiPlayerLocalPlayer.h>
 =======
-#include "..\..\Minecraft.h"
-#include "..\..\MultiplayerLocalPlayer.h"
+#include "Minecraft.Client/Minecraft.h"
+#include "Minecraft.Client/MultiPlayerLocalPlayer.h"
 >>>>>>> parent of fef5c7b0 (the reformatting, pt 1)
 #include "Tutorial.h"
 #include "TutorialConstraints.h"
 #include "InfoTask.h"
-#include "..\..\..\Minecraft.World\Material.h"
+#include "Minecraft.World/Material.h"
 #include "..\..\KeyboardMouseInput.h"

 InfoTask::InfoTask(Tutorial *tutorial, int descriptionId, int promptId /*= -1*/, bool requiresUserInput /*= false*/,
--- a/Minecraft.Client/Common/Tutorial/LookAtEntityHint.h
+++ b/Minecraft.Client/Common/Tutorial/LookAtEntityHint.h
@ -1,7 +1,7 @@
 #pragma once
 using namespace std;

-#include "..\..\..\Minecraft.World\Class.h"
+#include "Minecraft.World/Class.h"
 #include "TutorialHint.h"

 class ItemInstance;
--- a/Show more
+++ b/Show more