diff --git a/Minecraft.Client/AbstractContainerScreen.cpp b/Minecraft.Client/AbstractContainerScreen.cpp
index 2b3e0837..109bbaab 100644
--- 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();
 
diff --git a/Minecraft.Client/AbstractTexturePack.cpp b/Minecraft.Client/AbstractTexturePack.cpp
index a4eb7f01..3c282abe 100644
--- 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)
 {
diff --git a/Minecraft.Client/AchievementPopup.cpp b/Minecraft.Client/AchievementPopup.cpp
index 04f822ab..5466ca61 100644
--- 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)
 {
diff --git a/Minecraft.Client/AchievementScreen.cpp b/Minecraft.Client/AchievementScreen.cpp
index 26f20326..a48b53da 100644
--- 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"
 
 
 
diff --git a/Minecraft.Client/AchievementScreen.h b/Minecraft.Client/AchievementScreen.h
index 3c4412e3..254b2de0 100644
--- 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
diff --git a/Minecraft.Client/ArchiveFile.cpp b/Minecraft.Client/ArchiveFile.cpp
index 642471a4..cdb881e0 100644
--- 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"
 
diff --git a/Minecraft.Client/ArrowRenderer.cpp b/Minecraft.Client/ArrowRenderer.cpp
index 65c4ee71..5a7d9e86 100644
--- 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"
 
 void ArrowRenderer::render(shared_ptr<Entity> _arrow, double x, double y, double z, float rot, float a)
 {
diff --git a/Minecraft.Client/BlazeModel.cpp b/Minecraft.Client/BlazeModel.cpp
index 5af894ac..c32d6472 100644
--- 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"
 
diff --git a/Minecraft.Client/BlazeRenderer.cpp b/Minecraft.Client/BlazeRenderer.cpp
index 7d5210dc..d76fc14e 100644
--- 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"
 
 BlazeRenderer::BlazeRenderer() : MobRenderer(new BlazeModel(), 0.5f)
diff --git a/Minecraft.Client/BoatRenderer.cpp b/Minecraft.Client/BoatRenderer.cpp
index f1367ae4..eb6637f5 100644
--- 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"
 
 BoatRenderer::BoatRenderer()  : EntityRenderer()
 {
diff --git a/Minecraft.Client/BookModel.cpp b/Minecraft.Client/BookModel.cpp
index bc4769bd..7e0a4031 100644
--- 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"
 
diff --git a/Minecraft.Client/BreakingItemParticle.cpp b/Minecraft.Client/BreakingItemParticle.cpp
index 51b721f5..d599a139 100644
--- 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)
 {	
diff --git a/Minecraft.Client/BubbleParticle.cpp b/Minecraft.Client/BubbleParticle.cpp
index 2d1380eb..f1ddfe6c 100644
--- 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)
 	{
diff --git a/Minecraft.Client/BufferedImage.cpp b/Minecraft.Client/BufferedImage.cpp
index 658e9341..bde55bb0 100644
--- 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
diff --git a/Minecraft.Client/Camera.cpp b/Minecraft.Client/Camera.cpp
index db6072b2..5ea09313 100644
--- 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;
diff --git a/Minecraft.Client/Camera.h b/Minecraft.Client/Camera.h
index cccb0b2d..4636b39e 100644
--- 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;
diff --git a/Minecraft.Client/ChatScreen.cpp b/Minecraft.Client/ChatScreen.cpp
index b68e6cac..8c65cd5d 100644
--- 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;
 
diff --git a/Minecraft.Client/ChestRenderer.cpp b/Minecraft.Client/ChestRenderer.cpp
index d1b5cf91..0fc36ec6 100644
--- a/Minecraft.Client/ChestRenderer.cpp
+++ b/Minecraft.Client/ChestRenderer.cpp
@@ -3,8 +3,8 @@
 #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/net.minecraft.world.level.tile.entity.h"
+#include "../Minecraft.World/net.minecraft.world.level.tile.h"
 
 ChestRenderer::ChestRenderer()
 {
diff --git a/Minecraft.Client/ChickenModel.cpp b/Minecraft.Client/ChickenModel.cpp
index 21dc2059..7517d009 100644
--- 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"
 
diff --git a/Minecraft.Client/ChickenRenderer.cpp b/Minecraft.Client/ChickenRenderer.cpp
index 908ba506..3ca1cb4a 100644
--- 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"
 
 ChickenRenderer::ChickenRenderer(Model *model, float shadow) : MobRenderer(model,shadow)
 {
diff --git a/Minecraft.Client/Chunk.cpp b/Minecraft.Client/Chunk.cpp
index 99933db3..cd79128e 100644
--- 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"
diff --git a/Minecraft.Client/Chunk.h b/Minecraft.Client/Chunk.h
index f7947156..7d731dec 100644
--- 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;
diff --git a/Minecraft.Client/ClientConnection.cpp b/Minecraft.Client/ClientConnection.cpp
index b80eaed9..bd633aae 100644
--- a/Minecraft.Client/ClientConnection.cpp
+++ b/Minecraft.Client/ClientConnection.cpp
@@ -9,43 +9,43 @@
 #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.player.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.player.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/SoundTypes.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"
@@ -53,8 +53,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)
diff --git a/Minecraft.Client/ClientConnection.h b/Minecraft.Client/ClientConnection.h
index 2ce46ce0..ee73e911 100644
--- 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;
diff --git a/Minecraft.Client/ClockTexture.cpp b/Minecraft.Client/ClockTexture.cpp
index d8abb785..66d4b7a1 100644
--- 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"
 
diff --git a/Minecraft.Client/Common/Audio/Consoles_SoundEngine.h b/Minecraft.Client/Common/Audio/Consoles_SoundEngine.h
index ea19fa77..52ff1dbb 100644
--- a/Minecraft.Client/Common/Audio/Consoles_SoundEngine.h
+++ b/Minecraft.Client/Common/Audio/Consoles_SoundEngine.h
@@ -7,22 +7,22 @@
 #elif defined (__PS3__)
 #undef __in
 #undef __out
-#include "..\..\PS3\Miles\include\mss.h"
+#include "../../PS3/Miles/include/mss.h"
 #elif defined (__PSVITA__)
-#include "..\..\PSVITA\Miles\include\mss.h"
+#include "../../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 "../../Durango/Miles/include/mss.h"
 #elif defined _WINDOWS64
-#include "..\..\windows64\Miles\include\mss.h"
+#include "../../windows64/Miles/include/mss.h"
 #elif defined(__linux__)
 // (DecalOverdose)HACK + TODO: Find native Linux headers and libs for this, but for now I'm using Win64 ones
 // #include "../../windows64/Miles/include/mss.h"
 #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 "../../Orbis/Miles/include/mss.h"
 #endif
 
 typedef struct
diff --git a/Minecraft.Client/Common/Audio/SoundEngine.cpp b/Minecraft.Client/Common/Audio/SoundEngine.cpp
index 4eaf7df7..226c7c74 100644
--- a/Minecraft.Client/Common/Audio/SoundEngine.cpp
+++ b/Minecraft.Client/Common/Audio/SoundEngine.cpp
@@ -1,22 +1,22 @@
 #include "stdafx.h"
 
 #include "SoundEngine.h"
-#include "..\Consoles_App.h"
-#include "..\..\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 "Common\DLC\DLCAudioFile.h"
+#include "../Consoles_App.h"
+#include "../../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 "Common/DLC/DLCAudioFile.h"
 
 #ifdef __PSVITA__
 #include <audioout.h>
 #endif
 
 #ifdef _WINDOWS64
-#include "..\..\Minecraft.Client\Windows64\Windows64_App.h"
-#include "..\..\Minecraft.Client\Windows64\Miles\include\imssapi.h"
+#include "../../Minecraft.Client/Windows64/Windows64_App.h"
+#include "../../Minecraft.Client/Windows64/Miles/include/imssapi.h"
 #endif
 
 #ifdef __ORBIS__
diff --git a/Minecraft.Client/Common/Audio/SoundEngine.h b/Minecraft.Client/Common/Audio/SoundEngine.h
index 92c99d23..d5f7eecc 100644
--- a/Minecraft.Client/Common/Audio/SoundEngine.h
+++ b/Minecraft.Client/Common/Audio/SoundEngine.h
@@ -2,7 +2,7 @@
 class Mob;
 class Options;
 using namespace std;
-#include "..\..\Minecraft.World\SoundTypes.h"
+#include "../../Minecraft.World/SoundTypes.h"
 
 enum eMUSICFILES
 {
diff --git a/Minecraft.Client/Common/C4JMemoryPoolAllocator.h b/Minecraft.Client/Common/C4JMemoryPoolAllocator.h
index a46cc76d..3fb158fb 100644
--- a/Minecraft.Client/Common/C4JMemoryPoolAllocator.h
+++ b/Minecraft.Client/Common/C4JMemoryPoolAllocator.h
@@ -1,7 +1,7 @@
 
 
 #pragma once
-#include "..\Minecraft.Client\Common\C4JMemoryPool.h"
+#include "../Minecraft.Client/Common/C4JMemoryPool.h"
 
 // Custom allocator, takes a C4JMemoryPool class, which can be one of a number of pool implementations.
 
diff --git a/Minecraft.Client/Common/Colours/ColourTable.cpp b/Minecraft.Client/Common/Colours/ColourTable.cpp
index dc58cfb1..1901bf9e 100644
--- 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;
 
diff --git a/Minecraft.Client/Common/ConsoleGameMode.cpp b/Minecraft.Client/Common/ConsoleGameMode.cpp
index b080e628..a7b3597b 100644
--- a/Minecraft.Client/Common/ConsoleGameMode.cpp
+++ b/Minecraft.Client/Common/ConsoleGameMode.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "ConsoleGameMode.h"
-#include "..\Common\Tutorial\Tutorial.h"
+#include "../Common/Tutorial/Tutorial.h"
 
 ConsoleGameMode::ConsoleGameMode(int iPad, Minecraft *minecraft, ClientConnection *connection)
 	: TutorialMode(iPad, minecraft, connection)
diff --git a/Minecraft.Client/Common/ConsoleGameMode.h b/Minecraft.Client/Common/ConsoleGameMode.h
index 3e486cbf..b2ba1966 100644
--- a/Minecraft.Client/Common/ConsoleGameMode.h
+++ b/Minecraft.Client/Common/ConsoleGameMode.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "..\Common\Tutorial\TutorialMode.h"
+#include "../Common/Tutorial/TutorialMode.h"
 
 class ConsoleGameMode : public TutorialMode
 {
diff --git a/Minecraft.Client/Common/Consoles_App.cpp b/Minecraft.Client/Common/Consoles_App.cpp
index 12aecb3d..dd7d3eb9 100644
--- a/Minecraft.Client/Common/Consoles_App.cpp
+++ b/Minecraft.Client/Common/Consoles_App.cpp
@@ -1,64 +1,64 @@
 
 #include "stdafx.h"
 
-#include "..\..\Minecraft.World\Recipy.h"
-#include "..\..\Minecraft.Client\Options.h"
-#include "..\..\Minecraft.World\AABB.h"
-#include "..\..\Minecraft.World\Vec3.h"
-#include "..\MinecraftServer.h"
-#include "..\MultiPlayerLevel.h"
-#include "..\GameRenderer.h"
-#include "..\ProgressRenderer.h"
-#include "..\..\Minecraft.Client\LevelRenderer.h"
-#include "..\..\Minecraft.Client\MobSkinMemTextureProcessor.h"
-#include "..\..\Minecraft.Client\Minecraft.h"
-#include "..\ClientConnection.h"
-#include "..\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 "..\GameMode.h"
-#include "..\Xbox\Social\SocialManager.h"
-#include "Tutorial\TutorialMode.h"
+#include "../../Minecraft.World/Recipy.h"
+#include "../../Minecraft.Client/Options.h"
+#include "../../Minecraft.World/AABB.h"
+#include "../../Minecraft.World/Vec3.h"
+#include "../MinecraftServer.h"
+#include "../MultiPlayerLevel.h"
+#include "../GameRenderer.h"
+#include "../ProgressRenderer.h"
+#include "../../Minecraft.Client/LevelRenderer.h"
+#include "../../Minecraft.Client/MobSkinMemTextureProcessor.h"
+#include "../../Minecraft.Client/Minecraft.h"
+#include "../ClientConnection.h"
+#include "../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 "../GameMode.h"
+#include "../Xbox/Social/SocialManager.h"
+#include "Tutorial/TutorialMode.h"
 #if defined _XBOX || defined _WINDOWS64
-#include "..\..\Minecraft.Client\Xbox\XML\ATGXmlParser.h"
-#include "..\..\Minecraft.Client\Xbox\XML\xmlFilesCallback.h"
+#include "../../Minecraft.Client/Xbox/XML/ATGXmlParser.h"
+#include "../../Minecraft.Client/Xbox/XML/xmlFilesCallback.h"
 #endif
 #include "Minecraft_Macros.h"
-#include "..\..\Minecraft.Client\PlayerList.h"
-#include "..\..\Minecraft.Client\ServerPlayer.h"
-#include "GameRules\ConsoleGameRules.h"
-#include "GameRules\ConsoleSchematicFile.h"
-#include "..\..\Minecraft.World\InputOutputStream.h"
-#include "..\..\Minecraft.World\LevelSettings.h"
-#include "..\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 "..\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.World/InputOutputStream.h"
+#include "../../Minecraft.World/LevelSettings.h"
+#include "../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 "../TexturePackRepository.h"
+#include "../DLCTexturePack.h"
+#include "DLC/DLCPack.h"
+#include "../StringTable.h"
 #ifndef _XBOX
-#include "..\ArchiveFile.h"
+#include "../ArchiveFile.h"
 #endif
-#include "..\Minecraft.h"
+#include "../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 "../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"
 #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 "../Common/Leaderboards/LeaderboardManager.h"
 
 //CMinecraftApp app;
 unsigned int CMinecraftApp::m_uiLastSignInData = 0;
diff --git a/Minecraft.Client/Common/Consoles_App.h b/Minecraft.Client/Common/Consoles_App.h
index 6a0fb55d..73238689 100644
--- a/Minecraft.Client/Common/Consoles_App.h
+++ b/Minecraft.Client/Common/Consoles_App.h
@@ -9,8 +9,8 @@ using namespace std;
 #include "../Common/Tutorial/TutorialEnum.h"
 
 #ifdef _XBOX
-#include "..\Common\XUI\XUI_Helper.h"
-#include "..\Common\XUI\XUI_HelpCredits.h"
+#include "../Common/XUI/XUI_Helper.h"
+#include "../Common/XUI/XUI_HelpCredits.h"
 #endif
 #include "UI/UIStructs.h"
 
diff --git a/Minecraft.Client/Common/DLC/DLCAudioFile.cpp b/Minecraft.Client/Common/DLC/DLCAudioFile.cpp
index 49ba52cd..a2c537f6 100644
--- 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 "../../Xbox/XML/ATGXmlParser.h"
+#include "../../Xbox/XML/xmlFilesCallback.h"
 #endif
 
 DLCAudioFile::DLCAudioFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_Audio,path)
diff --git a/Minecraft.Client/Common/DLC/DLCColourTableFile.cpp b/Minecraft.Client/Common/DLC/DLCColourTableFile.cpp
index ec800dac..fa732177 100644
--- 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.h"
+#include "../../TexturePackRepository.h"
+#include "../../TexturePack.h"
 
 DLCColourTableFile::DLCColourTableFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_ColourTable,path)
 {	
diff --git a/Minecraft.Client/Common/DLC/DLCGameRules.h b/Minecraft.Client/Common/DLC/DLCGameRules.h
index 9d3bbaad..a1998b1d 100644
--- 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 "../GameRules/LevelGenerationOptions.h"
 
 class DLCGameRules : public DLCFile
 {
diff --git a/Minecraft.Client/Common/DLC/DLCGameRulesHeader.cpp b/Minecraft.Client/Common/DLC/DLCGameRulesHeader.cpp
index 39b85219..507b9a01 100644
--- 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"
diff --git a/Minecraft.Client/Common/DLC/DLCGameRulesHeader.h b/Minecraft.Client/Common/DLC/DLCGameRulesHeader.h
index 4521ae11..f73b817b 100644
--- 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 "../GameRules/LevelGenerationOptions.h"
 
 class DLCGameRulesHeader : public DLCGameRules, public JustGrSource
 {
diff --git a/Minecraft.Client/Common/DLC/DLCLocalisationFile.cpp b/Minecraft.Client/Common/DLC/DLCLocalisationFile.cpp
index 358a93e5..70ec965e 100644
--- 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 "../../StringTable.h"
 
 DLCLocalisationFile::DLCLocalisationFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_LocalisationData,path)
 {	
diff --git a/Minecraft.Client/Common/DLC/DLCManager.cpp b/Minecraft.Client/Common/DLC/DLCManager.cpp
index 123e4266..553ddd6e 100644
--- 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.h"
+#include "../../TexturePackRepository.h"
 
 WCHAR *DLCManager::wchTypeNamesA[]=
 {
diff --git a/Minecraft.Client/Common/DLC/DLCPack.cpp b/Minecraft.Client/Common/DLC/DLCPack.cpp
index 23a2e44a..c2ee26bd 100644
--- 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)
 {
diff --git a/Minecraft.Client/Common/DLC/DLCSkinFile.cpp b/Minecraft.Client/Common/DLC/DLCSkinFile.cpp
index f3768a34..165d8108 100644
--- 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 "../../ModelPart.h"
+#include "../../EntityRenderer.h"
+#include "../../EntityRenderDispatcher.h"
+#include "../../../Minecraft.World/Player.h"
+#include "../../../Minecraft.World/StringHelpers.h"
 
 DLCSkinFile::DLCSkinFile(const wstring &path) : DLCFile(DLCManager::e_DLCType_Skin,path)
 {
diff --git a/Minecraft.Client/Common/GameRules/AddEnchantmentRuleDefinition.cpp b/Minecraft.Client/Common/GameRules/AddEnchantmentRuleDefinition.cpp
index eabc1401..1521bd65 100644
--- 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()
diff --git a/Minecraft.Client/Common/GameRules/AddItemRuleDefinition.cpp b/Minecraft.Client/Common/GameRules/AddItemRuleDefinition.cpp
index 0d14884a..5cd69019 100644
--- 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"
 
diff --git a/Minecraft.Client/Common/GameRules/ApplySchematicRuleDefinition.cpp b/Minecraft.Client/Common/GameRules/ApplySchematicRuleDefinition.cpp
index aa4a8fb2..1e719614 100644
--- 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"
diff --git a/Minecraft.Client/Common/GameRules/BiomeOverride.cpp b/Minecraft.Client/Common/GameRules/BiomeOverride.cpp
index 22cc0c7a..fb29443b 100644
--- 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()
diff --git a/Minecraft.Client/Common/GameRules/CollectItemRuleDefinition.cpp b/Minecraft.Client/Common/GameRules/CollectItemRuleDefinition.cpp
index 66abefbb..564bab57 100644
--- 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 "../../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()
 {
diff --git a/Minecraft.Client/Common/GameRules/CompleteAllRuleDefinition.cpp b/Minecraft.Client/Common/GameRules/CompleteAllRuleDefinition.cpp
index adaf70c8..4e548801 100644
--- 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)
 {
diff --git a/Minecraft.Client/Common/GameRules/CompoundGameRuleDefinition.cpp b/Minecraft.Client/Common/GameRules/CompoundGameRuleDefinition.cpp
index 0481a54b..29227ce2 100644
--- 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"
 
diff --git a/Minecraft.Client/Common/GameRules/ConsoleGenerateStructure.cpp b/Minecraft.Client/Common/GameRules/ConsoleGenerateStructure.cpp
index 0476b0e3..6b2b30e9 100644
--- 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)
 {
diff --git a/Minecraft.Client/Common/GameRules/ConsoleSchematicFile.cpp b/Minecraft.Client/Common/GameRules/ConsoleSchematicFile.cpp
index 4a4e27b2..fcfcb182 100644
--- 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()
 {
diff --git a/Minecraft.Client/Common/GameRules/GameRuleDefinition.cpp b/Minecraft.Client/Common/GameRules/GameRuleDefinition.cpp
index b63687c2..7d94a3df 100644
--- 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 "../../WstringLookup.h"
+#include "../../../Minecraft.World/StringHelpers.h"
 #include "ConsoleGameRules.h"
 
 GameRuleDefinition::GameRuleDefinition()
diff --git a/Minecraft.Client/Common/GameRules/GameRuleManager.cpp b/Minecraft.Client/Common/GameRules/GameRuleManager.cpp
index 0c6a7804..347fe9ec 100644
--- 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 "../DLC/DLCPack.h"
+#include "../DLC/DLCLocalisationFile.h"
+#include "../DLC/DLCGameRulesFile.h"
+#include "../DLC/DLCGameRules.h"
+#include "../DLC/DLCGameRulesHeader.h"
+#include "../../StringTable.h"
 #include "ConsoleGameRules.h"
 #include "GameRuleManager.h"
 
diff --git a/Minecraft.Client/Common/GameRules/LevelGenerationOptions.cpp b/Minecraft.Client/Common/GameRules/LevelGenerationOptions.cpp
index 717b066e..acae58fd 100644
--- a/Minecraft.Client/Common/GameRules/LevelGenerationOptions.cpp
+++ b/Minecraft.Client/Common/GameRules/LevelGenerationOptions.cpp
@@ -2,12 +2,12 @@
 
 #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 "..\..\StringTable.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 "../../StringTable.h"
 #include "LevelGenerationOptions.h"
 #include "ConsoleGameRules.h"
 
diff --git a/Minecraft.Client/Common/GameRules/LevelRuleset.cpp b/Minecraft.Client/Common/GameRules/LevelRuleset.cpp
index 1c7ecd47..ba78b0a1 100644
--- 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 "../../StringTable.h"
 #include "ConsoleGameRules.h"
 #include "LevelRuleset.h"
 
diff --git a/Minecraft.Client/Common/GameRules/NamedAreaRuleDefinition.cpp b/Minecraft.Client/Common/GameRules/NamedAreaRuleDefinition.cpp
index 41ff15e8..aa3b92bf 100644
--- 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()
 {
diff --git a/Minecraft.Client/Common/GameRules/StartFeature.cpp b/Minecraft.Client/Common/GameRules/StartFeature.cpp
index 9d5f15c0..c7c22809 100644
--- 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()
diff --git a/Minecraft.Client/Common/GameRules/UpdatePlayerRuleDefinition.cpp b/Minecraft.Client/Common/GameRules/UpdatePlayerRuleDefinition.cpp
index 6e55cd45..7f41cd8a 100644
--- 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()
 {
diff --git a/Minecraft.Client/Common/GameRules/UseTileRuleDefinition.cpp b/Minecraft.Client/Common/GameRules/UseTileRuleDefinition.cpp
index 965405ae..747038e5 100644
--- 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()
diff --git a/Minecraft.Client/Common/GameRules/XboxStructureActionGenerateBox.cpp b/Minecraft.Client/Common/GameRules/XboxStructureActionGenerateBox.cpp
index 6d687b36..a5bd8317 100644
--- 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()
 {
diff --git a/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceBlock.cpp b/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceBlock.cpp
index b816d5b6..6b0e7509 100644
--- 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()
 {
diff --git a/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceContainer.cpp b/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceContainer.cpp
index 8184f45b..d08afff3 100644
--- 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()
 {
diff --git a/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceSpawner.cpp b/Minecraft.Client/Common/GameRules/XboxStructureActionPlaceSpawner.cpp
index 1eca3342..bd0b5a5f 100644
--- 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()
 {
diff --git a/Minecraft.Client/Common/Leaderboards/LeaderboardManager.cpp b/Minecraft.Client/Common/Leaderboards/LeaderboardManager.cpp
index 33707b14..c66dc04b 100644
--- 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"
 
diff --git a/Minecraft.Client/Common/Network/GameNetworkManager.cpp b/Minecraft.Client/Common/Network/GameNetworkManager.cpp
index 2a80f80a..adfec96f 100644
--- a/Minecraft.Client/Common/Network/GameNetworkManager.cpp
+++ b/Minecraft.Client/Common/Network/GameNetworkManager.cpp
@@ -1,43 +1,43 @@
 #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 "..\..\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 "../../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 "..\..\Gui.h"
-#include "..\..\LevelRenderer.h"
-#include "..\..\..\Minecraft.World\IntCache.h"
-#include "..\GameRules\ConsoleGameRules.h"
+#include "../../Gui.h"
+#include "../../LevelRenderer.h"
+#include "../../../Minecraft.World/IntCache.h"
+#include "../GameRules/ConsoleGameRules.h"
 #include "GameNetworkManager.h"
 
 #ifdef _XBOX
-#include "Common\XUI\XUI_PauseMenu.h"
+#include "Common/XUI/XUI_PauseMenu.h"
 #elif !(defined __PSVITA__)
-#include "Common\UI\UI.h"
-#include "Common\UI\UIScene_PauseMenu.h"
-#include "..\..\Xbox\Network\NetworkPlayerXbox.h"
+#include "Common/UI/UI.h"
+#include "Common/UI/UIScene_PauseMenu.h"
+#include "../../Xbox/Network/NetworkPlayerXbox.h"
 #endif
 
 #ifdef _DURANGO
-#include "..\Minecraft.World\DurangoStats.h"
+#include "../Minecraft.World/DurangoStats.h"
 #endif
 
 // Global instance
diff --git a/Minecraft.Client/Common/Network/GameNetworkManager.h b/Minecraft.Client/Common/Network/GameNetworkManager.h
index 9971cd19..5cf106a8 100644
--- a/Minecraft.Client/Common/Network/GameNetworkManager.h
+++ b/Minecraft.Client/Common/Network/GameNetworkManager.h
@@ -7,18 +7,18 @@ using namespace std;
 #include "../../../Minecraft.World/C4JThread.h"
 #include "NetworkPlayerInterface.h"
 #ifdef _XBOX
-#include "..\..\Xbox\Network\PlatformNetworkManagerXbox.h"
+#include "../../Xbox/Network/PlatformNetworkManagerXbox.h"
 #elif defined __PS3__ || defined __ORBIS__ || defined __PSVITA__
-#include "..\..\Common\Network\Sony\PlatformNetworkManagerSony.h"
+#include "../../Common/Network/Sony/PlatformNetworkManagerSony.h"
 #elif defined _DURANGO
-#include "..\..\Durango\Network\PlatformNetworkManagerDurango.h"
+#include "../../Durango/Network/PlatformNetworkManagerDurango.h"
 #else
 #include "PlatformNetworkManagerStub.h"
 #endif
 #include "SessionInfo.h"
 
 #ifdef __ORBIS__
-#include "..\..\Orbis\Network\PsPlusUpsellWrapper_Orbis.h"
+#include "../../Orbis/Network/PsPlusUpsellWrapper_Orbis.h"
 #endif
 
 class ClientConnection;
diff --git a/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.cpp b/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.cpp
index b6b0fe12..7eb57614 100644
--- a/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.cpp
+++ b/Minecraft.Client/Common/Network/PlatformNetworkManagerStub.cpp
@@ -1,8 +1,8 @@
 #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"		// TODO - stub version of this?
+#include "../../Xbox/Network/NetworkPlayerXbox.h"		// TODO - stub version of this?
 
 CPlatformNetworkManagerStub *g_pPlatformNetworkManager;
 
diff --git a/Minecraft.Client/Common/Network/SessionInfo.h b/Minecraft.Client/Common/Network/SessionInfo.h
index 31472a19..677e218b 100644
--- 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 "../../Common/Network/Sony/SQRNetworkManager.h"
 #endif
 
 
diff --git a/Minecraft.Client/Common/Network/Sony/NetworkPlayerSony.h b/Minecraft.Client/Common/Network/Sony/NetworkPlayerSony.h
index 5c8605fb..0298f5a1 100644
--- a/Minecraft.Client/Common/Network/Sony/NetworkPlayerSony.h
+++ b/Minecraft.Client/Common/Network/Sony/NetworkPlayerSony.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "..\..\Common\Network\NetworkPlayerInterface.h"
+#include "../../Common/Network/NetworkPlayerInterface.h"
 #include "SQRNetworkPlayer.h"
 
 // This is an implementation of the INetworkPlayer interface, for Sony platforms. It effectively wraps the SQRNetworkPlayer class in a non-platform-specific way.
diff --git a/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.cpp b/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.cpp
index 009993cb..75a31dce 100644
--- a/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.cpp
+++ b/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
-#include "..\..\..\Minecraft.World\Socket.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "../../../Minecraft.World/Socket.h"
+#include "../../../Minecraft.World/StringHelpers.h"
 #include "PlatformNetworkManagerSony.h"
 #include "NetworkPlayerSony.h"
-#include "..\..\Common\Network\GameNetworkManager.h"
+#include "../../Common/Network/GameNetworkManager.h"
 
 CPlatformNetworkManagerSony *g_pPlatformNetworkManager;
 
diff --git a/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.h b/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.h
index 258acd83..ee33b951 100644
--- a/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.h
+++ b/Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.h
@@ -1,10 +1,10 @@
 #pragma once
 using namespace std;
 #include <vector>
-#include "..\..\..\Minecraft.World\C4JThread.h"
-#include "..\..\Common\Network\NetworkPlayerInterface.h"
-#include "..\..\Common\Network\PlatformNetworkManagerInterface.h"
-#include "..\..\Common\Network\SessionInfo.h"
+#include "../../../Minecraft.World/C4JThread.h"
+#include "../../Common/Network/NetworkPlayerInterface.h"
+#include "../../Common/Network/PlatformNetworkManagerInterface.h"
+#include "../../Common/Network/SessionInfo.h"
 #include "SQRNetworkPlayer.h"
 
 // This is how often we allow a search for new games
diff --git a/Minecraft.Client/Common/Network/Sony/SonyCommerce.cpp b/Minecraft.Client/Common/Network/Sony/SonyCommerce.cpp
index 8435cd56..06113589 100644
--- a/Minecraft.Client/Common/Network/Sony/SonyCommerce.cpp
+++ b/Minecraft.Client/Common/Network/Sony/SonyCommerce.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 
 #include "SonyCommerce.h"
-#include "..\PS3Extras\ShutdownManager.h"
+#include "../PS3Extras/ShutdownManager.h"
 #include <sys/event.h>
 
 
diff --git a/Minecraft.Client/Common/Network/Sony/SonyHttp.cpp b/Minecraft.Client/Common/Network/Sony/SonyHttp.cpp
index f0095885..4e90e10b 100644
--- a/Minecraft.Client/Common/Network/Sony/SonyHttp.cpp
+++ b/Minecraft.Client/Common/Network/Sony/SonyHttp.cpp
@@ -3,15 +3,15 @@
 
 
 #ifdef __PS3__
-#include "PS3\Network\SonyHttp_PS3.h"
+#include "PS3/Network/SonyHttp_PS3.h"
 SonyHttp_PS3 g_SonyHttp;
 
 #elif defined __ORBIS__
-#include "Orbis\Network\SonyHttp_Orbis.h"
+#include "Orbis/Network/SonyHttp_Orbis.h"
 SonyHttp_Orbis g_SonyHttp;
 
 #elif defined __PSVITA__
-#include "PSVita\Network\SonyHttp_Vita.h"
+#include "PSVita/Network/SonyHttp_Vita.h"
 SonyHttp_Vita g_SonyHttp;
 
 #endif
diff --git a/Minecraft.Client/Common/Network/Sony/SonyRemoteStorage.h b/Minecraft.Client/Common/Network/Sony/SonyRemoteStorage.h
index f435848e..fd48885a 100644
--- a/Minecraft.Client/Common/Network/Sony/SonyRemoteStorage.h
+++ b/Minecraft.Client/Common/Network/Sony/SonyRemoteStorage.h
@@ -1,7 +1,7 @@
 #pragma once 
 
 
-#include "..\..\Common\Network\Sony\sceRemoteStorage\header\sceRemoteStorage.h"
+#include "../../Common/Network/Sony/sceRemoteStorage/header/sceRemoteStorage.h"
 
 class SonyRemoteStorage
 {
diff --git a/Minecraft.Client/Common/Telemetry/TelemetryManager.cpp b/Minecraft.Client/Common/Telemetry/TelemetryManager.cpp
index 4b04b19c..03a27910 100644
--- a/Minecraft.Client/Common/Telemetry/TelemetryManager.cpp
+++ b/Minecraft.Client/Common/Telemetry/TelemetryManager.cpp
@@ -2,9 +2,9 @@
 
 #include "MultiPlayerLocalPlayer.h"
 
-#include "..\Minecraft.World\LevelSettings.h"
-#include "..\Minecraft.World\LevelData.h"
-#include "..\Minecraft.World\Level.h"
+#include "../Minecraft.World/LevelSettings.h"
+#include "../Minecraft.World/LevelData.h"
+#include "../Minecraft.World/Level.h"
 
 #include "TelemetryManager.h"
 
@@ -428,7 +428,7 @@ INT CTelemetryManager::GetAudioSettings(DWORD dwUserId)
 /*
 Refers to the highest level performance metric for your game.
 For example, a performance metric could points earned, race time, total kills, etc.
-This is entirely up to you and will help us understand how well the player performed, or how far the player progressed  in the level before exiting.
+This is entirely up to you and will help us understand how well the player performed, or how far the player progressed  in the level before exiting.
 How far did users progress before failing/exiting the level?
 */
 INT CTelemetryManager::GetLevelExitProgressStat1()
@@ -440,7 +440,7 @@ INT CTelemetryManager::GetLevelExitProgressStat1()
 /*
 Refers to the highest level performance metric for your game.
 For example, a performance metric could points earned, race time, total kills, etc.
-This is entirely up to you and will help us understand how well the player performed, or how far the player progressed  in the level before exiting.
+This is entirely up to you and will help us understand how well the player performed, or how far the player progressed  in the level before exiting.
 How far did users progress before failing/exiting the level?
 */
 INT CTelemetryManager::GetLevelExitProgressStat2()
diff --git a/Minecraft.Client/Common/Trial/TrialMode.cpp b/Minecraft.Client/Common/Trial/TrialMode.cpp
index e8149138..5d3092c9 100644
--- 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 "../Tutorial/FullTutorial.h"
 
 TrialMode::TrialMode(int iPad, Minecraft *minecraft, ClientConnection *connection)
 	: FullTutorialMode(iPad, minecraft, connection)
diff --git a/Minecraft.Client/Common/Trial/TrialMode.h b/Minecraft.Client/Common/Trial/TrialMode.h
index a1034acf..2feed67b 100644
--- 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 "../Tutorial/FullTutorialMode.h"
 
 class TrialMode : public FullTutorialMode
 {
diff --git a/Minecraft.Client/Common/Tutorial/AreaConstraint.cpp b/Minecraft.Client/Common/Tutorial/AreaConstraint.cpp
index f133d604..59c84029 100644
--- a/Minecraft.Client/Common/Tutorial/AreaConstraint.cpp
+++ b/Minecraft.Client/Common/Tutorial/AreaConstraint.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 
-#include "..\..\Minecraft.h"
-#include "..\..\MultiplayerLocalPlayer.h"
+#include "../../Minecraft.h"
+#include "../../MultiplayerLocalPlayer.h"
 #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 )
diff --git a/Minecraft.Client/Common/Tutorial/AreaHint.cpp b/Minecraft.Client/Common/Tutorial/AreaHint.cpp
index 8b711c88..2d001b6d 100644
--- a/Minecraft.Client/Common/Tutorial/AreaHint.cpp
+++ b/Minecraft.Client/Common/Tutorial/AreaHint.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 
-#include "..\..\Minecraft.h"
-#include "..\..\MultiplayerLocalPlayer.h"
+#include "../../Minecraft.h"
+#include "../../MultiplayerLocalPlayer.h"
 #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,
diff --git a/Minecraft.Client/Common/Tutorial/ChangeStateConstraint.cpp b/Minecraft.Client/Common/Tutorial/ChangeStateConstraint.cpp
index f01db84e..1439c8d2 100644
--- a/Minecraft.Client/Common/Tutorial/ChangeStateConstraint.cpp
+++ b/Minecraft.Client/Common/Tutorial/ChangeStateConstraint.cpp
@@ -1,13 +1,13 @@
 #include "stdafx.h"
 
 #include "Tutorial.h"
-#include "..\..\Minecraft.h"
-#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 "ChangeStateConstraint.h"
-#include "..\..\..\Minecraft.World\AABB.h"
-#include "..\..\ClientConnection.h"
-#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h"
+#include "../../../Minecraft.World/AABB.h"
+#include "../../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*/ )
diff --git a/Minecraft.Client/Common/Tutorial/ChoiceTask.cpp b/Minecraft.Client/Common/Tutorial/ChoiceTask.cpp
index c03166b5..2be9e956 100644
--- a/Minecraft.Client/Common/Tutorial/ChoiceTask.cpp
+++ b/Minecraft.Client/Common/Tutorial/ChoiceTask.cpp
@@ -1,12 +1,12 @@
 #include "stdafx.h"
 #include <string>
 #include <unordered_map>
-#include "..\..\Minecraft.h"
-#include "..\..\MultiplayerLocalPlayer.h"
+#include "../../Minecraft.h"
+#include "../../MultiplayerLocalPlayer.h"
 #include "Tutorial.h"
 #include "TutorialConstraints.h"
 #include "ChoiceTask.h"
-#include "..\..\..\Minecraft.World\Material.h"
+#include "../../../Minecraft.World/Material.h"
 
 ChoiceTask::ChoiceTask(Tutorial *tutorial, int descriptionId, int promptId /*= -1*/, bool requiresUserInput /*= false*/,
 	int iConfirmMapping /*= 0*/, int iCancelMapping /*= 0*/,
diff --git a/Minecraft.Client/Common/Tutorial/CompleteUsingItemTask.cpp b/Minecraft.Client/Common/Tutorial/CompleteUsingItemTask.cpp
index 43b2f7f3..ca11c255 100644
--- 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)
diff --git a/Minecraft.Client/Common/Tutorial/ControllerTask.cpp b/Minecraft.Client/Common/Tutorial/ControllerTask.cpp
index c5fe071b..f2c35a89 100644
--- a/Minecraft.Client/Common/Tutorial/ControllerTask.cpp
+++ b/Minecraft.Client/Common/Tutorial/ControllerTask.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include <string>
 #include <unordered_map>
-#include "..\..\Minecraft.h"
-#include "..\..\MultiplayerLocalPlayer.h"
+#include "../../Minecraft.h"
+#include "../../MultiplayerLocalPlayer.h"
 #include "Tutorial.h"
 #include "TutorialConstraints.h"
 #include "ControllerTask.h"
diff --git a/Minecraft.Client/Common/Tutorial/CraftTask.cpp b/Minecraft.Client/Common/Tutorial/CraftTask.cpp
index 6749d030..d22c2bf3 100644
--- 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*/,
diff --git a/Minecraft.Client/Common/Tutorial/DiggerItemHint.cpp b/Minecraft.Client/Common/Tutorial/DiggerItemHint.cpp
index 1367f411..2ed54380 100644
--- 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"
 
diff --git a/Minecraft.Client/Common/Tutorial/EffectChangedTask.cpp b/Minecraft.Client/Common/Tutorial/EffectChangedTask.cpp
index 5f1b5b20..6379d8f6 100644
--- 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,
diff --git a/Minecraft.Client/Common/Tutorial/FullTutorial.cpp b/Minecraft.Client/Common/Tutorial/FullTutorial.cpp
index 123ab9de..542b269b 100644
--- 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 "../GameRules/ConsoleGameRules.h"
 #include "DiggerItemHint.h"
 #include "TutorialTasks.h"
 #include "AreaHint.h"
diff --git a/Minecraft.Client/Common/Tutorial/FullTutorialMode.cpp b/Minecraft.Client/Common/Tutorial/FullTutorialMode.cpp
index a5ee85b8..ce3f151e 100644
--- 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.h"
 #include "FullTutorial.h"
 #include "FullTutorialMode.h"
 
diff --git a/Minecraft.Client/Common/Tutorial/InfoTask.cpp b/Minecraft.Client/Common/Tutorial/InfoTask.cpp
index 5330841f..5967f7cb 100644
--- a/Minecraft.Client/Common/Tutorial/InfoTask.cpp
+++ b/Minecraft.Client/Common/Tutorial/InfoTask.cpp
@@ -1,12 +1,12 @@
 #include "stdafx.h"
 #include <string>
 #include <unordered_map>
-#include "..\..\Minecraft.h"
-#include "..\..\MultiplayerLocalPlayer.h"
+#include "../../Minecraft.h"
+#include "../../MultiplayerLocalPlayer.h"
 #include "Tutorial.h"
 #include "TutorialConstraints.h"
 #include "InfoTask.h"
-#include "..\..\..\Minecraft.World\Material.h"
+#include "../../../Minecraft.World/Material.h"
 
 InfoTask::InfoTask(Tutorial *tutorial, int descriptionId, int promptId /*= -1*/, bool requiresUserInput /*= false*/,
 	int iMapping /*= 0*/, ETelemetryChallenges telemetryEvent /*= eTelemetryTutorial_NoEvent*/)
diff --git a/Minecraft.Client/Common/Tutorial/LookAtEntityHint.h b/Minecraft.Client/Common/Tutorial/LookAtEntityHint.h
index 99136691..cced69fa 100644
--- 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;
diff --git a/Minecraft.Client/Common/Tutorial/LookAtTileHint.cpp b/Minecraft.Client/Common/Tutorial/LookAtTileHint.cpp
index 0a953a7b..05a771cb 100644
--- a/Minecraft.Client/Common/Tutorial/LookAtTileHint.cpp
+++ b/Minecraft.Client/Common/Tutorial/LookAtTileHint.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.tile.h"
 #include "Tutorial.h"
 #include "LookAtTileHint.h"
 
diff --git a/Minecraft.Client/Common/Tutorial/StatTask.cpp b/Minecraft.Client/Common/Tutorial/StatTask.cpp
index 5f8b215e..0fde58cc 100644
--- a/Minecraft.Client/Common/Tutorial/StatTask.cpp
+++ b/Minecraft.Client/Common/Tutorial/StatTask.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
-#include "..\..\Minecraft.h"
-#include "..\..\LocalPlayer.h"
-#include "..\..\StatsCounter.h"
-#include "..\..\..\Minecraft.World\net.minecraft.stats.h"
+#include "../../Minecraft.h"
+#include "../../LocalPlayer.h"
+#include "../../StatsCounter.h"
+#include "../../../Minecraft.World/net.minecraft.stats.h"
 #include "StatTask.h"
 
 StatTask::StatTask(Tutorial *tutorial, int descriptionId, bool enablePreCompletion, Stat *stat, int variance /*= 1*/)
diff --git a/Minecraft.Client/Common/Tutorial/TakeItemHint.cpp b/Minecraft.Client/Common/Tutorial/TakeItemHint.cpp
index a1a5c37a..31304b5c 100644
--- a/Minecraft.Client/Common/Tutorial/TakeItemHint.cpp
+++ b/Minecraft.Client/Common/Tutorial/TakeItemHint.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.tile.h"
 #include "Tutorial.h"
 #include "TakeItemHint.h"
 
diff --git a/Minecraft.Client/Common/Tutorial/Tutorial.cpp b/Minecraft.Client/Common/Tutorial/Tutorial.cpp
index b0a0d665..cff5d906 100644
--- a/Minecraft.Client/Common/Tutorial/Tutorial.cpp
+++ b/Minecraft.Client/Common/Tutorial/Tutorial.cpp
@@ -1,17 +1,17 @@
 #include "stdafx.h"
-#include "..\..\..\Minecraft.World\net.minecraft.stats.h"
-#include "..\..\LocalPlayer.h"
-#include "..\..\..\Minecraft.World\Entity.h"
-#include "..\..\..\Minecraft.World\Level.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.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 "..\..\MinecraftServer.h"
-#include "..\..\Minecraft.h"
-#include "..\..\MultiPlayerLocalPlayer.h"
-#include "..\..\MultiPlayerLevel.h"
-#include "..\..\SurvivalMode.h"
+#include "../../../Minecraft.World/net.minecraft.stats.h"
+#include "../../LocalPlayer.h"
+#include "../../../Minecraft.World/Entity.h"
+#include "../../../Minecraft.World/Level.h"
+#include "../../../Minecraft.World/net.minecraft.world.entity.player.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 "../../MinecraftServer.h"
+#include "../../Minecraft.h"
+#include "../../MultiPlayerLocalPlayer.h"
+#include "../../MultiPlayerLevel.h"
+#include "../../SurvivalMode.h"
 #include "Tutorial.h"
 #include "TutorialMessage.h"
 #include "TutorialTasks.h"
diff --git a/Minecraft.Client/Common/Tutorial/TutorialHint.cpp b/Minecraft.Client/Common/Tutorial/TutorialHint.cpp
index 5f0808bf..8295ee71 100644
--- a/Minecraft.Client/Common/Tutorial/TutorialHint.cpp
+++ b/Minecraft.Client/Common/Tutorial/TutorialHint.cpp
@@ -1,11 +1,11 @@
 #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.level.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.tile.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.h"
 #include "Tutorial.h"
 #include "TutorialHint.h"
-#include "..\..\Minecraft.h"
-#include "..\..\MultiplayerLocalPlayer.h"
+#include "../../Minecraft.h"
+#include "../../MultiplayerLocalPlayer.h"
 
 TutorialHint::TutorialHint(eTutorial_Hint id, Tutorial *tutorial, int descriptionId, eHintType type, bool allowFade /*= true*/) 
 	: m_id( id ), m_tutorial(tutorial), m_descriptionId( descriptionId ), m_type( type ), m_counter( 0 ),
diff --git a/Minecraft.Client/Common/Tutorial/TutorialMode.cpp b/Minecraft.Client/Common/Tutorial/TutorialMode.cpp
index 82c81598..e89e991d 100644
--- a/Minecraft.Client/Common/Tutorial/TutorialMode.cpp
+++ b/Minecraft.Client/Common/Tutorial/TutorialMode.cpp
@@ -1,12 +1,12 @@
 #include "stdafx.h"
 #include <memory>
-#include "..\..\Minecraft.h"
-#include "..\..\MultiplayerLocalPlayer.h"
-#include "..\..\MultiPlayerLevel.h"
-#include "..\..\..\Minecraft.World\Inventory.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.h"
+#include "../../MultiplayerLocalPlayer.h"
+#include "../../MultiPlayerLevel.h"
+#include "../../../Minecraft.World/Inventory.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 "TutorialMode.h"
 
 TutorialMode::TutorialMode(int iPad, Minecraft *minecraft, ClientConnection *connection) : MultiPlayerGameMode( minecraft, connection ), m_iPad( iPad )
diff --git a/Minecraft.Client/Common/Tutorial/TutorialMode.h b/Minecraft.Client/Common/Tutorial/TutorialMode.h
index 75e24edf..d0778c03 100644
--- a/Minecraft.Client/Common/Tutorial/TutorialMode.h
+++ b/Minecraft.Client/Common/Tutorial/TutorialMode.h
@@ -1,7 +1,7 @@
 #pragma once
 using namespace std;
 
-#include "..\..\MultiPlayerGameMode.h"
+#include "../../MultiPlayerGameMode.h"
 #include "Tutorial.h"
 
 class TutorialMode : public MultiPlayerGameMode
diff --git a/Minecraft.Client/Common/Tutorial/UseItemTask.cpp b/Minecraft.Client/Common/Tutorial/UseItemTask.cpp
index 09bac4d1..65359af0 100644
--- a/Minecraft.Client/Common/Tutorial/UseItemTask.cpp
+++ b/Minecraft.Client/Common/Tutorial/UseItemTask.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
-#include "..\..\..\Minecraft.World\Entity.h"
-#include "..\..\..\Minecraft.World\Level.h"
-#include "..\..\..\Minecraft.World\ItemInstance.h"
+#include "../../../Minecraft.World/Entity.h"
+#include "../../../Minecraft.World/Level.h"
+#include "../../../Minecraft.World/ItemInstance.h"
 #include "UseItemTask.h"
 
 UseItemTask::UseItemTask(const int itemId, Tutorial *tutorial, int descriptionId,
diff --git a/Minecraft.Client/Common/Tutorial/UseTileTask.cpp b/Minecraft.Client/Common/Tutorial/UseTileTask.cpp
index 1f4ed4cb..574f3537 100644
--- a/Minecraft.Client/Common/Tutorial/UseTileTask.cpp
+++ b/Minecraft.Client/Common/Tutorial/UseTileTask.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
-#include "..\..\..\Minecraft.World\Entity.h"
-#include "..\..\..\Minecraft.World\Level.h"
-#include "..\..\..\Minecraft.World\ItemInstance.h"
+#include "../../../Minecraft.World/Entity.h"
+#include "../../../Minecraft.World/Level.h"
+#include "../../../Minecraft.World/ItemInstance.h"
 #include "UseTileTask.h"
 
 UseTileTask::UseTileTask(const int tileId, int x, int y, int z, Tutorial *tutorial, int descriptionId,
diff --git a/Minecraft.Client/Common/Tutorial/XuiCraftingTask.cpp b/Minecraft.Client/Common/Tutorial/XuiCraftingTask.cpp
index 71b88479..d6995e67 100644
--- a/Minecraft.Client/Common/Tutorial/XuiCraftingTask.cpp
+++ b/Minecraft.Client/Common/Tutorial/XuiCraftingTask.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
-#include "..\..\..\Minecraft.World\ItemInstance.h"
+#include "../../../Minecraft.World/ItemInstance.h"
 #if !(defined _XBOX) && !(defined __PSVITA__)
-#include "..\UI\UI.h"
+#include "../UI/UI.h"
 #endif
 #include "Tutorial.h"
 #include "XuiCraftingTask.h"
diff --git a/Minecraft.Client/Common/Tutorial/XuiCraftingTask.h b/Minecraft.Client/Common/Tutorial/XuiCraftingTask.h
index 2dc48709..25f9d8eb 100644
--- a/Minecraft.Client/Common/Tutorial/XuiCraftingTask.h
+++ b/Minecraft.Client/Common/Tutorial/XuiCraftingTask.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "TutorialTask.h"
-#include "..\..\..\Minecraft.World\Recipy.h"
+#include "../../../Minecraft.World/Recipy.h"
 
 class XuiCraftingTask : public TutorialTask
 {
diff --git a/Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.cpp
index 29ddcf71..adc7d3eb 100644
--- a/Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.cpp
@@ -2,12 +2,12 @@
 
 #include "IUIScene_AbstractContainerMenu.h"
 
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.crafting.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
-#include "..\..\MultiplayerLocalPlayer.h"
-#include "..\..\Minecraft.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.crafting.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h"
+#include "../../MultiplayerLocalPlayer.h"
+#include "../../Minecraft.h"
 
 #ifdef __ORBIS__
 #include <pad.h>
diff --git a/Minecraft.Client/Common/UI/IUIScene_AnvilMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_AnvilMenu.cpp
index 81451c7a..2bb62f9a 100644
--- a/Minecraft.Client/Common/UI/IUIScene_AnvilMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_AnvilMenu.cpp
@@ -1,11 +1,11 @@
 #include "stdafx.h"
 #include "IUIScene_AnvilMenu.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\..\Minecraft.World\InputOutputStream.h"
-#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h"
-#include "..\..\Minecraft.h"
-#include "..\..\MultiPlayerLocalPlayer.h"
-#include "..\..\ClientConnection.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../../../Minecraft.World/InputOutputStream.h"
+#include "../../../Minecraft.World/net.minecraft.network.packet.h"
+#include "../../Minecraft.h"
+#include "../../MultiPlayerLocalPlayer.h"
+#include "../../ClientConnection.h"
 
 IUIScene_AnvilMenu::IUIScene_AnvilMenu()
 {
diff --git a/Minecraft.Client/Common/UI/IUIScene_AnvilMenu.h b/Minecraft.Client/Common/UI/IUIScene_AnvilMenu.h
index 6c4348f2..36c32285 100644
--- a/Minecraft.Client/Common/UI/IUIScene_AnvilMenu.h
+++ b/Minecraft.Client/Common/UI/IUIScene_AnvilMenu.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "IUIScene_AbstractContainerMenu.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.ContainerListener.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.ContainerListener.h"
 
 // The 0-indexed slot in the inventory list that lines up with the result slot
 #define ANVIL_SCENE_RESULT_SLOT_UP_OFFSET 5
diff --git a/Minecraft.Client/Common/UI/IUIScene_BrewingMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_BrewingMenu.cpp
index 44bbdc44..a1ffaedd 100644
--- a/Minecraft.Client/Common/UI/IUIScene_BrewingMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_BrewingMenu.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 
 #include "IUIScene_BrewingMenu.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
 
 IUIScene_AbstractContainerMenu::ESceneSection IUIScene_BrewingMenu::GetSectionAndSlotInDirection( ESceneSection eSection, ETapState eTapDirection, int *piTargetX, int *piTargetY )
 {
diff --git a/Minecraft.Client/Common/UI/IUIScene_ContainerMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_ContainerMenu.cpp
index c6a4df00..f1b7ba6e 100644
--- a/Minecraft.Client/Common/UI/IUIScene_ContainerMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_ContainerMenu.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "IUIScene_ContainerMenu.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
 
 IUIScene_AbstractContainerMenu::ESceneSection IUIScene_ContainerMenu::GetSectionAndSlotInDirection( ESceneSection eSection, ETapState eTapDirection, int *piTargetX, int *piTargetY )
 {
diff --git a/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.cpp
index f158b174..fb155d7c 100644
--- a/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.crafting.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
-#include "..\..\..\Minecraft.World\net.minecraft.stats.h"
-#include "..\..\LocalPlayer.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.crafting.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.tile.h"
+#include "../../../Minecraft.World/net.minecraft.stats.h"
+#include "../../LocalPlayer.h"
 #include "IUIScene_CraftingMenu.h"
 
 Recipy::_eGroupType IUIScene_CraftingMenu::m_GroupTypeMapping4GridA[IUIScene_CraftingMenu::m_iMaxGroup2x2]=
diff --git a/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.h b/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.h
index 05227fff..11c28eef 100644
--- a/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.h
+++ b/Minecraft.Client/Common/UI/IUIScene_CraftingMenu.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "..\..\..\Minecraft.World\Recipy.h"
-#include "..\..\..\Minecraft.World\Item.h"
+#include "../../../Minecraft.World/Recipy.h"
+#include "../../../Minecraft.World/Item.h"
 
 class LocalPlayer;
 
diff --git a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp
index 7ce33234..d95038ea 100644
--- a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp
@@ -1,13 +1,13 @@
 #include "stdafx.h"
 #include "IUIScene_CreativeMenu.h"
 
-#include "..\..\Minecraft.h"
-#include "..\..\MultiplayerLocalPlayer.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.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.item.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.enchantment.h"
+#include "../../Minecraft.h"
+#include "../../MultiplayerLocalPlayer.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.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.item.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.enchantment.h"
 
 // 4J JEV - Images for each tab.
 IUIScene_CreativeMenu::TabSpec **IUIScene_CreativeMenu::specs = NULL;
diff --git a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.h b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.h
index 7ab3ff7e..ed305ace 100644
--- a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.h
+++ b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "IUIScene_AbstractContainerMenu.h"
-#include "..\..\..\Minecraft.World\AbstractContainerMenu.h"
+#include "../../../Minecraft.World/AbstractContainerMenu.h"
 // 4J Stu - This class is for code that is common between XUI and Iggy
 
 class SimpleContainer;
diff --git a/Minecraft.Client/Common/UI/IUIScene_DispenserMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_DispenserMenu.cpp
index ec8a73c3..be7fdac5 100644
--- a/Minecraft.Client/Common/UI/IUIScene_DispenserMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_DispenserMenu.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 
 #include "IUIScene_DispenserMenu.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
 
 IUIScene_AbstractContainerMenu::ESceneSection IUIScene_DispenserMenu::GetSectionAndSlotInDirection( ESceneSection eSection, ETapState eTapDirection, int *piTargetX, int *piTargetY )
 {
diff --git a/Minecraft.Client/Common/UI/IUIScene_EnchantingMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_EnchantingMenu.cpp
index c73f7dc5..4f4659cf 100644
--- a/Minecraft.Client/Common/UI/IUIScene_EnchantingMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_EnchantingMenu.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\Minecraft.h"
-#include "..\..\MultiplayerLocalPlayer.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../../Minecraft.h"
+#include "../../MultiplayerLocalPlayer.h"
 #include "IUIScene_EnchantingMenu.h"
 
 IUIScene_AbstractContainerMenu::ESceneSection IUIScene_EnchantingMenu::GetSectionAndSlotInDirection( IUIScene_AbstractContainerMenu::ESceneSection eSection, ETapState eTapDirection, int *piTargetX, int *piTargetY )
diff --git a/Minecraft.Client/Common/UI/IUIScene_FurnaceMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_FurnaceMenu.cpp
index 4a6c6762..927281b8 100644
--- a/Minecraft.Client/Common/UI/IUIScene_FurnaceMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_FurnaceMenu.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 
 #include "IUIScene_FurnaceMenu.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
 
 IUIScene_AbstractContainerMenu::ESceneSection IUIScene_FurnaceMenu::GetSectionAndSlotInDirection( ESceneSection eSection, ETapState eTapDirection, int *piTargetX, int *piTargetY )
 {
diff --git a/Minecraft.Client/Common/UI/IUIScene_InventoryMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_InventoryMenu.cpp
index 7bed406a..a4886003 100644
--- a/Minecraft.Client/Common/UI/IUIScene_InventoryMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_InventoryMenu.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 
 #include "IUIScene_InventoryMenu.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
 
 IUIScene_AbstractContainerMenu::ESceneSection IUIScene_InventoryMenu::GetSectionAndSlotInDirection( ESceneSection eSection, ETapState eTapDirection, int *piTargetX, int *piTargetY )
 {
diff --git a/Minecraft.Client/Common/UI/IUIScene_PauseMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_PauseMenu.cpp
index 79203e7c..8bb655a1 100644
--- a/Minecraft.Client/Common/UI/IUIScene_PauseMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_PauseMenu.cpp
@@ -1,15 +1,15 @@
 #include "stdafx.h"
 #include "IUIScene_PauseMenu.h"
-#include "..\..\Minecraft.h"
-#include "..\..\MinecraftServer.h"
-#include "..\..\MultiPlayerLevel.h"
-#include "..\..\ProgressRenderer.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.phys.h"
-#include "..\..\TexturePackRepository.h"
-#include "..\..\TexturePack.h"
-#include "..\..\DLCTexturePack.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "../../Minecraft.h"
+#include "../../MinecraftServer.h"
+#include "../../MultiPlayerLevel.h"
+#include "../../ProgressRenderer.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.h"
+#include "../../../Minecraft.World/net.minecraft.world.phys.h"
+#include "../../TexturePackRepository.h"
+#include "../../TexturePack.h"
+#include "../../DLCTexturePack.h"
+#include "../../../Minecraft.World/StringHelpers.h"
 
 
 int IUIScene_PauseMenu::ExitGameDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
diff --git a/Minecraft.Client/Common/UI/IUIScene_TradingMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_TradingMenu.cpp
index 658bcdfb..6e32abe8 100644
--- a/Minecraft.Client/Common/UI/IUIScene_TradingMenu.cpp
+++ b/Minecraft.Client/Common/UI/IUIScene_TradingMenu.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.trading.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h"
-#include "..\..\Minecraft.h"
-#include "..\..\MultiPlayerLocalPlayer.h"
-#include "..\..\ClientConnection.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.trading.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../../../Minecraft.World/net.minecraft.network.packet.h"
+#include "../../Minecraft.h"
+#include "../../MultiPlayerLocalPlayer.h"
+#include "../../ClientConnection.h"
 #include "IUIScene_TradingMenu.h"
 
 IUIScene_TradingMenu::IUIScene_TradingMenu()
diff --git a/Minecraft.Client/Common/UI/IUIScene_TradingMenu.h b/Minecraft.Client/Common/UI/IUIScene_TradingMenu.h
index c8edda67..491ef29d 100644
--- a/Minecraft.Client/Common/UI/IUIScene_TradingMenu.h
+++ b/Minecraft.Client/Common/UI/IUIScene_TradingMenu.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "..\Minecraft.World\MerchantMenu.h"
+#include "../Minecraft.World/MerchantMenu.h"
 
 class MerchantRecipe;
 
diff --git a/Minecraft.Client/Common/UI/UIComponent_Chat.cpp b/Minecraft.Client/Common/UI/UIComponent_Chat.cpp
index 98b4f165..45a2277f 100644
--- a/Minecraft.Client/Common/UI/UIComponent_Chat.cpp
+++ b/Minecraft.Client/Common/UI/UIComponent_Chat.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIComponent_Chat.h"
-#include "..\..\Minecraft.h"
-#include "..\..\Gui.h"
+#include "../../Minecraft.h"
+#include "../../Gui.h"
 
 UIComponent_Chat::UIComponent_Chat(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
diff --git a/Minecraft.Client/Common/UI/UIComponent_Panorama.cpp b/Minecraft.Client/Common/UI/UIComponent_Panorama.cpp
index a418fcda..8ec8ff18 100644
--- a/Minecraft.Client/Common/UI/UIComponent_Panorama.cpp
+++ b/Minecraft.Client/Common/UI/UIComponent_Panorama.cpp
@@ -3,8 +3,8 @@
 #include "UIComponent_Panorama.h"
 #include "Minecraft.h"
 #include "MultiPlayerLevel.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.dimension.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.storage.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.dimension.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.storage.h"
 
 UIComponent_Panorama::UIComponent_Panorama(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
diff --git a/Minecraft.Client/Common/UI/UIComponent_PressStartToPlay.cpp b/Minecraft.Client/Common/UI/UIComponent_PressStartToPlay.cpp
index 2feb94c1..fe5087fa 100644
--- a/Minecraft.Client/Common/UI/UIComponent_PressStartToPlay.cpp
+++ b/Minecraft.Client/Common/UI/UIComponent_PressStartToPlay.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIComponent_PressStartToPlay.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "../../../Minecraft.World/StringHelpers.h"
 
 UIComponent_PressStartToPlay::UIComponent_PressStartToPlay(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
diff --git a/Minecraft.Client/Common/UI/UIComponent_TutorialPopup.cpp b/Minecraft.Client/Common/UI/UIComponent_TutorialPopup.cpp
index 858a8b43..e21d3353 100644
--- a/Minecraft.Client/Common/UI/UIComponent_TutorialPopup.cpp
+++ b/Minecraft.Client/Common/UI/UIComponent_TutorialPopup.cpp
@@ -1,11 +1,11 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIComponent_TutorialPopup.h"
-#include "..\..\Common\Tutorial\Tutorial.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\MultiplayerLocalPlayer.h"
-#include "..\..\Minecraft.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "../../Common/Tutorial/Tutorial.h"
+#include "../../../Minecraft.World/StringHelpers.h"
+#include "../../MultiplayerLocalPlayer.h"
+#include "../../Minecraft.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.tile.h"
 
 UIComponent_TutorialPopup::UIComponent_TutorialPopup(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
diff --git a/Minecraft.Client/Common/UI/UIControl.cpp b/Minecraft.Client/Common/UI/UIControl.cpp
index ec2e13d8..a32485a6 100644
--- a/Minecraft.Client/Common/UI/UIControl.cpp
+++ b/Minecraft.Client/Common/UI/UIControl.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIControl.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\..\Minecraft.World\JavaMath.h"
+#include "../../../Minecraft.World/StringHelpers.h"
+#include "../../../Minecraft.World/JavaMath.h"
 
 UIControl::UIControl()
 {
diff --git a/Minecraft.Client/Common/UI/UIControl_Base.cpp b/Minecraft.Client/Common/UI/UIControl_Base.cpp
index 18af2f63..eacebdae 100644
--- a/Minecraft.Client/Common/UI/UIControl_Base.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_Base.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIControl.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\..\Minecraft.World\JavaMath.h"
+#include "../../../Minecraft.World/StringHelpers.h"
+#include "../../../Minecraft.World/JavaMath.h"
 
 UIControl_Base::UIControl_Base()
 {
diff --git a/Minecraft.Client/Common/UI/UIControl_EnchantmentBook.cpp b/Minecraft.Client/Common/UI/UIControl_EnchantmentBook.cpp
index ef7c0e94..a4f2f808 100644
--- a/Minecraft.Client/Common/UI/UIControl_EnchantmentBook.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_EnchantmentBook.cpp
@@ -1,13 +1,13 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIControl_EnchantmentBook.h"
-#include "..\..\Minecraft.h"
-#include "..\..\TileEntityRenderDispatcher.h"
-#include "..\..\EnchantTableRenderer.h"
-#include "..\..\Lighting.h"
-#include "..\..\BookModel.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "../../Minecraft.h"
+#include "../../TileEntityRenderDispatcher.h"
+#include "../../EnchantTableRenderer.h"
+#include "../../Lighting.h"
+#include "../../BookModel.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
 
 UIControl_EnchantmentBook::UIControl_EnchantmentBook()
 {
diff --git a/Minecraft.Client/Common/UI/UIControl_EnchantmentButton.cpp b/Minecraft.Client/Common/UI/UIControl_EnchantmentButton.cpp
index e1490e0b..3725f5ad 100644
--- a/Minecraft.Client/Common/UI/UIControl_EnchantmentButton.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_EnchantmentButton.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIControl_EnchantmentButton.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\Minecraft.h"
-#include "..\..\MultiplayerLocalPlayer.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../../Minecraft.h"
+#include "../../MultiplayerLocalPlayer.h"
+#include "../../../Minecraft.World/StringHelpers.h"
 
 UIControl_EnchantmentButton::UIControl_EnchantmentButton()
 {
diff --git a/Minecraft.Client/Common/UI/UIControl_Label.cpp b/Minecraft.Client/Common/UI/UIControl_Label.cpp
index 1481fea1..9f3782e0 100644
--- a/Minecraft.Client/Common/UI/UIControl_Label.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_Label.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIControl_Label.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "../../../Minecraft.World/StringHelpers.h"
 
 UIControl_Label::UIControl_Label()
 {
diff --git a/Minecraft.Client/Common/UI/UIControl_MinecraftPlayer.cpp b/Minecraft.Client/Common/UI/UIControl_MinecraftPlayer.cpp
index 3a18ed53..e8f36d54 100644
--- a/Minecraft.Client/Common/UI/UIControl_MinecraftPlayer.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_MinecraftPlayer.cpp
@@ -1,14 +1,14 @@
 #include "stdafx.h"
-#include "..\..\Minecraft.h"
-#include "..\..\ScreenSizeCalculator.h"
-#include "..\..\EntityRenderDispatcher.h"
-#include "..\..\PlayerRenderer.h"
-#include "..\..\HumanoidModel.h"
-#include "..\..\Lighting.h"
-#include "..\..\ModelPart.h"
-#include "..\..\Options.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.h"
-#include "..\..\MultiplayerLocalPlayer.h"
+#include "../../Minecraft.h"
+#include "../../ScreenSizeCalculator.h"
+#include "../../EntityRenderDispatcher.h"
+#include "../../PlayerRenderer.h"
+#include "../../HumanoidModel.h"
+#include "../../Lighting.h"
+#include "../../ModelPart.h"
+#include "../../Options.h"
+#include "../../../Minecraft.World/net.minecraft.world.entity.player.h"
+#include "../../MultiplayerLocalPlayer.h"
 #include "UI.h"
 #include "UIControl_MinecraftPlayer.h"
 
diff --git a/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.cpp b/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.cpp
index 544b4da1..09c4ea62 100644
--- a/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.cpp
+++ b/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.cpp
@@ -1,13 +1,13 @@
 #include "stdafx.h"
-#include "..\..\Minecraft.h"
-#include "..\..\ScreenSizeCalculator.h"
-#include "..\..\EntityRenderDispatcher.h"
-#include "..\..\PlayerRenderer.h"
-#include "..\..\HumanoidModel.h"
-#include "..\..\Lighting.h"
-#include "..\..\ModelPart.h"
-#include "..\..\Options.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.h"
+#include "../../Minecraft.h"
+#include "../../ScreenSizeCalculator.h"
+#include "../../EntityRenderDispatcher.h"
+#include "../../PlayerRenderer.h"
+#include "../../HumanoidModel.h"
+#include "../../Lighting.h"
+#include "../../ModelPart.h"
+#include "../../Options.h"
+#include "../../../Minecraft.World/net.minecraft.world.entity.player.h"
 #include "UIControl_PlayerSkinPreview.h"
 
 //#define SKIN_PREVIEW_BOB_ANIM
diff --git a/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.h b/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.h
index a7c3126e..974e5924 100644
--- a/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.h
+++ b/Minecraft.Client/Common/UI/UIControl_PlayerSkinPreview.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "UIControl.h"
-#include "..\..\Textures.h"
+#include "../../Textures.h"
 
 class ModelPart;
 class EntityRenderer;
diff --git a/Minecraft.Client/Common/UI/UIController.cpp b/Minecraft.Client/Common/UI/UIController.cpp
index 7493ff06..f777805e 100644
--- a/Minecraft.Client/Common/UI/UIController.cpp
+++ b/Minecraft.Client/Common/UI/UIController.cpp
@@ -2,14 +2,14 @@
 #include "UIController.h"
 #include "UI.h"
 #include "UIScene.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\LocalPlayer.h"
-#include "..\..\DLCTexturePack.h"
-#include "..\..\TexturePackRepository.h"
-#include "..\..\Minecraft.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.entity.boss.enderdragon.h"
-#include "..\..\EnderDragonRenderer.h"
-#include "..\..\MultiPlayerLocalPlayer.h"
+#include "../../../Minecraft.World/StringHelpers.h"
+#include "../../LocalPlayer.h"
+#include "../../DLCTexturePack.h"
+#include "../../TexturePackRepository.h"
+#include "../../Minecraft.h"
+#include "../../../Minecraft.World/net.minecraft.world.entity.boss.enderdragon.h"
+#include "../../EnderDragonRenderer.h"
+#include "../../MultiPlayerLocalPlayer.h"
 #include "UIFontData.h"
 #ifdef __PSVITA__
 #include <message_dialog.h>
@@ -21,7 +21,7 @@
 
 //#define ENABLE_IGGY_EXPLORER
 #ifdef ENABLE_IGGY_EXPLORER
-#include "Windows64\Iggy\include\iggyexpruntime.h"
+#include "Windows64/Iggy/include/iggyexpruntime.h"
 #endif
 
 //#define ENABLE_IGGY_PERFMON
@@ -31,18 +31,18 @@
 #define PM_ORIGIN_Y 34
 
 #ifdef __ORBIS__
-#include "Orbis\Iggy\include\iggyperfmon.h"
-#include "Orbis\Iggy\include\iggyperfmon_orbis.h"
+#include "Orbis/Iggy/include/iggyperfmon.h"
+#include "Orbis/Iggy/include/iggyperfmon_orbis.h"
 #elif defined _DURANGO
-#include "Durango\Iggy\include\iggyperfmon.h"
+#include "Durango/Iggy/include/iggyperfmon.h"
 #elif defined __PS3__
-#include "PS3\Iggy\include\iggyperfmon.h"
-#include "PS3\Iggy\include\iggyperfmon_ps3.h"
+#include "PS3/Iggy/include/iggyperfmon.h"
+#include "PS3/Iggy/include/iggyperfmon_ps3.h"
 #elif defined __PSVITA__
-#include "PSVita\Iggy\include\iggyperfmon.h"
-#include "PSVita\Iggy\include\iggyperfmon_psp2.h"
+#include "PSVita/Iggy/include/iggyperfmon.h"
+#include "PSVita/Iggy/include/iggyperfmon_psp2.h"
 #elif defined __WINDOWS64
-#include "Windows64\Iggy\include\iggyperfmon.h"
+#include "Windows64/Iggy/include/iggyperfmon.h"
 #endif
 
 #endif
diff --git a/Minecraft.Client/Common/UI/UIScene.cpp b/Minecraft.Client/Common/UI/UIScene.cpp
index e7d907ec..b540f861 100644
--- a/Minecraft.Client/Common/UI/UIScene.cpp
+++ b/Minecraft.Client/Common/UI/UIScene.cpp
@@ -2,10 +2,10 @@
 #include "UI.h"
 #include "UIScene.h"
 
-#include "..\..\Lighting.h"
-#include "..\..\LocalPlayer.h"
-#include "..\..\ItemRenderer.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
+#include "../../Lighting.h"
+#include "../../LocalPlayer.h"
+#include "../../ItemRenderer.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.h"
 
 UIScene::UIScene(int iPad, UILayer *parentLayer)
 {
diff --git a/Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.cpp b/Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.cpp
index a1bd8270..bada2e05 100644
--- a/Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_AbstractContainerMenu.cpp
@@ -2,9 +2,9 @@
 #include "UI.h"
 #include "UIScene_AbstractContainerMenu.h"
 
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\..\MultiplayerLocalPlayer.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.h"
+#include "../../MultiplayerLocalPlayer.h"
 
 UIScene_AbstractContainerMenu::UIScene_AbstractContainerMenu(int iPad, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
@@ -106,8 +106,8 @@ void UIScene_AbstractContainerMenu::PlatformInitialize(int iPad, int startIndex)
 #ifdef __ORBIS__
 	// we need to map the touchpad rectangle to the UI rectangle. While it works great for the creative menu, it is much too sensitive for the smaller menus.
 	//X coordinate of the touch point (0 to 1919)    
-	//Y coordinate of the touch point (0 to 941: DUALSHOCK®4 wireless controllers and the CUH-ZCT1J/CAP-ZCT1J/CAP-ZCT1U controllers for the PlayStation®4 development tool,    
-	//0 to 753: JDX-1000x series controllers for the PlayStation®4 development tool,)     
+	//Y coordinate of the touch point (0 to 941: DUALSHOCK®4 wireless controllers and the CUH-ZCT1J/CAP-ZCT1J/CAP-ZCT1U controllers for the PlayStation®4 development tool,    
+	//0 to 753: JDX-1000x series controllers for the PlayStation®4 development tool,)     
 	m_fTouchPadMulX=fPanelWidth/1919.0f;
 	m_fTouchPadMulY=fPanelHeight/941.0f;
 	m_fTouchPadDeadZoneX=15.0f*m_fTouchPadMulX;
diff --git a/Minecraft.Client/Common/UI/UIScene_AnvilMenu.cpp b/Minecraft.Client/Common/UI/UIScene_AnvilMenu.cpp
index 7b9886bc..302cc9ff 100644
--- a/Minecraft.Client/Common/UI/UIScene_AnvilMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_AnvilMenu.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "UI.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h"
 #include "MultiPlayerLocalPlayer.h"
-#include "..\..\Minecraft.h"
+#include "../../Minecraft.h"
 #include "UIScene_AnvilMenu.h"
 
 UIScene_AnvilMenu::UIScene_AnvilMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer)
diff --git a/Minecraft.Client/Common/UI/UIScene_AnvilMenu.h b/Minecraft.Client/Common/UI/UIScene_AnvilMenu.h
index 3afc6333..494e4589 100644
--- a/Minecraft.Client/Common/UI/UIScene_AnvilMenu.h
+++ b/Minecraft.Client/Common/UI/UIScene_AnvilMenu.h
@@ -2,7 +2,7 @@
 
 #include "UIScene_AbstractContainerMenu.h"
 #include "IUIScene_AnvilMenu.h"
-#include "..\Minecraft.World\MerchantMenu.h"
+#include "../Minecraft.World/MerchantMenu.h"
 
 class InventoryMenu;
 
diff --git a/Minecraft.Client/Common/UI/UIScene_BrewingStandMenu.cpp b/Minecraft.Client/Common/UI/UIScene_BrewingStandMenu.cpp
index cd56bd84..e9d55e59 100644
--- a/Minecraft.Client/Common/UI/UIScene_BrewingStandMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_BrewingStandMenu.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "UI.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.alchemy.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
-#include "..\..\Minecraft.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.alchemy.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h"
+#include "../../Minecraft.h"
 #include "UIScene_BrewingStandMenu.h"
 
 UIScene_BrewingStandMenu::UIScene_BrewingStandMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer)
diff --git a/Minecraft.Client/Common/UI/UIScene_ConnectingProgress.cpp b/Minecraft.Client/Common/UI/UIScene_ConnectingProgress.cpp
index 0ea99a36..eacc333c 100644
--- a/Minecraft.Client/Common/UI/UIScene_ConnectingProgress.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_ConnectingProgress.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_ConnectingProgress.h"
-#include "..\..\Minecraft.h"
+#include "../../Minecraft.h"
 
 UIScene_ConnectingProgress::UIScene_ConnectingProgress(int iPad, void *_initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
diff --git a/Minecraft.Client/Common/UI/UIScene_ContainerMenu.cpp b/Minecraft.Client/Common/UI/UIScene_ContainerMenu.cpp
index a0b25d18..37e66e74 100644
--- a/Minecraft.Client/Common/UI/UIScene_ContainerMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_ContainerMenu.cpp
@@ -2,14 +2,14 @@
 #include "UI.h"
 #include "UIScene_ContainerMenu.h"
 
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\..\..\Minecraft.World\net.minecraft.stats.h"
-#include "..\..\LocalPlayer.h"
-#include "..\..\Minecraft.h"
-#include "..\Tutorial\Tutorial.h"
-#include "..\Tutorial\TutorialMode.h"
-#include "..\Tutorial\TutorialEnum.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.h"
+#include "../../../Minecraft.World/net.minecraft.stats.h"
+#include "../../LocalPlayer.h"
+#include "../../Minecraft.h"
+#include "../Tutorial/Tutorial.h"
+#include "../Tutorial/TutorialMode.h"
+#include "../Tutorial/TutorialEnum.h"
 
 UIScene_ContainerMenu::UIScene_ContainerMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer)
 {
diff --git a/Minecraft.Client/Common/UI/UIScene_ControlsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_ControlsMenu.cpp
index c05b502e..c9e8156d 100644
--- a/Minecraft.Client/Common/UI/UIScene_ControlsMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_ControlsMenu.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_ControlsMenu.h"
-#include "..\..\Minecraft.h"
-#include "..\..\MultiplayerLocalPlayer.h"
+#include "../../Minecraft.h"
+#include "../../MultiplayerLocalPlayer.h"
 
 UIScene_ControlsMenu::UIScene_ControlsMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
diff --git a/Minecraft.Client/Common/UI/UIScene_CraftingMenu.cpp b/Minecraft.Client/Common/UI/UIScene_CraftingMenu.cpp
index 5b729069..21da9dd4 100644
--- a/Minecraft.Client/Common/UI/UIScene_CraftingMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_CraftingMenu.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "UI.h"
-#include "..\..\Minecraft.h"
-#include "..\..\MultiplayerLocalPlayer.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "../../Minecraft.h"
+#include "../../MultiplayerLocalPlayer.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
 #include "UIScene_CraftingMenu.h"
 
 #ifdef __PSVITA__
diff --git a/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp b/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp
index fa41909d..d5c3f98e 100644
--- a/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_CreateWorldMenu.cpp
@@ -1,26 +1,26 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_CreateWorldMenu.h"
-#include "..\..\MinecraftServer.h"
-#include "..\..\Minecraft.h"
-#include "..\..\Options.h"
-#include "..\..\TexturePackRepository.h"
-#include "..\..\TexturePack.h"
-#include "..\..\..\Minecraft.World\LevelSettings.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\..\Minecraft.World\BiomeSource.h"
-#include "..\..\..\Minecraft.World\IntCache.h"
-#include "..\..\..\Minecraft.World\LevelType.h"
-#include "..\..\DLCTexturePack.h"
+#include "../../MinecraftServer.h"
+#include "../../Minecraft.h"
+#include "../../Options.h"
+#include "../../TexturePackRepository.h"
+#include "../../TexturePack.h"
+#include "../../../Minecraft.World/LevelSettings.h"
+#include "../../../Minecraft.World/StringHelpers.h"
+#include "../../../Minecraft.World/BiomeSource.h"
+#include "../../../Minecraft.World/IntCache.h"
+#include "../../../Minecraft.World/LevelType.h"
+#include "../../DLCTexturePack.h"
 
 #ifdef __PSVITA__
-#include "PSVita\Network\SQRNetworkManager_AdHoc_Vita.h"
+#include "PSVita/Network/SQRNetworkManager_AdHoc_Vita.h"
 #endif
 
 #ifdef  _WINDOWS64
 
 #include <windows.h>
-#include "Xbox\Resource.h"
+#include "Xbox/Resource.h"
 #endif
 
 #define GAME_CREATE_ONLINE_TIMER_ID 0
diff --git a/Minecraft.Client/Common/UI/UIScene_CreativeMenu.cpp b/Minecraft.Client/Common/UI/UIScene_CreativeMenu.cpp
index 569cc8ba..aac3268b 100644
--- a/Minecraft.Client/Common/UI/UIScene_CreativeMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_CreativeMenu.cpp
@@ -2,12 +2,12 @@
 #include "UI.h"
 #include "UIScene_CreativeMenu.h"
 
-#include "..\Minecraft.World\JavaMath.h"
-#include "..\..\LocalPlayer.h"
-#include "..\Tutorial\Tutorial.h"
-#include "..\Tutorial\TutorialMode.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
+#include "../Minecraft.World/JavaMath.h"
+#include "../../LocalPlayer.h"
+#include "../Tutorial/Tutorial.h"
+#include "../Tutorial/TutorialMode.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.h"
 
 #ifdef __PSVITA__
 #define GAME_CREATIVE_TOUCHUPDATE_TIMER_ID 0
diff --git a/Minecraft.Client/Common/UI/UIScene_DLCMainMenu.cpp b/Minecraft.Client/Common/UI/UIScene_DLCMainMenu.cpp
index 0d36dcdf..a50d113e 100644
--- a/Minecraft.Client/Common/UI/UIScene_DLCMainMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_DLCMainMenu.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
 #if defined(__PS3__) || defined(__ORBIS__)
-#include "Common\Network\Sony\SonyCommerce.h"
+#include "Common/Network/Sony/SonyCommerce.h"
 #endif
 #include "UIScene_DLCMainMenu.h"
 
diff --git a/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp b/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp
index 9dbdc3d4..0d2e3aff 100644
--- a/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_DLCOffersMenu.cpp
@@ -1,13 +1,13 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_DLCOffersMenu.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "../../../Minecraft.World/StringHelpers.h"
 #if defined(__PS3__) || defined(__ORBIS__) || defined (__PSVITA__)
-#include "Common\Network\Sony\SonyHttp.h"
+#include "Common/Network/Sony/SonyHttp.h"
 #endif
 
 #ifdef __PSVITA__
-#include "PSVita\Network\SonyCommerce_Vita.h"
+#include "PSVita/Network/SonyCommerce_Vita.h"
 #endif
 
 #define PLAYER_ONLINE_TIMER_ID 0
@@ -193,13 +193,13 @@ void UIScene_DLCOffersMenu::handleInput(int iPad, int key, bool repeat, bool pre
 	switch(iTextC)
 	{
 	case 0:
-		m_labelHTMLSellText.init("Voici un fantastique mini-pack de 24 apparences pour personnaliser votre personnage Minecraft et vous mettre dans l'ambiance des fêtes de fin d'année.<br><br>1-4 joueurs<br>2-8 joueurs en réseau<br><br>  Cet article fait l’objet d’une licence ou d’une sous-licence de Sony Computer Entertainment America, et est soumis aux conditions générales du service du réseau, au contrat d’utilisateur, aux restrictions d’utilisation de cet article et aux autres conditions applicables, disponibles sur le site www.us.playstation.com/support/useragreements. Si vous ne souhaitez pas accepter ces conditions, ne téléchargez pas ce produit. Cet article peut être utilisé avec un maximum de deux systèmes PlayStation®3 activés associés à ce compte Sony Entertainment Network. <br><br>'Minecraft' est une marque commerciale de Notch Development AB.");
+		m_labelHTMLSellText.init("Voici un fantastique mini-pack de 24 apparences pour personnaliser votre personnage Minecraft et vous mettre dans l'ambiance des fêtes de fin d'année.<br><br>1-4 joueurs<br>2-8 joueurs en réseau<br><br>  Cet article fait l’objet d’une licence ou d’une sous-licence de Sony Computer Entertainment America, et est soumis aux conditions générales du service du réseau, au contrat d’utilisateur, aux restrictions d’utilisation de cet article et aux autres conditions applicables, disponibles sur le site www.us.playstation.com/support/useragreements. Si vous ne souhaitez pas accepter ces conditions, ne téléchargez pas ce produit. Cet article peut être utilisé avec un maximum de deux systèmes PlayStation®3 activés associés à ce compte Sony Entertainment Network. <br><br>'Minecraft' est une marque commerciale de Notch Development AB.");
 		break;
 	case 1:
-		m_labelHTMLSellText.init("Un fabuloso minipack de 24 aspectos para personalizar tu personaje de Minecraft y ponerte a tono con las fiestas.<br><br>1-4 jugadores<br>2-8 jugadores en red<br><br>  Sony Computer Entertainment America le concede la licencia o sublicencia de este artículo, que está sujeto a los términos de servicio y al acuerdo de usuario de la red. Las restricciones de uso de este artículo, así como otros términos aplicables, se encuentran en www.us.playstation.com/support/useragreements. Si no desea aceptar todos estos términos, no descargue este artículo. Este artículo puede usarse en hasta dos sistemas PlayStation®3 activados asociados con esta cuenta de Sony Entertainment Network. <br><br>'Minecraft' es una marca comercial de Notch Development AB.");
+		m_labelHTMLSellText.init("Un fabuloso minipack de 24 aspectos para personalizar tu personaje de Minecraft y ponerte a tono con las fiestas.<br><br>1-4 jugadores<br>2-8 jugadores en red<br><br>  Sony Computer Entertainment America le concede la licencia o sublicencia de este artículo, que está sujeto a los términos de servicio y al acuerdo de usuario de la red. Las restricciones de uso de este artículo, así como otros términos aplicables, se encuentran en www.us.playstation.com/support/useragreements. Si no desea aceptar todos estos términos, no descargue este artículo. Este artículo puede usarse en hasta dos sistemas PlayStation®3 activados asociados con esta cuenta de Sony Entertainment Network. <br><br>'Minecraft' es una marca comercial de Notch Development AB.");
 		break;
 	case 2:
-		m_labelHTMLSellText.init("Este é um incrível pacote com 24 capas para personalizar seu personagem no Minecraft e entrar no clima de final de ano.<br><br>1-4 Jogadores<br>Jogadores em rede 2-8<br><br>  Este item está sendo licenciado ou sublicenciado para você pela Sony Computer Entertainment America e está sujeito aos Termos de Serviço da Rede e Acordo do Usuário, as restrições de uso deste item e outros termos aplicáveis estão localizados em www.us.playstation.com/support/useragreements. Caso não queira aceitar todos esses termos, não baixe este item. Este item pode ser usado com até 2 sistemas PlayStation®3 ativados associados a esta Conta de Rede Sony Entertainment. <br><br>'Minecraft' é uma marca registrada da Notch Development AB");
+		m_labelHTMLSellText.init("Este é um incrível pacote com 24 capas para personalizar seu personagem no Minecraft e entrar no clima de final de ano.<br><br>1-4 Jogadores<br>Jogadores em rede 2-8<br><br>  Este item está sendo licenciado ou sublicenciado para você pela Sony Computer Entertainment America e está sujeito aos Termos de Serviço da Rede e Acordo do Usuário, as restrições de uso deste item e outros termos aplicáveis estão localizados em www.us.playstation.com/support/useragreements. Caso não queira aceitar todos esses termos, não baixe este item. Este item pode ser usado com até 2 sistemas PlayStation®3 ativados associados a esta Conta de Rede Sony Entertainment. <br><br>'Minecraft' é uma marca registrada da Notch Development AB");
 		break;
 	}
 	iTextC++;
diff --git a/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp b/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp
index 2026bfca..07f76dc3 100644
--- a/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_DeathMenu.cpp
@@ -2,8 +2,8 @@
 #include "UI.h"
 #include "UIScene_DeathMenu.h"
 #include "IUIScene_PauseMenu.h"
-#include "..\..\Minecraft.h"
-#include "..\..\MultiplayerLocalPlayer.h"
+#include "../../Minecraft.h"
+#include "../../MultiplayerLocalPlayer.h"
 
 UIScene_DeathMenu::UIScene_DeathMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
diff --git a/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.cpp b/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.cpp
index 2a8ac9f8..2a5fb93f 100644
--- a/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.cpp
@@ -4,8 +4,8 @@
 #include "UI.h"
 #include "UIScene_DebugCreateSchematic.h"
 #include "Minecraft.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
+#include "../../../Minecraft.World/StringHelpers.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.h"
 
 UIScene_DebugCreateSchematic::UIScene_DebugCreateSchematic(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
diff --git a/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.h b/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.h
index cbfe785d..8f5897c8 100644
--- a/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.h
+++ b/Minecraft.Client/Common/UI/UIScene_DebugCreateSchematic.h
@@ -1,7 +1,7 @@
 #pragma once
 #ifdef _DEBUG_MENUS_ENABLED
 #include "UIScene.h"
-#include "..\..\Common\GameRules\ConsoleSchematicFile.h"
+#include "../../Common/GameRules/ConsoleSchematicFile.h"
 
 class UIScene_DebugCreateSchematic : public UIScene
 {
diff --git a/Minecraft.Client/Common/UI/UIScene_DebugOverlay.cpp b/Minecraft.Client/Common/UI/UIScene_DebugOverlay.cpp
index 44a7e6c5..9fa8f652 100644
--- a/Minecraft.Client/Common/UI/UIScene_DebugOverlay.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_DebugOverlay.cpp
@@ -3,18 +3,18 @@
 #ifdef _DEBUG_MENUS_ENABLED
 #include "UI.h"
 #include "UIScene_DebugOverlay.h"
-#include "..\..\Minecraft.h"
-#include "..\..\MinecraftServer.h"
-#include "..\..\GameRenderer.h"
-#include "..\..\MultiPlayerLevel.h"
+#include "../../Minecraft.h"
+#include "../../MinecraftServer.h"
+#include "../../GameRenderer.h"
+#include "../../MultiPlayerLevel.h"
 #include "ClientConnection.h"
 #include "MultiPlayerLocalPlayer.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.storage.h"
-#include "..\..\..\Minecraft.World\net.minecraft.commands.common.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.level.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.storage.h"
+#include "../../../Minecraft.World/net.minecraft.commands.common.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.enchantment.h"
 
 UIScene_DebugOverlay::UIScene_DebugOverlay(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
diff --git a/Minecraft.Client/Common/UI/UIScene_DebugSetCamera.cpp b/Minecraft.Client/Common/UI/UIScene_DebugSetCamera.cpp
index dd5a429f..b2083022 100644
--- a/Minecraft.Client/Common/UI/UIScene_DebugSetCamera.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_DebugSetCamera.cpp
@@ -5,7 +5,7 @@
 #include "UIScene_DebugSetCamera.h"
 #include "Minecraft.h"
 #include "MultiPlayerLocalPlayer.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "../../../Minecraft.World/StringHelpers.h"
 
 UIScene_DebugSetCamera::UIScene_DebugSetCamera(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
diff --git a/Minecraft.Client/Common/UI/UIScene_DispenserMenu.cpp b/Minecraft.Client/Common/UI/UIScene_DispenserMenu.cpp
index 1eda1660..840c319f 100644
--- a/Minecraft.Client/Common/UI/UIScene_DispenserMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_DispenserMenu.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "UI.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\Minecraft.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../../Minecraft.h"
 #include "UIScene_DispenserMenu.h"
 
 UIScene_DispenserMenu::UIScene_DispenserMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer)
diff --git a/Minecraft.Client/Common/UI/UIScene_EULA.cpp b/Minecraft.Client/Common/UI/UIScene_EULA.cpp
index 3177344d..26af2c13 100644
--- a/Minecraft.Client/Common/UI/UIScene_EULA.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_EULA.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_EULA.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "../../../Minecraft.World/StringHelpers.h"
 
 UIScene_EULA::UIScene_EULA(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
diff --git a/Minecraft.Client/Common/UI/UIScene_EnchantingMenu.cpp b/Minecraft.Client/Common/UI/UIScene_EnchantingMenu.cpp
index 8a4f1c6d..c1a0c957 100644
--- a/Minecraft.Client/Common/UI/UIScene_EnchantingMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_EnchantingMenu.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "UI.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\Minecraft.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../../Minecraft.h"
 #include "UIScene_EnchantingMenu.h"
 
 UIScene_EnchantingMenu::UIScene_EnchantingMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer)
diff --git a/Minecraft.Client/Common/UI/UIScene_EndPoem.cpp b/Minecraft.Client/Common/UI/UIScene_EndPoem.cpp
index f825efd0..37b458b4 100644
--- a/Minecraft.Client/Common/UI/UIScene_EndPoem.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_EndPoem.cpp
@@ -2,9 +2,9 @@
 #include "UI.h"
 #include "UIScene_EndPoem.h"
 #include "UIBitmapFont.h"
-#include "..\..\Minecraft.h"
-#include "..\..\MultiplayerLocalPlayer.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "../../Minecraft.h"
+#include "../../MultiplayerLocalPlayer.h"
+#include "../../../Minecraft.World/StringHelpers.h"
 
 UIScene_EndPoem::UIScene_EndPoem(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
diff --git a/Minecraft.Client/Common/UI/UIScene_FullscreenProgress.cpp b/Minecraft.Client/Common/UI/UIScene_FullscreenProgress.cpp
index ed31cfaf..e9da64fb 100644
--- a/Minecraft.Client/Common/UI/UIScene_FullscreenProgress.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_FullscreenProgress.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_FullscreenProgress.h"
-#include "..\..\Minecraft.h"
-#include "..\..\ProgressRenderer.h"
+#include "../../Minecraft.h"
+#include "../../ProgressRenderer.h"
 
 
 UIScene_FullscreenProgress::UIScene_FullscreenProgress(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
diff --git a/Minecraft.Client/Common/UI/UIScene_FurnaceMenu.cpp b/Minecraft.Client/Common/UI/UIScene_FurnaceMenu.cpp
index 1ba4053d..daa1fc06 100644
--- a/Minecraft.Client/Common/UI/UIScene_FurnaceMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_FurnaceMenu.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "UI.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\Minecraft.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../../Minecraft.h"
 #include "UIScene_FurnaceMenu.h"
 
 UIScene_FurnaceMenu::UIScene_FurnaceMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene_AbstractContainerMenu(iPad, parentLayer)
diff --git a/Minecraft.Client/Common/UI/UIScene_HUD.cpp b/Minecraft.Client/Common/UI/UIScene_HUD.cpp
index 27eeb76b..2ae5eed1 100644
--- a/Minecraft.Client/Common/UI/UIScene_HUD.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_HUD.cpp
@@ -1,14 +1,14 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_HUD.h"
-#include "..\..\Minecraft.h"
-#include "..\..\MultiplayerLocalPlayer.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.entity.boss.enderdragon.h"
-#include "..\..\EnderDragonRenderer.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.effect.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "../../Minecraft.h"
+#include "../../MultiplayerLocalPlayer.h"
+#include "../../../Minecraft.World/net.minecraft.world.entity.boss.enderdragon.h"
+#include "../../EnderDragonRenderer.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.h"
+#include "../../../Minecraft.World/net.minecraft.world.effect.h"
+#include "../../../Minecraft.World/StringHelpers.h"
 
 UIScene_HUD::UIScene_HUD(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
diff --git a/Minecraft.Client/Common/UI/UIScene_HelpAndOptionsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_HelpAndOptionsMenu.cpp
index 3fe03325..6fb3af95 100644
--- a/Minecraft.Client/Common/UI/UIScene_HelpAndOptionsMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_HelpAndOptionsMenu.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_HelpAndOptionsMenu.h"
-#include "..\..\Minecraft.h"
+#include "../../Minecraft.h"
 
 UIScene_HelpAndOptionsMenu::UIScene_HelpAndOptionsMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
diff --git a/Minecraft.Client/Common/UI/UIScene_HowToPlay.cpp b/Minecraft.Client/Common/UI/UIScene_HowToPlay.cpp
index 68c7591f..cbf2a69b 100644
--- a/Minecraft.Client/Common/UI/UIScene_HowToPlay.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_HowToPlay.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_HowToPlay.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "../../../Minecraft.World/StringHelpers.h"
 
 static UIScene_HowToPlay::SHowToPlayPageDef gs_aPageDefs[ eHowToPlay_NumPages ] =
 {
diff --git a/Minecraft.Client/Common/UI/UIScene_InGameHostOptionsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_InGameHostOptionsMenu.cpp
index de8af0ac..79e1fc30 100644
--- a/Minecraft.Client/Common/UI/UIScene_InGameHostOptionsMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_InGameHostOptionsMenu.cpp
@@ -1,11 +1,11 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_InGameHostOptionsMenu.h"
-#include "..\..\Minecraft.h"
-#include "..\..\MultiPlayerLocalPlayer.h"
-#include "..\..\ClientConnection.h"
-#include "..\..\..\Minecraft.World\net.minecraft.network.h"
-#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h"
+#include "../../Minecraft.h"
+#include "../../MultiPlayerLocalPlayer.h"
+#include "../../ClientConnection.h"
+#include "../../../Minecraft.World/net.minecraft.network.h"
+#include "../../../Minecraft.World/net.minecraft.network.packet.h"
 
 UIScene_InGameHostOptionsMenu::UIScene_InGameHostOptionsMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
diff --git a/Minecraft.Client/Common/UI/UIScene_InGameInfoMenu.cpp b/Minecraft.Client/Common/UI/UIScene_InGameInfoMenu.cpp
index 5c3f73f6..75fd0588 100644
--- a/Minecraft.Client/Common/UI/UIScene_InGameInfoMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_InGameInfoMenu.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_InGameInfoMenu.h"
-#include "..\..\MultiPlayerLocalPlayer.h"
-#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h"
-#include "..\..\MultiPlayerLocalPlayer.h"
-#include "..\..\ClientConnection.h"
+#include "../../MultiPlayerLocalPlayer.h"
+#include "../../../Minecraft.World/net.minecraft.network.packet.h"
+#include "../../MultiPlayerLocalPlayer.h"
+#include "../../ClientConnection.h"
 
 UIScene_InGameInfoMenu::UIScene_InGameInfoMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
diff --git a/Minecraft.Client/Common/UI/UIScene_InGamePlayerOptionsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_InGamePlayerOptionsMenu.cpp
index 6eb22b09..bf58c2cd 100644
--- a/Minecraft.Client/Common/UI/UIScene_InGamePlayerOptionsMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_InGamePlayerOptionsMenu.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_InGamePlayerOptionsMenu.h"
-#include "..\..\Minecraft.h"
-#include "..\..\MultiPlayerLocalPlayer.h"
-#include "..\..\ClientConnection.h"
-#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h"
+#include "../../Minecraft.h"
+#include "../../MultiPlayerLocalPlayer.h"
+#include "../../ClientConnection.h"
+#include "../../../Minecraft.World/net.minecraft.network.packet.h"
 
 
 #define CHECKBOXES_TIMER_ID 0
diff --git a/Minecraft.Client/Common/UI/UIScene_InventoryMenu.cpp b/Minecraft.Client/Common/UI/UIScene_InventoryMenu.cpp
index 723937d0..05a8291a 100644
--- a/Minecraft.Client/Common/UI/UIScene_InventoryMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_InventoryMenu.cpp
@@ -2,18 +2,18 @@
 #include "UI.h"
 #include "UIScene_InventoryMenu.h"
 
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\..\..\Minecraft.World\net.minecraft.stats.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.effect.h"
-#include "..\..\MultiplayerLocalPlayer.h"
-#include "..\..\Minecraft.h"
-#include "..\..\Options.h"
-#include "..\..\EntityRenderDispatcher.h"
-#include "..\..\Lighting.h"
-#include "..\Tutorial\Tutorial.h"
-#include "..\Tutorial\TutorialMode.h"
-#include "..\Tutorial\TutorialEnum.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.h"
+#include "../../../Minecraft.World/net.minecraft.stats.h"
+#include "../../../Minecraft.World/net.minecraft.world.effect.h"
+#include "../../MultiplayerLocalPlayer.h"
+#include "../../Minecraft.h"
+#include "../../Options.h"
+#include "../../EntityRenderDispatcher.h"
+#include "../../Lighting.h"
+#include "../Tutorial/Tutorial.h"
+#include "../Tutorial/TutorialMode.h"
+#include "../Tutorial/TutorialEnum.h"
 
 #define INVENTORY_UPDATE_EFFECTS_TIMER_ID (10)
 #define INVENTORY_UPDATE_EFFECTS_TIMER_TIME (1000) // 1 second
diff --git a/Minecraft.Client/Common/UI/UIScene_InventoryMenu.h b/Minecraft.Client/Common/UI/UIScene_InventoryMenu.h
index fb8d57a2..1b425a3a 100644
--- a/Minecraft.Client/Common/UI/UIScene_InventoryMenu.h
+++ b/Minecraft.Client/Common/UI/UIScene_InventoryMenu.h
@@ -3,7 +3,7 @@
 #include "UIScene_AbstractContainerMenu.h"
 #include "IUIScene_InventoryMenu.h"
 
-#include "..\..\..\Minecraft.World\MobEffect.h"
+#include "../../../Minecraft.World/MobEffect.h"
 
 class InventoryMenu;
 
diff --git a/Minecraft.Client/Common/UI/UIScene_JoinMenu.cpp b/Minecraft.Client/Common/UI/UIScene_JoinMenu.cpp
index cad86dce..acc83c1f 100644
--- a/Minecraft.Client/Common/UI/UIScene_JoinMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_JoinMenu.cpp
@@ -1,12 +1,12 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_JoinMenu.h"
-#include "..\..\Minecraft.h"
-#include "..\..\TexturePackRepository.h"
-#include "..\..\Options.h"
-#include "..\..\MinecraftServer.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.h"
+#include "../../Minecraft.h"
+#include "../../TexturePackRepository.h"
+#include "../../Options.h"
+#include "../../MinecraftServer.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.h"
+#include "../../../Minecraft.World/net.minecraft.world.h"
 
 #define UPDATE_PLAYERS_TIMER_ID 0
 #define UPDATE_PLAYERS_TIMER_TIME 30000
diff --git a/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.cpp
index 80db57f8..5d8a8f21 100644
--- a/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_LeaderboardsMenu.h"
-#include "..\Leaderboards\LeaderboardManager.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
+#include "../Leaderboards/LeaderboardManager.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.tile.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.h"
 
 #define PLAYER_ONLINE_TIMER_ID 0
 #define PLAYER_ONLINE_TIMER_TIME 100
diff --git a/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.h b/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.h
index 20bf0002..728992ce 100644
--- a/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.h
+++ b/Minecraft.Client/Common/UI/UIScene_LeaderboardsMenu.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "UIScene.h"
-#include "..\Leaderboards\LeaderboardManager.h"
+#include "../Leaderboards/LeaderboardManager.h"
 
 class UIScene_LeaderboardsMenu : public UIScene, public LeaderboardReadListener
 {
diff --git a/Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp b/Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp
index f08fc727..08652e57 100644
--- a/Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_LoadMenu.cpp
@@ -1,16 +1,16 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_LoadMenu.h"
-#include "..\..\Minecraft.h"
-#include "..\..\TexturePackRepository.h"
-#include "..\..\Options.h"
-#include "..\..\MinecraftServer.h"
-#include "..\..\..\Minecraft.World\LevelSettings.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "../../Minecraft.h"
+#include "../../TexturePackRepository.h"
+#include "../../Options.h"
+#include "../../MinecraftServer.h"
+#include "../../../Minecraft.World/LevelSettings.h"
+#include "../../../Minecraft.World/StringHelpers.h"
 #if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
-#include "Common\Network\Sony\SonyHttp.h"
+#include "Common/Network/Sony/SonyHttp.h"
 #endif
-#include "..\..\DLCTexturePack.h"
+#include "../../DLCTexturePack.h"
 #if defined(__ORBIS__) || defined(__PSVITA__)
 #include <ces.h>
 #endif
diff --git a/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp b/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp
index 1d90da77..6007f65e 100644
--- a/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_LoadOrJoinMenu.cpp
@@ -2,21 +2,21 @@
 #include "UI.h"
 #include "UIScene_LoadOrJoinMenu.h"
 
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.chunk.storage.h"
-#include "..\..\..\Minecraft.World\ConsoleSaveFile.h"
-#include "..\..\..\Minecraft.World\ConsoleSaveFileOriginal.h"
-#include "..\..\..\Minecraft.World\ConsoleSaveFileSplit.h"
-#include "..\..\ProgressRenderer.h"
-#include "..\..\MinecraftServer.h"
-#include "..\..\TexturePackRepository.h"
-#include "..\..\TexturePack.h"
-#include "..\Network\SessionInfo.h"
+#include "../../../Minecraft.World/StringHelpers.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.chunk.storage.h"
+#include "../../../Minecraft.World/ConsoleSaveFile.h"
+#include "../../../Minecraft.World/ConsoleSaveFileOriginal.h"
+#include "../../../Minecraft.World/ConsoleSaveFileSplit.h"
+#include "../../ProgressRenderer.h"
+#include "../../MinecraftServer.h"
+#include "../../TexturePackRepository.h"
+#include "../../TexturePack.h"
+#include "../Network/SessionInfo.h"
 #if defined(__PS3__) || defined(__ORBIS__) || defined(__PSVITA__)
-#include "Common\Network\Sony\SonyHttp.h"
-#include "Common\Network\Sony\SonyRemoteStorage.h"
+#include "Common/Network/Sony/SonyHttp.h"
+#include "Common/Network/Sony/SonyRemoteStorage.h"
 #endif
 #if defined(__ORBIS__) || defined(__PSVITA__)
 #include <ces.h>
diff --git a/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp b/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp
index 7724aaaf..1cc80862 100644
--- a/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_MainMenu.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
-#include "..\..\..\Minecraft.World\Mth.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\..\Minecraft.World\Random.h"
-#include "..\..\User.h"
-#include "..\..\MinecraftServer.h"
+#include "../../../Minecraft.World/Mth.h"
+#include "../../../Minecraft.World/StringHelpers.h"
+#include "../../../Minecraft.World/Random.h"
+#include "../../User.h"
+#include "../../MinecraftServer.h"
 #include "UI.h"
 #include "UIScene_MainMenu.h"
 #ifdef __ORBIS__
diff --git a/Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp b/Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp
index d9569cc9..3fb53baf 100644
--- a/Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_PauseMenu.cpp
@@ -1,22 +1,22 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_PauseMenu.h"
-#include "..\..\MinecraftServer.h"
-#include "..\..\MultiplayerLocalPlayer.h"
-#include "..\..\TexturePackRepository.h"
-#include "..\..\TexturePack.h"
-#include "..\..\DLCTexturePack.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "../../MinecraftServer.h"
+#include "../../MultiplayerLocalPlayer.h"
+#include "../../TexturePackRepository.h"
+#include "../../TexturePack.h"
+#include "../../DLCTexturePack.h"
+#include "../../../Minecraft.World/StringHelpers.h"
 #ifdef __ORBIS__
 #include <error_dialog.h>
 #endif
 
 #ifdef _DURANGO
-#include "..\..\Durango\Leaderboards\DurangoStatsDebugger.h"
+#include "../../Durango/Leaderboards/DurangoStatsDebugger.h"
 #endif
 
 #ifdef __PSVITA__
-#include "PSVita\Network\SonyCommerce_Vita.h"
+#include "PSVita/Network/SonyCommerce_Vita.h"
 #endif
 
 #if defined __PS3__ || defined __ORBIS__
diff --git a/Minecraft.Client/Common/UI/UIScene_QuadrantSignin.cpp b/Minecraft.Client/Common/UI/UIScene_QuadrantSignin.cpp
index 4f1b9742..f49e3ef7 100644
--- a/Minecraft.Client/Common/UI/UIScene_QuadrantSignin.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_QuadrantSignin.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_QuadrantSignin.h"
-#include "..\..\Minecraft.h"
+#include "../../Minecraft.h"
 #if defined(__ORBIS__)
-#include "Common\Network\Sony\SonyHttp.h"
+#include "Common/Network/Sony/SonyHttp.h"
 #endif
 
 UIScene_QuadrantSignin::UIScene_QuadrantSignin(int iPad, void *_initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
diff --git a/Minecraft.Client/Common/UI/UIScene_SettingsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_SettingsMenu.cpp
index 4ef7eb5d..6ea0a1b2 100644
--- a/Minecraft.Client/Common/UI/UIScene_SettingsMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_SettingsMenu.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_SettingsMenu.h"
-#include "..\..\Minecraft.h"
+#include "../../Minecraft.h"
 
 UIScene_SettingsMenu::UIScene_SettingsMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
diff --git a/Minecraft.Client/Common/UI/UIScene_SignEntryMenu.cpp b/Minecraft.Client/Common/UI/UIScene_SignEntryMenu.cpp
index c29bac2d..8193b0aa 100644
--- a/Minecraft.Client/Common/UI/UIScene_SignEntryMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_SignEntryMenu.cpp
@@ -1,12 +1,12 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_SignEntryMenu.h"
-#include "..\..\Minecraft.h"
-#include "..\..\MultiPlayerLocalPlayer.h"
-#include "..\..\MultiPlayerLevel.h"
-#include "..\..\ClientConnection.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
+#include "../../Minecraft.h"
+#include "../../MultiPlayerLocalPlayer.h"
+#include "../../MultiPlayerLevel.h"
+#include "../../ClientConnection.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h"
 
 UIScene_SignEntryMenu::UIScene_SignEntryMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
 {
diff --git a/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp b/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp
index 6910dd65..f9c15da0 100644
--- a/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_SkinSelectMenu.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "../../../Minecraft.World/StringHelpers.h"
 #ifdef __ORBIS__
 #include <error_dialog.h>
 #elif defined __PSVITA__
diff --git a/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.h b/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.h
index c9ed6691..8d01354c 100644
--- a/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.h
+++ b/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "..\..\..\Minecraft.World\Definitions.h"
+#include "../../../Minecraft.World/Definitions.h"
 #include "UIScene.h"
 #include "UIControl_PlayerSkinPreview.h"
 
diff --git a/Minecraft.Client/Common/UI/UIScene_TeleportMenu.cpp b/Minecraft.Client/Common/UI/UIScene_TeleportMenu.cpp
index f6916d13..c6a134f5 100644
--- a/Minecraft.Client/Common/UI/UIScene_TeleportMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_TeleportMenu.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "UI.h"
 #include "UIScene_TeleportMenu.h"
-#include "..\..\MultiPlayerLocalPlayer.h"
-#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h"
-#include "..\..\MultiPlayerLocalPlayer.h"
-#include "..\..\ClientConnection.h"
+#include "../../MultiPlayerLocalPlayer.h"
+#include "../../../Minecraft.World/net.minecraft.network.packet.h"
+#include "../../MultiPlayerLocalPlayer.h"
+#include "../../ClientConnection.h"
 #include "TeleportCommand.h"
 
 UIScene_TeleportMenu::UIScene_TeleportMenu(int iPad, void *initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
diff --git a/Minecraft.Client/Common/UI/UIScene_TradingMenu.cpp b/Minecraft.Client/Common/UI/UIScene_TradingMenu.cpp
index dc2bac48..818f1cb0 100644
--- a/Minecraft.Client/Common/UI/UIScene_TradingMenu.cpp
+++ b/Minecraft.Client/Common/UI/UIScene_TradingMenu.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "UI.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.trading.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.trading.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h"
 #include "MultiPlayerLocalPlayer.h"
-#include "..\..\Minecraft.h"
+#include "../../Minecraft.h"
 #include "UIScene_TradingMenu.h"
 
 UIScene_TradingMenu::UIScene_TradingMenu(int iPad, void *_initData, UILayer *parentLayer) : UIScene(iPad, parentLayer)
diff --git a/Minecraft.Client/Common/UI/UITTFFont.cpp b/Minecraft.Client/Common/UI/UITTFFont.cpp
index eb343382..42ae041c 100644
--- a/Minecraft.Client/Common/UI/UITTFFont.cpp
+++ b/Minecraft.Client/Common/UI/UITTFFont.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "UI.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\..\Minecraft.World\File.h"
+#include "../../../Minecraft.World/StringHelpers.h"
+#include "../../../Minecraft.World/File.h"
 #include "UITTFFont.h"
 
 UITTFFont::UITTFFont(const string &path, S32 fallbackCharacter)
diff --git a/Minecraft.Client/Common/XUI/SlotProgressControl.cpp b/Minecraft.Client/Common/XUI/SlotProgressControl.cpp
index 91f362a3..21866898 100644
--- a/Minecraft.Client/Common/XUI/SlotProgressControl.cpp
+++ b/Minecraft.Client/Common/XUI/SlotProgressControl.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 
-#include "..\..\..\Minecraft.World\Slot.h"
-#include "..\..\..\Minecraft.World\ItemInstance.h"
+#include "../../../Minecraft.World/Slot.h"
+#include "../../../Minecraft.World/ItemInstance.h"
 
 #include "SlotItemControlBase.h"
 #include "SlotProgressControl.h"
diff --git a/Minecraft.Client/Common/XUI/XUI_Chat.cpp b/Minecraft.Client/Common/XUI/XUI_Chat.cpp
index 3e3faa77..bc208415 100644
--- a/Minecraft.Client/Common/XUI/XUI_Chat.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Chat.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "XUI_Chat.h"
-#include "..\..\Minecraft.h"
-#include "..\..\Gui.h"
+#include "../../Minecraft.h"
+#include "../../Gui.h"
 
 HRESULT CScene_Chat::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 {
diff --git a/Minecraft.Client/Common/XUI/XUI_ConnectingProgress.cpp b/Minecraft.Client/Common/XUI/XUI_ConnectingProgress.cpp
index 9a82a7b3..32adf323 100644
--- a/Minecraft.Client/Common/XUI/XUI_ConnectingProgress.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_ConnectingProgress.cpp
@@ -4,8 +4,8 @@
 #include "stdafx.h"
 
 #include <assert.h>
-#include "..\..\Minecraft.h"
-#include "..\..\..\Minecraft.World\DisconnectPacket.h"
+#include "../../Minecraft.h"
+#include "../../../Minecraft.World/DisconnectPacket.h"
 
 //----------------------------------------------------------------------------------
 // Performs initialization tasks - retrieves controls.
diff --git a/Minecraft.Client/Common/XUI/XUI_Control_ComboBox.cpp b/Minecraft.Client/Common/XUI/XUI_Control_ComboBox.cpp
index 0096da44..229b9f8e 100644
--- a/Minecraft.Client/Common/XUI/XUI_Control_ComboBox.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Control_ComboBox.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "XUI_Control_ComboBox.h"
-#include "..\Xbox_App.h"
+#include "../Xbox_App.h"
 
 HRESULT CXuiControl4JComboBox::OnInit(XUIMessageInit *pInitData, BOOL& bHandled)
 {
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_BrewProgress.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_BrewProgress.cpp
index 074b7300..04f53554 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_BrewProgress.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_BrewProgress.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
-#include "..\..\..\Minecraft.World\SharedConstants.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.alchemy.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h"
+#include "../../../Minecraft.World/SharedConstants.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.alchemy.h"
 #include "XUI_Ctrl_BrewProgress.h"
 
 int CXuiCtrlBrewProgress::GetValue()
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_BubblesProgress.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_BubblesProgress.cpp
index cc5d996f..2cb6635a 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_BubblesProgress.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_BubblesProgress.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.tile.entity.h"
 #include "XUI_Ctrl_BubblesProgress.h"
 
 int CXuiCtrlBubblesProgress::GetValue()
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_BurnProgress.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_BurnProgress.cpp
index 8e514094..b61ac80a 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_BurnProgress.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_BurnProgress.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 
-#include "..\..\..\Minecraft.World\FurnaceMenu.h"
-#include "..\..\..\Minecraft.World\FurnaceTileEntity.h"
+#include "../../../Minecraft.World/FurnaceMenu.h"
+#include "../../../Minecraft.World/FurnaceTileEntity.h"
 #include "XUI_Scene_Furnace.h"
 #include "XUI_Ctrl_BurnProgress.h"
 
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_CraftIngredientSlot.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_CraftIngredientSlot.cpp
index 82b6c3ed..76c4f355 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_CraftIngredientSlot.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_CraftIngredientSlot.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 
 #include "XUI_Ctrl_CraftIngredientSlot.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.h"
 
 //-----------------------------------------------------------------------------
 //  CXuiCtrlMinecraftSlot class
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantButton.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantButton.cpp
index dfb9b5ca..0a1095e2 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantButton.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantButton.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\Font.h"
-#include "..\..\Lighting.h"
-#include "..\..\MultiPlayerLocalPlayer.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../../../Minecraft.World/StringHelpers.h"
+#include "../../Font.h"
+#include "../../Lighting.h"
+#include "../../MultiPlayerLocalPlayer.h"
 #include "XUI_Scene_Enchant.h"
 #include "XUI_Ctrl_EnchantButton.h"
 
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentBook.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentBook.cpp
index 8a56a0ea..79a1d6d7 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentBook.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentBook.cpp
@@ -1,21 +1,21 @@
 #include "stdafx.h"
 
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.tile.entity.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
 
-#include "..\..\Minecraft.h"
-#include "..\..\ScreenSizeCalculator.h"
-#include "..\..\TileEntityRenderDispatcher.h"
-#include "..\..\EnchantTableRenderer.h"
-#include "..\..\Lighting.h"
-#include "..\..\LocalPlayer.h"
+#include "../../Minecraft.h"
+#include "../../ScreenSizeCalculator.h"
+#include "../../TileEntityRenderDispatcher.h"
+#include "../../EnchantTableRenderer.h"
+#include "../../Lighting.h"
+#include "../../LocalPlayer.h"
 
 #include "XUI_Scene_Enchant.h"
 
 #include "XUI_Ctrl_EnchantmentBook.h"
-#include "..\..\BookModel.h"
-#include "..\..\Options.h"
+#include "../../BookModel.h"
+#include "../../Options.h"
 
 //-----------------------------------------------------------------------------
 //  CXuiCtrlEnchantmentBook class
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentBook.h b/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentBook.h
index 93da0768..3ec502b0 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentBook.h
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentBook.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "..\..\..\Minecraft.World\Random.h"
+#include "../../../Minecraft.World/Random.h"
 
 using namespace std;
 
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentButtonText.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentButtonText.cpp
index 702ef15d..025b9d4b 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentButtonText.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentButtonText.cpp
@@ -1,15 +1,15 @@
 #include "stdafx.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\Font.h"
-#include "..\..\Lighting.h"
-#include "..\..\MultiPlayerLocalPlayer.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../../../Minecraft.World/StringHelpers.h"
+#include "../../Font.h"
+#include "../../Lighting.h"
+#include "../../MultiPlayerLocalPlayer.h"
 #include "XUI_Scene_Enchant.h"
 #include "XUI_Ctrl_EnchantButton.h"
 #include "XUI_Ctrl_EnchantmentButtonText.h"
-#include "..\..\Minecraft.h"
-#include "..\..\TexturePackRepository.h"
-#include "..\..\TexturePack.h"
+#include "../../Minecraft.h"
+#include "../../TexturePackRepository.h"
+#include "../../TexturePack.h"
 
 #include <iostream>
 #include <string>
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_FireProgress.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_FireProgress.cpp
index b125af39..7c158431 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_FireProgress.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_FireProgress.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 
-#include "..\..\..\Minecraft.World\FurnaceMenu.h"
-#include "..\..\..\Minecraft.World\FurnaceTileEntity.h"
+#include "../../../Minecraft.World/FurnaceMenu.h"
+#include "../../../Minecraft.World/FurnaceTileEntity.h"
 #include "XUI_Scene_Furnace.h"
 #include "XUI_Ctrl_FireProgress.h"
 
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_LoadingProgress.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_LoadingProgress.cpp
index 3bb33440..0808e5c9 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_LoadingProgress.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_LoadingProgress.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 
 #include "XUI_Ctrl_LoadingProgress.h"
-#include "..\..\Minecraft.h"
-#include "..\..\ProgressRenderer.h"
+#include "../../Minecraft.h"
+#include "../../ProgressRenderer.h"
 
 int CXuiCtrlLoadingProgress::GetValue()
 {
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp
index 02ee7c93..a82d43f8 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftPlayer.cpp
@@ -1,13 +1,13 @@
 #include "stdafx.h"
-#include "..\..\Minecraft.h"
-#include "..\..\ScreenSizeCalculator.h"
-#include "..\..\EntityRenderDispatcher.h"
-#include "..\..\Lighting.h"
-#include "..\..\MultiplayerLocalPlayer.h"
+#include "../../Minecraft.h"
+#include "../../ScreenSizeCalculator.h"
+#include "../../EntityRenderDispatcher.h"
+#include "../../Lighting.h"
+#include "../../MultiplayerLocalPlayer.h"
 #include "XUI_Ctrl_MinecraftPlayer.h"
 #include "XUI_Scene_AbstractContainer.h"
 #include "XUI_Scene_Inventory.h"
-#include "..\..\Options.h"
+#include "../../Options.h"
 
 //-----------------------------------------------------------------------------
 //  CXuiCtrlMinecraftPlayer class
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.cpp
index 80750deb..8a7c480a 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.cpp
@@ -1,18 +1,18 @@
 #include "stdafx.h"
-#include "..\..\Minecraft.h"
-#include "..\..\ScreenSizeCalculator.h"
-#include "..\..\EntityRenderDispatcher.h"
-#include "..\..\PlayerRenderer.h"
-#include "..\..\HumanoidModel.h"
-#include "..\..\Lighting.h"
-#include "..\..\..\Minecraft.World\Class.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.h"
+#include "../../Minecraft.h"
+#include "../../ScreenSizeCalculator.h"
+#include "../../EntityRenderDispatcher.h"
+#include "../../PlayerRenderer.h"
+#include "../../HumanoidModel.h"
+#include "../../Lighting.h"
+#include "../../../Minecraft.World/Class.h"
+#include "../../../Minecraft.World/net.minecraft.world.entity.player.h"
 #include "XUI_Ctrl_MinecraftSkinPreview.h"
 #include "XUI_Scene_AbstractContainer.h"
 #include "XUI_Scene_Inventory.h"
-#include "..\..\Options.h"
-#include "..\..\stubs.h"
-#include "..\..\ModelPart.h"
+#include "../../Options.h"
+#include "../../stubs.h"
+#include "../../ModelPart.h"
 
 //#define SKIN_PREVIEW_BOB_ANIM
 #define SKIN_PREVIEW_WALKING_ANIM
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.h b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.h
index 22f4991b..254bc043 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.h
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.h
@@ -2,9 +2,9 @@
 
 #include <string>
 #include <XuiApp.h>
-#include "..\..\Textures.h"
-//#include "..\..\Xbox\DLC\DLCSkinFile.h"
-#include "..\..\Model.h"
+#include "../../Textures.h"
+//#include "../../Xbox/DLC/DLCSkinFile.h"
+#include "../../Model.h"
 
 using namespace std;
 
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSlot.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSlot.cpp
index 84273eb5..225db17e 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSlot.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_MinecraftSlot.cpp
@@ -1,14 +1,14 @@
 #include "stdafx.h"
 
-#include "..\..\ItemRenderer.h"
-#include "..\..\GameRenderer.h"
-#include "..\..\TileRenderer.h"
-#include "..\..\Lighting.h"
-#include "..\..\ScreenSizeCalculator.h"
-#include "..\..\LocalPlayer.h"
-#include "..\..\..\Minecraft.World\ItemInstance.h"
-#include "..\..\..\Minecraft.World\Item.h"
-#include "..\..\..\Minecraft.World\Tile.h"
+#include "../../ItemRenderer.h"
+#include "../../GameRenderer.h"
+#include "../../TileRenderer.h"
+#include "../../Lighting.h"
+#include "../../ScreenSizeCalculator.h"
+#include "../../LocalPlayer.h"
+#include "../../../Minecraft.World/ItemInstance.h"
+#include "../../../Minecraft.World/Item.h"
+#include "../../../Minecraft.World/Tile.h"
 #include "XUI_Ctrl_MinecraftSlot.h"
 
 //-----------------------------------------------------------------------------
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_MobEffect.h b/Minecraft.Client/Common/XUI/XUI_Ctrl_MobEffect.h
index c43e7fe9..4e223e3f 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_MobEffect.h
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_MobEffect.h
@@ -1,7 +1,7 @@
 #pragma once
 using namespace std;
 
-#include "..\..\..\Minecraft.World\MobEffect.h"
+#include "../../../Minecraft.World/MobEffect.h"
 
 class CXuiCtrlMobEffect : public CXuiControlImpl
 {
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_SlotItemCtrlBase.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_SlotItemCtrlBase.cpp
index 87abbcd3..db1e0c6b 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_SlotItemCtrlBase.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_SlotItemCtrlBase.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\..\Minecraft.World\Slot.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\..\MultiPlayerLocalPlayer.h"
-#include "..\..\Minecraft.h"
+#include "../../../Minecraft.World/StringHelpers.h"
+#include "../../../Minecraft.World/Slot.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.h"
+#include "../../MultiPlayerLocalPlayer.h"
+#include "../../Minecraft.h"
 
 #include "XUI_Ctrl_SlotItemCtrlBase.h"
 
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_SlotList.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_SlotList.cpp
index 7e51c885..4478bf18 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_SlotList.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_SlotList.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 
-#include "..\..\..\Minecraft.World\AbstractContainerMenu.h"
+#include "../../../Minecraft.World/AbstractContainerMenu.h"
 
 #include "XUI_Ctrl_SlotItemListItem.h"
 #include "XUI_Ctrl_SlotList.h"
diff --git a/Minecraft.Client/Common/XUI/XUI_Ctrl_SplashPulser.cpp b/Minecraft.Client/Common/XUI/XUI_Ctrl_SplashPulser.cpp
index 2e971710..12858b79 100644
--- a/Minecraft.Client/Common/XUI/XUI_Ctrl_SplashPulser.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Ctrl_SplashPulser.cpp
@@ -1,11 +1,11 @@
 #include "stdafx.h"
-#include "..\..\Minecraft.h"
-#include "..\..\ScreenSizeCalculator.h"
-#include "..\..\Lighting.h"
+#include "../../Minecraft.h"
+#include "../../ScreenSizeCalculator.h"
+#include "../../Lighting.h"
 #include "XUI_Ctrl_SplashPulser.h"
-#include "..\..\Font.h"
-#include "..\..\..\Minecraft.World\Mth.h"
-#include "..\..\..\Minecraft.World\System.h"
+#include "../../Font.h"
+#include "../../../Minecraft.World/Mth.h"
+#include "../../../Minecraft.World/System.h"
 
 //-----------------------------------------------------------------------------
 //  CXuiCtrlSplashPulser class
diff --git a/Minecraft.Client/Common/XUI/XUI_DLCOffers.cpp b/Minecraft.Client/Common/XUI/XUI_DLCOffers.cpp
index bd05ca14..b2bb53da 100644
--- a/Minecraft.Client/Common/XUI/XUI_DLCOffers.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_DLCOffers.cpp
@@ -2,14 +2,14 @@
 //
 
 #include "stdafx.h"
-#include "..\..\..\Minecraft.World\ByteArrayInputStream.h"
-#include "..\..\..\Minecraft.World\BufferedReader.h"
-#include "..\..\..\Minecraft.World\InputStreamReader.h"
-#include "..\..\..\Minecraft.World\ArrayWithLength.h"
+#include "../../../Minecraft.World/ByteArrayInputStream.h"
+#include "../../../Minecraft.World/BufferedReader.h"
+#include "../../../Minecraft.World/InputStreamReader.h"
+#include "../../../Minecraft.World/ArrayWithLength.h"
 #include <assert.h>
 #include "XUI_Ctrl_4JIcon.h"
 #include "XUI_DLCOffers.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "../../../Minecraft.World/StringHelpers.h"
 #ifdef _XBOX
 #include <xavatar.h>
 #endif
diff --git a/Minecraft.Client/Common/XUI/XUI_DLCOffers.h b/Minecraft.Client/Common/XUI/XUI_DLCOffers.h
index 412446d0..0717846e 100644
--- a/Minecraft.Client/Common/XUI/XUI_DLCOffers.h
+++ b/Minecraft.Client/Common/XUI/XUI_DLCOffers.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../media\xuiscene_DLCOffers.h"
-#include "../media\xuiscene_DLCMain.h"
+#include "../media/xuiscene_DLCOffers.h"
+#include "../media/xuiscene_DLCMain.h"
 
 
 #include "XUI_CustomMessages.h"
diff --git a/Minecraft.Client/Common/XUI/XUI_Death.cpp b/Minecraft.Client/Common/XUI/XUI_Death.cpp
index 83275c14..a3696742 100644
--- a/Minecraft.Client/Common/XUI/XUI_Death.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Death.cpp
@@ -2,25 +2,25 @@
 //
 
 #include "stdafx.h"
-#include "..\XUI\XUI_Death.h"
+#include "../XUI/XUI_Death.h"
 #include <assert.h>
-#include "..\..\..\Minecraft.World\AABB.h"
-#include "..\..\..\Minecraft.World\Vec3.h"
-#include "..\..\..\Minecraft.World\net.minecraft.stats.h"
-#include "..\..\..\Minecraft.Client\StatsCounter.h"
-#include "..\..\..\Minecraft.World\Entity.h"
-#include "..\..\..\Minecraft.Client\MultiplayerLocalPlayer.h"
-#include "..\..\..\Minecraft.World\Level.h"
-#include "..\..\..\Minecraft.World\ChunkSource.h"
-#include "..\..\..\Minecraft.Client\ProgressRenderer.h"
-#include "..\..\..\Minecraft.Client\GameRenderer.h"
-#include "..\..\..\Minecraft.Client\LevelRenderer.h"
-#include "..\..\..\Minecraft.World\Pos.h"
-#include "..\..\..\Minecraft.World\Dimension.h"
-#include "..\..\Minecraft.h"
-#include "..\..\Options.h"
-#include "..\..\LocalPlayer.h"
-#include "..\..\..\Minecraft.World\compression.h"
+#include "../../../Minecraft.World/AABB.h"
+#include "../../../Minecraft.World/Vec3.h"
+#include "../../../Minecraft.World/net.minecraft.stats.h"
+#include "../../../Minecraft.Client/StatsCounter.h"
+#include "../../../Minecraft.World/Entity.h"
+#include "../../../Minecraft.Client/MultiplayerLocalPlayer.h"
+#include "../../../Minecraft.World/Level.h"
+#include "../../../Minecraft.World/ChunkSource.h"
+#include "../../../Minecraft.Client/ProgressRenderer.h"
+#include "../../../Minecraft.Client/GameRenderer.h"
+#include "../../../Minecraft.Client/LevelRenderer.h"
+#include "../../../Minecraft.World/Pos.h"
+#include "../../../Minecraft.World/Dimension.h"
+#include "../../Minecraft.h"
+#include "../../Options.h"
+#include "../../LocalPlayer.h"
+#include "../../../Minecraft.World/compression.h"
 //----------------------------------------------------------------------------------
 // Performs initialization tasks - retrieves controls.
 //----------------------------------------------------------------------------------
diff --git a/Minecraft.Client/Common/XUI/XUI_DebugItemEditor.cpp b/Minecraft.Client/Common/XUI/XUI_DebugItemEditor.cpp
index 56b41267..9a4f930a 100644
--- a/Minecraft.Client/Common/XUI/XUI_DebugItemEditor.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_DebugItemEditor.cpp
@@ -1,12 +1,12 @@
 #include "stdafx.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h"
-#include "..\..\Minecraft.h"
-#include "..\..\MultiPlayerLocalPlayer.h"
-#include "..\..\ClientConnection.h"
-#include "..\..\Common\GameRules\ConsoleGameRules.h"
+#include "../../../Minecraft.World/StringHelpers.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.h"
+#include "../../../Minecraft.World/net.minecraft.network.packet.h"
+#include "../../Minecraft.h"
+#include "../../MultiPlayerLocalPlayer.h"
+#include "../../ClientConnection.h"
+#include "../../Common/GameRules/ConsoleGameRules.h"
 #include "XUI_DebugItemEditor.h"
 
 #ifdef _DEBUG_MENUS_ENABLED	
diff --git a/Minecraft.Client/Common/XUI/XUI_DebugItemEditor.h b/Minecraft.Client/Common/XUI/XUI_DebugItemEditor.h
index 2e2f5b5a..c559b7ec 100644
--- a/Minecraft.Client/Common/XUI/XUI_DebugItemEditor.h
+++ b/Minecraft.Client/Common/XUI/XUI_DebugItemEditor.h
@@ -4,7 +4,7 @@ using namespace std;
 
 #include "XUI_Ctrl_CraftIngredientSlot.h"
 #include "XUI_Ctrl_4JEdit.h"
-#include "..\..\..\Minecraft.World\ItemInstance.h"
+#include "../../../Minecraft.World/ItemInstance.h"
 
 class CScene_DebugItemEditor : public CXuiSceneImpl
 {
diff --git a/Minecraft.Client/Common/XUI/XUI_DebugOverlay.cpp b/Minecraft.Client/Common/XUI/XUI_DebugOverlay.cpp
index a23e97b7..2d2bb6e7 100644
--- a/Minecraft.Client/Common/XUI/XUI_DebugOverlay.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_DebugOverlay.cpp
@@ -1,32 +1,32 @@
 #include "stdafx.h"
-#include "..\..\Minecraft.h"
-#include "..\..\MultiplayerLocalPlayer.h"
-#include "..\..\MultiplayerLevel.h"
-#include "..\..\GameMode.h"
-#include "..\..\SurvivalMode.h"
-#include "..\..\CreativeMode.h"
+#include "../../Minecraft.h"
+#include "../../MultiplayerLocalPlayer.h"
+#include "../../MultiplayerLevel.h"
+#include "../../GameMode.h"
+#include "../../SurvivalMode.h"
+#include "../../CreativeMode.h"
 #include "ClientConnection.h"
 #include "MultiPlayerLocalPlayer.h"
-#include "..\..\..\Minecraft.World\ArrayWithLength.h"
-#include "..\..\..\Minecraft.World\com.mojang.nbt.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.monster.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.entity.boss.enderdragon.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.saveddata.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.chunk.storage.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.storage.h"
-#include "..\..\..\Minecraft.World\InputOutputStream.h"
-#include "..\..\..\Minecraft.World\ConsoleSaveFileIO.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.enchantment.h"
+#include "../../../Minecraft.World/ArrayWithLength.h"
+#include "../../../Minecraft.World/com.mojang.nbt.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.monster.h"
+#include "../../../Minecraft.World/net.minecraft.world.entity.boss.enderdragon.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.saveddata.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.chunk.storage.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.storage.h"
+#include "../../../Minecraft.World/InputOutputStream.h"
+#include "../../../Minecraft.World/ConsoleSaveFileIO.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.enchantment.h"
 #include "XUI_DebugOverlay.h"
-#include "..\..\..\Minecraft.Client\GameRenderer.h"
-#include "..\..\MinecraftServer.h"
-#include "..\..\Common\Tutorial\Tutorial.h"
-#include "..\..\..\Minecraft.World\net.minecraft.commands.common.h"
-#include "..\..\..\Minecraft.World\ConsoleSaveFileOriginal.h"
+#include "../../../Minecraft.Client/GameRenderer.h"
+#include "../../MinecraftServer.h"
+#include "../../Common/Tutorial/Tutorial.h"
+#include "../../../Minecraft.World/net.minecraft.commands.common.h"
+#include "../../../Minecraft.World/ConsoleSaveFileOriginal.h"
 
 #ifdef _DEBUG_MENUS_ENABLED	
 HRESULT CScene_DebugOverlay::OnInit( XUIMessageInit *pInitData, BOOL &bHandled )
diff --git a/Minecraft.Client/Common/XUI/XUI_DebugOverlay.h b/Minecraft.Client/Common/XUI/XUI_DebugOverlay.h
index ed5f85c2..a790e0fe 100644
--- a/Minecraft.Client/Common/XUI/XUI_DebugOverlay.h
+++ b/Minecraft.Client/Common/XUI/XUI_DebugOverlay.h
@@ -7,8 +7,8 @@ using namespace std;
 class RegionFile;
 class DataOutputStream;
 class ConsoleSaveFile;
-#include "..\..\..\Minecraft.World\File.h"
-#include "..\..\..\Minecraft.World\Entity.h"
+#include "../../../Minecraft.World/File.h"
+#include "../../../Minecraft.World/Entity.h"
 
 class CScene_DebugOverlay : public CXuiSceneImpl
 {
diff --git a/Minecraft.Client/Common/XUI/XUI_DebugSchematicCreator.cpp b/Minecraft.Client/Common/XUI/XUI_DebugSchematicCreator.cpp
index 66279d1f..27fd43ac 100644
--- a/Minecraft.Client/Common/XUI/XUI_DebugSchematicCreator.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_DebugSchematicCreator.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "../../../Minecraft.World/StringHelpers.h"
 #include "XUI_DebugSchematicCreator.h"
-#include "..\..\..\Minecraft.World\ChunkSource.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
+#include "../../../Minecraft.World/ChunkSource.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.h"
 
 #ifndef _CONTENT_PACKAGE
 HRESULT CScene_DebugSchematicCreator::OnInit( XUIMessageInit *pInitData, BOOL &bHandled )
diff --git a/Minecraft.Client/Common/XUI/XUI_DebugSchematicCreator.h b/Minecraft.Client/Common/XUI/XUI_DebugSchematicCreator.h
index b502d110..a3ee8b88 100644
--- a/Minecraft.Client/Common/XUI/XUI_DebugSchematicCreator.h
+++ b/Minecraft.Client/Common/XUI/XUI_DebugSchematicCreator.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "..\Media\xuiscene_debug_schematic_create.h"
+#include "../Media/xuiscene_debug_schematic_create.h"
 #include "XUI_Ctrl_4JEdit.h"
-#include "..\..\Common\GameRules\ConsoleSchematicFile.h"
+#include "../../Common/GameRules/ConsoleSchematicFile.h"
 
 class CScene_DebugSchematicCreator : public CXuiSceneImpl
 {
diff --git a/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.cpp b/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.cpp
index 2227e895..ca689158 100644
--- a/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.cpp
@@ -1,12 +1,12 @@
 #include "stdafx.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "../../../Minecraft.World/StringHelpers.h"
 #include "XUI_DebugSetCamera.h"
-#include "..\..\..\Minecraft.World\ChunkSource.h"
+#include "../../../Minecraft.World/ChunkSource.h"
 
-// #include "..\..\Xbox\4JLibs\inc\4J_Input.h"
+// #include "../../Xbox/4JLibs/inc/4J_Input.h"
 
-#include "..\..\Minecraft.h"
-#include "..\..\MultiplayerLocalPlayer.h"
+#include "../../Minecraft.h"
+#include "../../MultiplayerLocalPlayer.h"
 
 #ifndef _CONTENT_PACKAGE
 HRESULT CScene_DebugSetCamera::OnInit( XUIMessageInit *pInitData, BOOL &bHandled )
diff --git a/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.h b/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.h
index 1bc662e9..e8efbfb3 100644
--- a/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.h
+++ b/Minecraft.Client/Common/XUI/XUI_DebugSetCamera.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "..\Media\xuiscene_debug_set_camera.h"
+#include "../Media/xuiscene_debug_set_camera.h"
 #include "XUI_Ctrl_4JEdit.h"
-#include "..\..\Common\GameRules\ConsoleSchematicFile.h"
+#include "../../Common/GameRules/ConsoleSchematicFile.h"
 
 class CScene_DebugSetCamera : public CXuiSceneImpl
 {
diff --git a/Minecraft.Client/Common/XUI/XUI_DebugTips.cpp b/Minecraft.Client/Common/XUI/XUI_DebugTips.cpp
index aaa3b06f..4266d656 100644
--- a/Minecraft.Client/Common/XUI/XUI_DebugTips.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_DebugTips.cpp
@@ -2,7 +2,7 @@
 
 #include <assert.h>
 #include "XUI_DebugTips.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "../../../Minecraft.World/StringHelpers.h"
 
 //----------------------------------------------------------------------------------
 // Performs initialization tasks - retrieves controls.
diff --git a/Minecraft.Client/Common/XUI/XUI_FullscreenProgress.cpp b/Minecraft.Client/Common/XUI/XUI_FullscreenProgress.cpp
index f66c0d70..75d6e913 100644
--- a/Minecraft.Client/Common/XUI/XUI_FullscreenProgress.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_FullscreenProgress.cpp
@@ -4,10 +4,10 @@
 #include "stdafx.h"
 
 #include <assert.h>
-#include "..\..\Minecraft.h"
-#include "..\..\ProgressRenderer.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\Common\Tutorial\TutorialMode.h"
+#include "../../Minecraft.h"
+#include "../../ProgressRenderer.h"
+#include "../../../Minecraft.World/StringHelpers.h"
+#include "../../Common/Tutorial/TutorialMode.h"
 
 //----------------------------------------------------------------------------------
 // Performs initialization tasks - retrieves controls.
diff --git a/Minecraft.Client/Common/XUI/XUI_FullscreenProgress.h b/Minecraft.Client/Common/XUI/XUI_FullscreenProgress.h
index 271a5781..70fbe054 100644
--- a/Minecraft.Client/Common/XUI/XUI_FullscreenProgress.h
+++ b/Minecraft.Client/Common/XUI/XUI_FullscreenProgress.h
@@ -1,6 +1,6 @@
 #pragma once 
 #include "../media/xuiscene_fullscreenprogress.h"
-#include "..\..\..\Minecraft.World\C4JThread.h"
+#include "../../../Minecraft.World/C4JThread.h"
 
 #define ERROR_FULLSCREENPROGRESS_
 
diff --git a/Minecraft.Client/Common/XUI/XUI_HUD.cpp b/Minecraft.Client/Common/XUI/XUI_HUD.cpp
index 286f06a7..0b639566 100644
--- a/Minecraft.Client/Common/XUI/XUI_HUD.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_HUD.cpp
@@ -1,12 +1,12 @@
 #include "stdafx.h"
 #include "XUI_HUD.h"
-#include "..\..\Minecraft.h"
-#include "..\..\Gui.h"
-#include "..\..\MultiplayerLocalPlayer.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\..\Minecraft.World\Random.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.effect.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.material.h"
+#include "../../Minecraft.h"
+#include "../../Gui.h"
+#include "../../MultiplayerLocalPlayer.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../../../Minecraft.World/Random.h"
+#include "../../../Minecraft.World/net.minecraft.world.effect.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.material.h"
 
 HRESULT CXuiSceneHud::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 {
diff --git a/Minecraft.Client/Common/XUI/XUI_HelpAndOptions.cpp b/Minecraft.Client/Common/XUI/XUI_HelpAndOptions.cpp
index 9ba49e9d..734d847b 100644
--- a/Minecraft.Client/Common/XUI/XUI_HelpAndOptions.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_HelpAndOptions.cpp
@@ -4,7 +4,7 @@
 #include "stdafx.h"
 
 #include <assert.h>
-#include "..\XUI\XUI_HelpAndOptions.h"
+#include "../XUI/XUI_HelpAndOptions.h"
 
 
 //----------------------------------------------------------------------------------
diff --git a/Minecraft.Client/Common/XUI/XUI_HelpControls.cpp b/Minecraft.Client/Common/XUI/XUI_HelpControls.cpp
index e7a8b0ca..c089aacc 100644
--- a/Minecraft.Client/Common/XUI/XUI_HelpControls.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_HelpControls.cpp
@@ -1,12 +1,12 @@
 #include "stdafx.h"
 
 #include <assert.h>
-#include "..\XUI\XUI_HelpControls.h"
+#include "../XUI/XUI_HelpControls.h"
 #include "XUI_Ctrl_4JList.h"
 
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\..\..\Minecraft.World\LevelData.h"
-#include "..\..\MultiplayerLocalPlayer.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.h"
+#include "../../../Minecraft.World/LevelData.h"
+#include "../../MultiplayerLocalPlayer.h"
 
 #define ALIGN_START		0
 #define ALIGN_END		1
diff --git a/Minecraft.Client/Common/XUI/XUI_HelpCredits.h b/Minecraft.Client/Common/XUI/XUI_HelpCredits.h
index e973286e..3ac73157 100644
--- a/Minecraft.Client/Common/XUI/XUI_HelpCredits.h
+++ b/Minecraft.Client/Common/XUI/XUI_HelpCredits.h
@@ -5,7 +5,7 @@
 #define MAX_CREDIT_STRINGS		360
 // 213
 
-#include "..\UI\UIStructs.h"
+#include "../UI/UIStructs.h"
 
 class CScene_Credits : public CXuiSceneImpl
 {
diff --git a/Minecraft.Client/Common/XUI/XUI_HelpHowToPlay.cpp b/Minecraft.Client/Common/XUI/XUI_HelpHowToPlay.cpp
index 5c750d03..0be09b20 100644
--- a/Minecraft.Client/Common/XUI/XUI_HelpHowToPlay.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_HelpHowToPlay.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 
 #include <assert.h>
-#include "..\XUI\XUI_HelpHowToPlay.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "../XUI/XUI_HelpHowToPlay.h"
+#include "../../../Minecraft.World/StringHelpers.h"
 
 static SHowToPlayPageDef gs_aPageDefs[ eHowToPlay_NumPages ] =
 {
diff --git a/Minecraft.Client/Common/XUI/XUI_HowToPlayMenu.cpp b/Minecraft.Client/Common/XUI/XUI_HowToPlayMenu.cpp
index 14046f20..7d497c64 100644
--- a/Minecraft.Client/Common/XUI/XUI_HowToPlayMenu.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_HowToPlayMenu.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 
 #include <assert.h>
-#include "..\XUI\XUI_HowToPlayMenu.h"
-#include "..\XUI\XUI_HelpHowToPlay.h"
+#include "../XUI/XUI_HowToPlayMenu.h"
+#include "../XUI/XUI_HelpHowToPlay.h"
 
 // strings for buttons in the list				  
 unsigned int CScene_HowToPlayMenu::m_uiHTPButtonNameA[]=
diff --git a/Minecraft.Client/Common/XUI/XUI_InGameHostOptions.cpp b/Minecraft.Client/Common/XUI/XUI_InGameHostOptions.cpp
index f0561745..575606c9 100644
--- a/Minecraft.Client/Common/XUI/XUI_InGameHostOptions.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_InGameHostOptions.cpp
@@ -1,11 +1,11 @@
 #include "stdafx.h"
 #include "XUI_MultiGameCreate.h"
 #include "XUI_InGameHostOptions.h"
-#include "..\..\Minecraft.h"
-#include "..\..\MultiPlayerLocalPlayer.h"
-#include "..\..\ClientConnection.h"
-#include "..\..\..\Minecraft.World\net.minecraft.network.h"
-#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h"
+#include "../../Minecraft.h"
+#include "../../MultiPlayerLocalPlayer.h"
+#include "../../ClientConnection.h"
+#include "../../../Minecraft.World/net.minecraft.network.h"
+#include "../../../Minecraft.World/net.minecraft.network.packet.h"
 
 //----------------------------------------------------------------------------------
 // Performs initialization tasks - retrieves controls.
diff --git a/Minecraft.Client/Common/XUI/XUI_InGameHostOptions.h b/Minecraft.Client/Common/XUI/XUI_InGameHostOptions.h
index cdc99f7c..c3a617c5 100644
--- a/Minecraft.Client/Common/XUI/XUI_InGameHostOptions.h
+++ b/Minecraft.Client/Common/XUI/XUI_InGameHostOptions.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "..\Media\xuiscene_ingame_host_options.h"
+#include "../Media/xuiscene_ingame_host_options.h"
 
 class CScene_InGameHostOptions : public CXuiSceneImpl
 {
diff --git a/Minecraft.Client/Common/XUI/XUI_InGameInfo.cpp b/Minecraft.Client/Common/XUI/XUI_InGameInfo.cpp
index 4839013c..ff19feaa 100644
--- a/Minecraft.Client/Common/XUI/XUI_InGameInfo.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_InGameInfo.cpp
@@ -2,18 +2,18 @@
 
 #include <assert.h>
 #include "XUI_InGameInfo.h"
-#include "..\..\ServerPlayer.h"
-#include "..\..\PlayerConnection.h"
-#include "..\..\PlayerList.h"
-#include "..\..\MinecraftServer.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\PlayerRenderer.h"
+#include "../../ServerPlayer.h"
+#include "../../PlayerConnection.h"
+#include "../../PlayerList.h"
+#include "../../MinecraftServer.h"
+#include "../../../Minecraft.World/StringHelpers.h"
+#include "../../PlayerRenderer.h"
 #include "XUI_InGamePlayerOptions.h"
-#include "..\..\Minecraft.h"
-#include "..\..\MultiPlayerLocalPlayer.h"
-#include "..\..\ClientConnection.h"
-#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h"
-#include "..\..\Xbox\Network\NetworkPlayerXbox.h"
+#include "../../Minecraft.h"
+#include "../../MultiPlayerLocalPlayer.h"
+#include "../../ClientConnection.h"
+#include "../../../Minecraft.World/net.minecraft.network.packet.h"
+#include "../../Xbox/Network/NetworkPlayerXbox.h"
 
 #define IGNORE_KEYPRESS_TIMERID 0
 #define TOOLTIP_TIMERID 1
diff --git a/Minecraft.Client/Common/XUI/XUI_InGamePlayerOptions.cpp b/Minecraft.Client/Common/XUI/XUI_InGamePlayerOptions.cpp
index 156cd092..c00391a1 100644
--- a/Minecraft.Client/Common/XUI/XUI_InGamePlayerOptions.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_InGamePlayerOptions.cpp
@@ -1,12 +1,12 @@
 #include "stdafx.h"
 #include "XUI_MultiGameCreate.h"
 #include "XUI_InGamePlayerOptions.h"
-#include "..\..\Minecraft.h"
-#include "..\..\MultiPlayerLocalPlayer.h"
-#include "..\..\ClientConnection.h"
-#include "..\..\..\Minecraft.World\net.minecraft.network.h"
-#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.h"
+#include "../../Minecraft.h"
+#include "../../MultiPlayerLocalPlayer.h"
+#include "../../ClientConnection.h"
+#include "../../../Minecraft.World/net.minecraft.network.h"
+#include "../../../Minecraft.World/net.minecraft.network.packet.h"
+#include "../../../Minecraft.World/net.minecraft.world.entity.player.h"
 #include "XUI_InGameInfo.h"
 
 
diff --git a/Minecraft.Client/Common/XUI/XUI_InGamePlayerOptions.h b/Minecraft.Client/Common/XUI/XUI_InGamePlayerOptions.h
index 87b9de13..487be5af 100644
--- a/Minecraft.Client/Common/XUI/XUI_InGamePlayerOptions.h
+++ b/Minecraft.Client/Common/XUI/XUI_InGamePlayerOptions.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "..\Media\xuiscene_ingame_player_options.h"
+#include "../Media/xuiscene_ingame_player_options.h"
 
 class CScene_InGamePlayerOptions : public CXuiSceneImpl
 {
diff --git a/Minecraft.Client/Common/XUI/XUI_Intro.cpp b/Minecraft.Client/Common/XUI/XUI_Intro.cpp
index 997abe5d..fff49510 100644
--- a/Minecraft.Client/Common/XUI/XUI_Intro.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Intro.cpp
@@ -4,7 +4,7 @@
 #include "stdafx.h"
 
 #include <assert.h>
-#include "..\XUI\XUI_Intro.h"
+#include "../XUI/XUI_Intro.h"
 
 #define TIMELINE_NORMAL		0
 #define TIMELINE_ESRBFADE	1
@@ -23,7 +23,7 @@ HRESULT CScene_Intro::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
 
 	// 4J-PB - We can't check to see if the version is a trial or full game until after 5 seconds...
 	// The reason that this is a requirement is that there is a problem that occasionally happens *only* in the production 
-	// environment (not partnernet or cert), where if you don’t wait 5 seconds, you can run into an issue where the timing 
+	// environment (not partnernet or cert), where if you don’t wait 5 seconds, you can run into an issue where the timing 
 	// of the call fails and the game is always identified as being the trial version even if you have upgraded to the full version.
 	// -Joe Dunavant
 
diff --git a/Minecraft.Client/Common/XUI/XUI_Leaderboards.cpp b/Minecraft.Client/Common/XUI/XUI_Leaderboards.cpp
index 428b3e88..cefeb48d 100644
--- a/Minecraft.Client/Common/XUI/XUI_Leaderboards.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Leaderboards.cpp
@@ -2,8 +2,8 @@
 #include <xuiresource.h>
 #include <xuiapp.h>
 #include "XUI_Leaderboards.h"
-#include "..\..\..\Minecraft.World\Tile.h"
-#include "..\..\..\Minecraft.World\Item.h"
+#include "../../../Minecraft.World/Tile.h"
+#include "../../../Minecraft.World/Item.h"
 #include "XUI_Ctrl_CraftIngredientSlot.h"
 #include "XUI_XZP_Icons.h"
 
diff --git a/Minecraft.Client/Common/XUI/XUI_Leaderboards.h b/Minecraft.Client/Common/XUI/XUI_Leaderboards.h
index e06f13e1..2823cbe0 100644
--- a/Minecraft.Client/Common/XUI/XUI_Leaderboards.h
+++ b/Minecraft.Client/Common/XUI/XUI_Leaderboards.h
@@ -2,7 +2,7 @@
 #include "XUI_Helper.h"
 #include "../media/xuiscene_leaderboards.h"
 
-#include "..\Leaderboards\LeaderboardManager.h"
+#include "../Leaderboards/LeaderboardManager.h"
 
 class CXuiCtrlCraftIngredientSlot;
 
diff --git a/Minecraft.Client/Common/XUI/XUI_LoadSettings.cpp b/Minecraft.Client/Common/XUI/XUI_LoadSettings.cpp
index 7f32ff89..18d6a015 100644
--- a/Minecraft.Client/Common/XUI/XUI_LoadSettings.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_LoadSettings.cpp
@@ -2,29 +2,29 @@
 #include <xuiresource.h>
 #include <xuiapp.h>
 #include <assert.h>
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\Common\Tutorial\TutorialMode.h"
-#include "..\..\..\Minecraft.World\ConsoleSaveFileIO.h"
-#include "..\..\LocalPlayer.h"
-#include "..\..\Minecraft.h"
-#include "..\..\..\Minecraft.World\AABB.h"
-#include "..\..\..\Minecraft.World\Vec3.h"
-#include "..\..\..\Minecraft.World\ArrayWithLength.h"
-#include "..\..\..\Minecraft.World\File.h"
-#include "..\..\..\Minecraft.World\InputOutputStream.h"
-#include "..\..\MinecraftServer.h"
-#include "..\..\Options.h"
+#include "../../../Minecraft.World/StringHelpers.h"
+#include "../../Common/Tutorial/TutorialMode.h"
+#include "../../../Minecraft.World/ConsoleSaveFileIO.h"
+#include "../../LocalPlayer.h"
+#include "../../Minecraft.h"
+#include "../../../Minecraft.World/AABB.h"
+#include "../../../Minecraft.World/Vec3.h"
+#include "../../../Minecraft.World/ArrayWithLength.h"
+#include "../../../Minecraft.World/File.h"
+#include "../../../Minecraft.World/InputOutputStream.h"
+#include "../../MinecraftServer.h"
+#include "../../Options.h"
 #include "XUI_Ctrl_4JList.h"
 #include "XUI_MultiGameInfo.h"
 #include "XUI_MultiGameJoinLoad.h"
 #include "XUI_Ctrl_4JIcon.h"
 #include "XUI_LoadSettings.h"
-#include "..\..\..\Minecraft.World\LevelSettings.h"
-#include "..\..\TexturePackRepository.h"
-#include "..\..\TexturePack.h"
-#include "..\GameRules\ConsoleGameRules.h"
-#include "..\..\StringTable.h"
-#include "..\..\DLCTexturePack.h"
+#include "../../../Minecraft.World/LevelSettings.h"
+#include "../../TexturePackRepository.h"
+#include "../../TexturePack.h"
+#include "../GameRules/ConsoleGameRules.h"
+#include "../../StringTable.h"
+#include "../../DLCTexturePack.h"
 
 #define GAME_CREATE_ONLINE_TIMER_ID 0
 #define GAME_CREATE_ONLINE_TIMER_TIME 100
diff --git a/Minecraft.Client/Common/XUI/XUI_MainMenu.cpp b/Minecraft.Client/Common/XUI/XUI_MainMenu.cpp
index 7b9c1a56..21753e87 100644
--- a/Minecraft.Client/Common/XUI/XUI_MainMenu.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_MainMenu.cpp
@@ -4,21 +4,21 @@
 #include "stdafx.h"
 
 #include <assert.h>
-#include "..\XUI\XUI_MainMenu.h"
-#include "..\..\..\Minecraft.Client\SurvivalMode.h"
-#include "..\..\..\Minecraft.World\ConsoleSaveFileIO.h"
-#include "..\..\LocalPlayer.h"
-#include "..\..\..\Minecraft.World\AABB.h"
-#include "..\..\..\Minecraft.World\Vec3.h"
-#include "..\..\User.h"
+#include "../XUI/XUI_MainMenu.h"
+#include "../../../Minecraft.Client/SurvivalMode.h"
+#include "../../../Minecraft.World/ConsoleSaveFileIO.h"
+#include "../../LocalPlayer.h"
+#include "../../../Minecraft.World/AABB.h"
+#include "../../../Minecraft.World/Vec3.h"
+#include "../../User.h"
 //#include "XUI_CreateLoad.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\..\Minecraft.World\Random.h"
-#include "..\..\MinecraftServer.h"
-#include "..\..\Minecraft.h"
-#include "..\..\Options.h"
-#include "..\..\Font.h"
-#include "..\..\Common\GameRules\ConsoleGameRules.h"
+#include "../../../Minecraft.World/StringHelpers.h"
+#include "../../../Minecraft.World/Random.h"
+#include "../../MinecraftServer.h"
+#include "../../Minecraft.h"
+#include "../../Options.h"
+#include "../../Font.h"
+#include "../../Common/GameRules/ConsoleGameRules.h"
 
 #define DLC_INSTALLED_TIMER_ID 1
 #define DLC_INSTALLED_TIMER_TIME 100
diff --git a/Minecraft.Client/Common/XUI/XUI_MultiGameCreate.cpp b/Minecraft.Client/Common/XUI/XUI_MultiGameCreate.cpp
index b3608b06..39eba4a6 100644
--- a/Minecraft.Client/Common/XUI/XUI_MultiGameCreate.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_MultiGameCreate.cpp
@@ -1,21 +1,21 @@
 #include "stdafx.h"
-#include "..\..\..\Minecraft.World\Random.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "../../../Minecraft.World/Random.h"
+#include "../../../Minecraft.World/StringHelpers.h"
 #include "XUI_MultiGameCreate.h"
 #include "XUI_Controls.h"
-#include "..\..\MinecraftServer.h"
-#include "..\..\Minecraft.h"
-#include "..\..\Options.h"
-#include "..\..\..\Minecraft.World\LevelSettings.h"
+#include "../../MinecraftServer.h"
+#include "../../Minecraft.h"
+#include "../../Options.h"
+#include "../../../Minecraft.World/LevelSettings.h"
 #include "XUI_MultiGameLaunchMoreOptions.h"
-#include "..\..\..\Minecraft.World\BiomeSource.h"
-#include "..\..\..\Minecraft.World\IntCache.h"
-#include "..\..\..\Minecraft.World\LevelType.h"
-#include "..\..\TexturePackRepository.h"
-#include "..\..\TexturePack.h"
-#include "..\DLC\DLCLocalisationFile.h"
-#include "..\..\StringTable.h"
-#include "..\..\DLCTexturePack.h"
+#include "../../../Minecraft.World/BiomeSource.h"
+#include "../../../Minecraft.World/IntCache.h"
+#include "../../../Minecraft.World/LevelType.h"
+#include "../../TexturePackRepository.h"
+#include "../../TexturePack.h"
+#include "../DLC/DLCLocalisationFile.h"
+#include "../../StringTable.h"
+#include "../../DLCTexturePack.h"
 
 #define GAME_CREATE_ONLINE_TIMER_ID 0
 #define GAME_CREATE_ONLINE_TIMER_TIME 100
diff --git a/Minecraft.Client/Common/XUI/XUI_MultiGameCreate.h b/Minecraft.Client/Common/XUI/XUI_MultiGameCreate.h
index 5b4e6ef7..de99b021 100644
--- a/Minecraft.Client/Common/XUI/XUI_MultiGameCreate.h
+++ b/Minecraft.Client/Common/XUI/XUI_MultiGameCreate.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "..\Media\xuiscene_multi_create.h"
+#include "../Media/xuiscene_multi_create.h"
 #include "XUI_Ctrl_4JEdit.h"
 #include "XUI_Ctrl_SliderWrapper.h"
 #include "XUI_MultiGameLaunchMoreOptions.h"
diff --git a/Minecraft.Client/Common/XUI/XUI_MultiGameInfo.cpp b/Minecraft.Client/Common/XUI/XUI_MultiGameInfo.cpp
index bbfa243b..6d45319c 100644
--- a/Minecraft.Client/Common/XUI/XUI_MultiGameInfo.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_MultiGameInfo.cpp
@@ -2,12 +2,12 @@
 #include <xuiresource.h>
 #include <xuiapp.h>
 #include <assert.h>
-#include "..\..\..\Minecraft.World\LevelSettings.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "../../../Minecraft.World/LevelSettings.h"
+#include "../../../Minecraft.World/StringHelpers.h"
 #include "XUI_MultiGameInfo.h"
 #include "XUI_MultiGameJoinLoad.h"
-#include "..\..\..\Minecraft.World\LevelSettings.h"
-#include "..\..\..\Minecraft.World\Difficulty.h"
+#include "../../../Minecraft.World/LevelSettings.h"
+#include "../../../Minecraft.World/Difficulty.h"
 
 #define UPDATE_PLAYERS_TIMER_ID 0
 #define UPDATE_PLAYERS_TIMER_TIME 30000
diff --git a/Minecraft.Client/Common/XUI/XUI_MultiGameInfo.h b/Minecraft.Client/Common/XUI/XUI_MultiGameInfo.h
index 9664640b..e0643455 100644
--- a/Minecraft.Client/Common/XUI/XUI_MultiGameInfo.h
+++ b/Minecraft.Client/Common/XUI/XUI_MultiGameInfo.h
@@ -2,7 +2,7 @@
 using namespace std;
 #include <vector>
 #include <qnet.h>
-#include "..\Media\xuiscene_multi_gameinfo.h"
+#include "../Media/xuiscene_multi_gameinfo.h"
 
 class FriendSessionInfo;
 
diff --git a/Minecraft.Client/Common/XUI/XUI_MultiGameJoinLoad.cpp b/Minecraft.Client/Common/XUI/XUI_MultiGameJoinLoad.cpp
index 73f25da5..c6cd85b9 100644
--- a/Minecraft.Client/Common/XUI/XUI_MultiGameJoinLoad.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_MultiGameJoinLoad.cpp
@@ -2,30 +2,30 @@
 #include <xuiresource.h>
 #include <xuiapp.h>
 #include <assert.h>
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\Common\Tutorial\TutorialMode.h"
-#include "..\..\..\Minecraft.World\ConsoleSaveFileIO.h"
-#include "..\..\LocalPlayer.h"
-#include "..\..\Minecraft.h"
-#include "..\..\ProgressRenderer.h"
-#include "..\..\..\Minecraft.World\AABB.h"
-#include "..\..\..\Minecraft.World\Vec3.h"
-#include "..\..\..\Minecraft.World\ArrayWithLength.h"
-#include "..\..\..\Minecraft.World\File.h"
-#include "..\..\..\Minecraft.World\InputOutputStream.h"
+#include "../../../Minecraft.World/StringHelpers.h"
+#include "../../Common/Tutorial/TutorialMode.h"
+#include "../../../Minecraft.World/ConsoleSaveFileIO.h"
+#include "../../LocalPlayer.h"
+#include "../../Minecraft.h"
+#include "../../ProgressRenderer.h"
+#include "../../../Minecraft.World/AABB.h"
+#include "../../../Minecraft.World/Vec3.h"
+#include "../../../Minecraft.World/ArrayWithLength.h"
+#include "../../../Minecraft.World/File.h"
+#include "../../../Minecraft.World/InputOutputStream.h"
 #include "XUI_Ctrl_4JList.h"
 #include "XUI_Ctrl_4JIcon.h"
 #include "XUI_LoadSettings.h"
 #include "XUI_MultiGameInfo.h"
 #include "XUI_MultiGameJoinLoad.h"
 #include "XUI_MultiGameCreate.h"
-#include "..\..\MinecraftServer.h"
-#include "..\..\Options.h"
+#include "../../MinecraftServer.h"
+#include "../../Options.h"
 
-#include "..\GameRules\LevelGenerationOptions.h"
-#include "..\..\TexturePackRepository.h"
-#include "..\..\TexturePack.h"
-#include "..\..\..\Minecraft.World\LevelSettings.h"
+#include "../GameRules/LevelGenerationOptions.h"
+#include "../../TexturePackRepository.h"
+#include "../../TexturePack.h"
+#include "../../../Minecraft.World/LevelSettings.h"
 
 #define CHECKFORAVAILABLETEXTUREPACKS_TIMER_ID 3
 #define CHECKFORAVAILABLETEXTUREPACKS_TIMER_TIME 100
diff --git a/Minecraft.Client/Common/XUI/XUI_MultiGameJoinLoad.h b/Minecraft.Client/Common/XUI/XUI_MultiGameJoinLoad.h
index e91fbac2..b7d5ddc0 100644
--- a/Minecraft.Client/Common/XUI/XUI_MultiGameJoinLoad.h
+++ b/Minecraft.Client/Common/XUI/XUI_MultiGameJoinLoad.h
@@ -1,7 +1,7 @@
 #pragma once
 using namespace std;
 #include <vector>
-#include "..\Media\xuiscene_multi_joinload.h"
+#include "../Media/xuiscene_multi_joinload.h"
 #include "XUI_CustomMessages.h"
 
 
diff --git a/Minecraft.Client/Common/XUI/XUI_MultiGameLaunchMoreOptions.cpp b/Minecraft.Client/Common/XUI/XUI_MultiGameLaunchMoreOptions.cpp
index 08656111..d4b9e02c 100644
--- a/Minecraft.Client/Common/XUI/XUI_MultiGameLaunchMoreOptions.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_MultiGameLaunchMoreOptions.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "XUI_MultiGameCreate.h"
 #include "XUI_MultiGameLaunchMoreOptions.h"
-#include "..\..\TexturePackRepository.h"
-#include "..\..\Minecraft.h"
+#include "../../TexturePackRepository.h"
+#include "../../Minecraft.h"
 
 #define GAME_CREATE_ONLINE_TIMER_ID 0
 #define GAME_CREATE_ONLINE_TIMER_TIME 100
diff --git a/Minecraft.Client/Common/XUI/XUI_MultiGameLaunchMoreOptions.h b/Minecraft.Client/Common/XUI/XUI_MultiGameLaunchMoreOptions.h
index 92876240..1e5ebd02 100644
--- a/Minecraft.Client/Common/XUI/XUI_MultiGameLaunchMoreOptions.h
+++ b/Minecraft.Client/Common/XUI/XUI_MultiGameLaunchMoreOptions.h
@@ -1,6 +1,6 @@
 #pragma once
 using namespace std;
-#include "..\Media\xuiscene_multi_launch_more_options.h"
+#include "../Media/xuiscene_multi_launch_more_options.h"
 
 class CScene_MultiGameLaunchMoreOptions : public CXuiSceneImpl
 {
diff --git a/Minecraft.Client/Common/XUI/XUI_NewUpdateMessage.cpp b/Minecraft.Client/Common/XUI/XUI_NewUpdateMessage.cpp
index 49b524ff..e32eccad 100644
--- a/Minecraft.Client/Common/XUI/XUI_NewUpdateMessage.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_NewUpdateMessage.cpp
@@ -3,7 +3,7 @@
 #include "stdafx.h"
  // #include "XUI_Ctrl_4JIcon.h"
 #include "XUI_NewUpdateMessage.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "../../../Minecraft.World/StringHelpers.h"
 
 
 HRESULT CScene_NewUpdateMessage::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
diff --git a/Minecraft.Client/Common/XUI/XUI_NewUpdateMessage.h b/Minecraft.Client/Common/XUI/XUI_NewUpdateMessage.h
index 8c4fbb36..b9685933 100644
--- a/Minecraft.Client/Common/XUI/XUI_NewUpdateMessage.h
+++ b/Minecraft.Client/Common/XUI/XUI_NewUpdateMessage.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../media\xuiscene_NewUpdateMessage.h"
+#include "../media/xuiscene_NewUpdateMessage.h"
 
 class CScene_NewUpdateMessage : public CXuiSceneImpl
 {
diff --git a/Minecraft.Client/Common/XUI/XUI_PartnernetPassword.cpp b/Minecraft.Client/Common/XUI/XUI_PartnernetPassword.cpp
index 76b820d3..fc4ca486 100644
--- a/Minecraft.Client/Common/XUI/XUI_PartnernetPassword.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_PartnernetPassword.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "XUI_PartnernetPassword.h"
-#include "..\XUI\XUI_Ctrl_4JList.h"
+#include "../XUI/XUI_Ctrl_4JList.h"
 
 #ifdef _CONTENT_PACKAGE
 #ifndef _FINAL_BUILD
diff --git a/Minecraft.Client/Common/XUI/XUI_PartnernetPassword.h b/Minecraft.Client/Common/XUI/XUI_PartnernetPassword.h
index b05206c0..ea5d305e 100644
--- a/Minecraft.Client/Common/XUI/XUI_PartnernetPassword.h
+++ b/Minecraft.Client/Common/XUI/XUI_PartnernetPassword.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "..\Media\xuiscene_partnernetpassword.h"
+#include "../Media/xuiscene_partnernetpassword.h"
 #include "XUI_Ctrl_4JEdit.h"
 
 #ifdef _CONTENT_PACKAGE
diff --git a/Minecraft.Client/Common/XUI/XUI_PauseMenu.cpp b/Minecraft.Client/Common/XUI/XUI_PauseMenu.cpp
index 4de74d1f..2b83c788 100644
--- a/Minecraft.Client/Common/XUI/XUI_PauseMenu.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_PauseMenu.cpp
@@ -4,23 +4,23 @@
 #include "stdafx.h"
 
 #include <assert.h>
-#include "..\..\..\Minecraft.World\AABB.h"
-#include "..\..\..\Minecraft.World\Vec3.h"
-#include "..\..\..\Minecraft.World\net.minecraft.stats.h"
-#include "..\..\..\Minecraft.Client\StatsCounter.h"
-#include "..\..\..\Minecraft.World\Entity.h"
-#include "..\..\..\Minecraft.World\Level.h"
-#include "..\..\..\Minecraft.Client\MultiplayerLocalPlayer.h"
-#include "..\..\MinecraftServer.h"
-#include "..\..\MultiPlayerLevel.h"
-#include "..\..\ProgressRenderer.h"
-#include "..\..\..\Minecraft.World\DisconnectPacket.h"
-#include "..\..\Minecraft.h"
-#include "..\..\Options.h"
-#include "..\..\..\Minecraft.World\compression.h"
-#include "..\..\TexturePackRepository.h"
-#include "..\..\TexturePack.h"
-#include "..\..\DLCTexturePack.h"
+#include "../../../Minecraft.World/AABB.h"
+#include "../../../Minecraft.World/Vec3.h"
+#include "../../../Minecraft.World/net.minecraft.stats.h"
+#include "../../../Minecraft.Client/StatsCounter.h"
+#include "../../../Minecraft.World/Entity.h"
+#include "../../../Minecraft.World/Level.h"
+#include "../../../Minecraft.Client/MultiplayerLocalPlayer.h"
+#include "../../MinecraftServer.h"
+#include "../../MultiPlayerLevel.h"
+#include "../../ProgressRenderer.h"
+#include "../../../Minecraft.World/DisconnectPacket.h"
+#include "../../Minecraft.h"
+#include "../../Options.h"
+#include "../../../Minecraft.World/compression.h"
+#include "../../TexturePackRepository.h"
+#include "../../TexturePack.h"
+#include "../../DLCTexturePack.h"
 
 #define IGNORE_KEYPRESS_TIMERID 0
 #define IGNORE_KEYPRESS_TIME 100
diff --git a/Minecraft.Client/Common/XUI/XUI_PauseMenu.h b/Minecraft.Client/Common/XUI/XUI_PauseMenu.h
index 9c0e0015..c19fd4e8 100644
--- a/Minecraft.Client/Common/XUI/XUI_PauseMenu.h
+++ b/Minecraft.Client/Common/XUI/XUI_PauseMenu.h
@@ -1,6 +1,6 @@
 #pragma once 
 #include "../media/xuiscene_Pause.h"
-#include "..\UI\IUIScene_PauseMenu.h"
+#include "../UI/IUIScene_PauseMenu.h"
 #include "XUI_CustomMessages.h"
 
 #define BUTTON_PAUSE_RESUMEGAME		0
diff --git a/Minecraft.Client/Common/XUI/XUI_Reinstall.cpp b/Minecraft.Client/Common/XUI/XUI_Reinstall.cpp
index c1e06c0d..86934fca 100644
--- a/Minecraft.Client/Common/XUI/XUI_Reinstall.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Reinstall.cpp
@@ -4,19 +4,19 @@
 #include "stdafx.h"
 
 #include <assert.h>
-#include "..\XUI\XUI_Reinstall.h"
-#include "..\..\..\Minecraft.World\AABB.h"
-#include "..\..\..\Minecraft.World\Vec3.h"
-#include "..\..\..\Minecraft.World\net.minecraft.stats.h"
-#include "..\..\..\Minecraft.Client\StatsCounter.h"
-#include "..\..\..\Minecraft.World\Entity.h"
-#include "..\..\..\Minecraft.World\Level.h"
-#include "..\..\..\Minecraft.Client\LocalPlayer.h"
-#include "..\..\MinecraftServer.h"
-#include "..\..\ProgressRenderer.h"
-#include "..\..\..\Minecraft.World\DisconnectPacket.h"
-#include "..\..\Minecraft.h"
-#include "..\..\Options.h"
+#include "../XUI/XUI_Reinstall.h"
+#include "../../../Minecraft.World/AABB.h"
+#include "../../../Minecraft.World/Vec3.h"
+#include "../../../Minecraft.World/net.minecraft.stats.h"
+#include "../../../Minecraft.Client/StatsCounter.h"
+#include "../../../Minecraft.World/Entity.h"
+#include "../../../Minecraft.World/Level.h"
+#include "../../../Minecraft.Client/LocalPlayer.h"
+#include "../../MinecraftServer.h"
+#include "../../ProgressRenderer.h"
+#include "../../../Minecraft.World/DisconnectPacket.h"
+#include "../../Minecraft.h"
+#include "../../Options.h"
 
 
 
diff --git a/Minecraft.Client/Common/XUI/XUI_SaveMessage.cpp b/Minecraft.Client/Common/XUI/XUI_SaveMessage.cpp
index 7c816033..5469cd0d 100644
--- a/Minecraft.Client/Common/XUI/XUI_SaveMessage.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_SaveMessage.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include <assert.h>
-#include "..\XUI\XUI_SaveMessage.h"
+#include "../XUI/XUI_SaveMessage.h"
 
 //----------------------------------------------------------------------------------
 // Performs initialization tasks - retrieves controls.
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_AbstractContainer.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_AbstractContainer.cpp
index 10369d5e..daac9fcb 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_AbstractContainer.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_AbstractContainer.cpp
@@ -3,22 +3,22 @@
 #include <xuiapp.h>
 #include <assert.h>
 
-#include "..\..\..\Minecraft.World\Player.h"
-#include "..\..\..\Minecraft.Client\LocalPlayer.h"
-#include "..\..\..\Minecraft.Client\Minecraft.h"
-#include "..\..\..\Minecraft.Client\GameMode.h"
-#include "..\..\..\Minecraft.World\AbstractContainerMenu.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\..\..\Minecraft.World\Tile.h"
-#include "..\..\..\Minecraft.World\FurnaceRecipes.h"
-#include "..\..\..\Minecraft.World\Recipy.h"
-#include "..\..\..\Minecraft.World\Recipes.h"
-#include "..\..\..\Minecraft.World\ArmorRecipes.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "../../../Minecraft.World/Player.h"
+#include "../../../Minecraft.Client/LocalPlayer.h"
+#include "../../../Minecraft.Client/Minecraft.h"
+#include "../../../Minecraft.Client/GameMode.h"
+#include "../../../Minecraft.World/AbstractContainerMenu.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.h"
+#include "../../../Minecraft.World/Tile.h"
+#include "../../../Minecraft.World/FurnaceRecipes.h"
+#include "../../../Minecraft.World/Recipy.h"
+#include "../../../Minecraft.World/Recipes.h"
+#include "../../../Minecraft.World/ArmorRecipes.h"
+#include "../../../Minecraft.World/StringHelpers.h"
 
-#include "..\..\Common\Tutorial\Tutorial.h"
-#include "..\..\Common\Tutorial\TutorialMode.h"
+#include "../../Common/Tutorial/Tutorial.h"
+#include "../../Common/Tutorial/TutorialMode.h"
 
 #include "XUI_Ctrl_SlotList.h"
 #include "XUI_Ctrl_SlotItem.h"
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_AbstractContainer.h b/Minecraft.Client/Common/XUI/XUI_Scene_AbstractContainer.h
index ca191db5..154b5368 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_AbstractContainer.h
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_AbstractContainer.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "..\UI\IUIScene_AbstractContainerMenu.h"
+#include "../UI/IUIScene_AbstractContainerMenu.h"
 #include "XUI_CustomMessages.h"
-#include "..\..\Common\Tutorial\TutorialEnum.h"
+#include "../../Common/Tutorial/TutorialEnum.h"
 
 class CXuiCtrlSlotList;
 class CXuiCtrlSlotItem;
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Anvil.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Anvil.cpp
index 4a8617b4..35cc50f9 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Anvil.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Anvil.cpp
@@ -1,12 +1,12 @@
 #include "stdafx.h"
 
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\MultiPlayerLocalPlayer.h"
-#include "..\..\Common\Tutorial\Tutorial.h"
-#include "..\..\Common\Tutorial\TutorialMode.h"
-#include "..\..\Common\Tutorial\TutorialEnum.h"
-#include "..\..\Minecraft.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../../../Minecraft.World/StringHelpers.h"
+#include "../../MultiPlayerLocalPlayer.h"
+#include "../../Common/Tutorial/Tutorial.h"
+#include "../../Common/Tutorial/TutorialMode.h"
+#include "../../Common/Tutorial/TutorialEnum.h"
+#include "../../Minecraft.h"
 #include "XUI_Ctrl_SlotList.h"
 #include "XUI_Scene_Anvil.h"
 
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Anvil.h b/Minecraft.Client/Common/XUI/XUI_Scene_Anvil.h
index 2b16c8ab..02599550 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Anvil.h
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Anvil.h
@@ -1,9 +1,9 @@
 #pragma once
 using namespace std;
-#include "..\Media\xuiscene_anvil.h"
+#include "../Media/xuiscene_anvil.h"
 #include "XUI_Scene_AbstractContainer.h"
-#include "..\UI\IUIScene_AnvilMenu.h"
-#include "Common\XUI\XUI_Ctrl_4JEdit.h"
+#include "../UI/IUIScene_AnvilMenu.h"
+#include "Common/XUI/XUI_Ctrl_4JEdit.h"
 
 #define ANVIL_UPDATE_TIMER_ID (10)
 #define ANVIL_UPDATE_TIMER_TIME (1000) // 1 second
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Base.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Base.cpp
index 03782c79..d37a37fd 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Base.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Base.cpp
@@ -1,24 +1,24 @@
 #include "stdafx.h"
 
 #include <assert.h>
-#include "..\..\MultiplayerLevel.h"
-#include "..\..\MultiplayerLocalPlayer.h"
-#include "..\..\StatsCounter.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\..\Minecraft.World\net.minecraft.stats.h"
-#include "..\..\Minecraft.h"
+#include "../../MultiplayerLevel.h"
+#include "../../MultiplayerLocalPlayer.h"
+#include "../../StatsCounter.h"
+#include "../../../Minecraft.World/StringHelpers.h"
+#include "../../../Minecraft.World/net.minecraft.stats.h"
+#include "../../Minecraft.h"
 
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\..\..\Minecraft.World\LevelData.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.h"
+#include "../../../Minecraft.World/LevelData.h"
 #include "XUI_CustomMessages.h"
-#include "..\..\..\Minecraft.World\Dimension.h"
-#include "..\..\..\Minecraft.World\SharedConstants.h"
-#include "..\..\GameMode.h"
-#include "..\..\EnderDragonRenderer.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.entity.boss.enderdragon.h"
-#include "..\..\TexturePackRepository.h"
-#include "..\..\TexturePack.h"
-#include "..\..\DLCTexturePack.h"
+#include "../../../Minecraft.World/Dimension.h"
+#include "../../../Minecraft.World/SharedConstants.h"
+#include "../../GameMode.h"
+#include "../../EnderDragonRenderer.h"
+#include "../../../Minecraft.World/net.minecraft.world.entity.boss.enderdragon.h"
+#include "../../TexturePackRepository.h"
+#include "../../TexturePack.h"
+#include "../../DLCTexturePack.h"
 
 #define PRESS_START_TIMER 0
 
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Base.h b/Minecraft.Client/Common/XUI/XUI_Scene_Base.h
index 1a5b5d87..7b89a6e1 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Base.h
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Base.h
@@ -3,8 +3,8 @@
 #include "../media/xuiscene_base.h"
 #include "XUI_Ctrl_SlotItem.h"
 #include "XUI_CustomMessages.h"
-#include "..\UI\UIEnums.h"
-#include "..\..\..\Minecraft.World\SoundTypes.h"
+#include "../UI/UIEnums.h"
+#include "../../../Minecraft.World/SoundTypes.h"
 
 #define BUTTON_TOOLTIP_A	0
 #define BUTTON_TOOLTIP_B	1
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_BrewingStand.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_BrewingStand.cpp
index cf600966..076bdad9 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_BrewingStand.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_BrewingStand.cpp
@@ -1,11 +1,11 @@
 #include "stdafx.h"
 
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\MultiPlayerLocalPlayer.h"
-#include "..\..\Common\Tutorial\Tutorial.h"
-#include "..\..\Common\Tutorial\TutorialMode.h"
-#include "..\..\Common\Tutorial\TutorialEnum.h"
-#include "..\..\Minecraft.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../../MultiPlayerLocalPlayer.h"
+#include "../../Common/Tutorial/Tutorial.h"
+#include "../../Common/Tutorial/TutorialMode.h"
+#include "../../Common/Tutorial/TutorialEnum.h"
+#include "../../Minecraft.h"
 #include "XUI_Ctrl_SlotList.h"
 #include "XUI_Scene_BrewingStand.h"
 #include "XUI_Ctrl_BrewProgress.h"
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_BrewingStand.h b/Minecraft.Client/Common/XUI/XUI_Scene_BrewingStand.h
index 370b6b18..96b41465 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_BrewingStand.h
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_BrewingStand.h
@@ -1,8 +1,8 @@
 #pragma once
 using namespace std;
-#include "..\Media\xuiscene_brewingstand.h"
+#include "../Media/xuiscene_brewingstand.h"
 #include "XUI_Scene_AbstractContainer.h"
-#include "..\UI\IUIScene_BrewingMenu.h"
+#include "../UI/IUIScene_BrewingMenu.h"
 
 class CXuiCtrlSlotList;
 class CXuiCtrlBrewProgress;
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Container.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Container.cpp
index 39b836d2..c11281df 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Container.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Container.cpp
@@ -1,15 +1,15 @@
 #include "stdafx.h"
 
-#include "..\..\..\Minecraft.World\Container.h"
-#include "..\..\..\Minecraft.World\ContainerMenu.h"
-#include "..\..\MultiplayerLocalPlayer.h"
+#include "../../../Minecraft.World/Container.h"
+#include "../../../Minecraft.World/ContainerMenu.h"
+#include "../../MultiplayerLocalPlayer.h"
 #include "XUI_Ctrl_SlotList.h"
 #include "XUI_Scene_Container.h"
 #include "XUI_Ctrl_SlotItemListItem.h"
 #include "XUI_Ctrl_SlotItem.h"
-#include "..\..\Common\Tutorial\Tutorial.h"
-#include "..\..\Common\Tutorial\TutorialMode.h"
-#include "..\..\Common\Tutorial\TutorialEnum.h"
+#include "../../Common/Tutorial/Tutorial.h"
+#include "../../Common/Tutorial/TutorialMode.h"
+#include "../../Common/Tutorial/TutorialEnum.h"
 
 // The height of one row of slots
 //#define ROW_HEIGHT 42.0f - comes from the pointer height in the xui
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Container.h b/Minecraft.Client/Common/XUI/XUI_Scene_Container.h
index 475a6974..a1bb4d19 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Container.h
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Container.h
@@ -1,8 +1,8 @@
 #pragma once
-#include "..\Media\xuiscene_container.h"
+#include "../Media/xuiscene_container.h"
 #include "XUI_Scene_AbstractContainer.h"
 #include "XUI_CustomMessages.h"
-#include "..\UI\IUIScene_ContainerMenu.h"
+#include "../UI/IUIScene_ContainerMenu.h"
 
 //--------------------------------------------------------------------------------------
 // Scene implementation class.
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.cpp
index a5dc6584..f2e9dde9 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.cpp
@@ -4,16 +4,16 @@
 #include "stdafx.h"
 
 #include <assert.h>
-#include "..\..\MultiplayerLocalPlayer.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.crafting.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\..\Minecraft.World\Tile.h"
-#include "..\..\..\Minecraft.World\net.minecraft.stats.h"
-#include "..\..\Common\Tutorial\Tutorial.h"
-#include "..\..\Common\Tutorial\TutorialMode.h"
-#include "..\..\Common\Tutorial\TutorialEnum.h"
-#include "..\..\Minecraft.h"
+#include "../../MultiplayerLocalPlayer.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.crafting.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../../../Minecraft.World/Tile.h"
+#include "../../../Minecraft.World/net.minecraft.stats.h"
+#include "../../Common/Tutorial/Tutorial.h"
+#include "../../Common/Tutorial/TutorialMode.h"
+#include "../../Common/Tutorial/TutorialEnum.h"
+#include "../../Minecraft.h"
 #include "XUI_Ctrl_CraftIngredientSlot.h"
 #include "XUI_Ctrl_SlotList.h"
 
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.h b/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.h
index 0c6e22ff..77466402 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.h
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_CraftingPanel.h
@@ -3,12 +3,12 @@ using namespace std;
 
 #include "../media/xuiscene_craftingpanel_2x2.h"
 #include "XUI_Ctrl_MinecraftSlot.h"
-#include "..\..\..\Minecraft.World\Recipy.h" 
+#include "../../../Minecraft.World/Recipy.h" 
 #include "XUI_Ctrl_CraftIngredientSlot.h"
-#include "..\..\..\Minecraft.World\Item.h"
+#include "../../../Minecraft.World/Item.h"
 #include "XUI_CustomMessages.h"
-#include "..\..\Common\Tutorial\TutorialEnum.h"
-#include "..\UI\IUIScene_CraftingMenu.h"
+#include "../../Common/Tutorial/TutorialEnum.h"
+#include "../UI/IUIScene_CraftingMenu.h"
 
 class CXuiCtrlSlotList;
 
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.cpp
index 5b3c7226..ef27f16a 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.cpp
@@ -1,16 +1,16 @@
 #include "stdafx.h"
 
-#include "..\..\..\Minecraft.World\AbstractContainerMenu.h"
-#include "..\..\..\Minecraft.World\Slot.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.dimension.h"
+#include "../../../Minecraft.World/AbstractContainerMenu.h"
+#include "../../../Minecraft.World/Slot.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.dimension.h"
 
-//#include "..\..\..\Minecraft.World\net.minecraft.stats.h"
-#include "..\..\MultiplayerLocalPlayer.h"
-#include "..\..\Common\Tutorial\Tutorial.h"
-#include "..\..\Common\Tutorial\TutorialMode.h"
-#include "..\..\Common\Tutorial\TutorialEnum.h"
-#include "..\..\Minecraft.h"
+//#include "../../../Minecraft.World/net.minecraft.stats.h"
+#include "../../MultiplayerLocalPlayer.h"
+#include "../../Common/Tutorial/Tutorial.h"
+#include "../../Common/Tutorial/TutorialMode.h"
+#include "../../Common/Tutorial/TutorialEnum.h"
+#include "../../Minecraft.h"
 #include "XUI_Ctrl_SlotList.h"
 
 #include "XUI_Scene_Enchant.h"
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.h b/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.h
index 5cab04a4..eb26041d 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.h
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Enchant.h
@@ -1,20 +1,20 @@
 #pragma once
 using namespace std;
 
-#include "..\Media\xuiscene_enchant.h"
+#include "../Media/xuiscene_enchant.h"
 
-#include "..\..\BookModel.h"
+#include "../../BookModel.h"
 
 #include "XUI_Ctrl_SlotList.h"
 #include "XUI_Ctrl_EnchantmentBook.h"
 #include "XUI_Scene_AbstractContainer.h"
-#include "..\UI\IUIScene_EnchantingMenu.h"
+#include "../UI/IUIScene_EnchantingMenu.h"
 #include "XUI_CustomMessages.h"
 
 #include "XUI_Scene_Enchant.h"
 
-#include "..\..\..\Minecraft.World\AbstractContainerMenu.h"
-#include "..\..\..\Minecraft.World\SimpleContainer.h"
+#include "../../../Minecraft.World/AbstractContainerMenu.h"
+#include "../../../Minecraft.World/SimpleContainer.h"
 
 class Level;
 class CXuiCtrlEnchantmentButton;
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.cpp
index 832d6b4c..709ce905 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.cpp
@@ -1,11 +1,11 @@
 #include "stdafx.h"
 
-#include "..\..\..\Minecraft.World\FurnaceMenu.h"
-#include "..\..\MultiplayerLocalPlayer.h"
-#include "..\..\Common\Tutorial\Tutorial.h"
-#include "..\..\Common\Tutorial\TutorialMode.h"
-#include "..\..\Common\Tutorial\TutorialEnum.h"
-#include "..\..\Minecraft.h"
+#include "../../../Minecraft.World/FurnaceMenu.h"
+#include "../../MultiplayerLocalPlayer.h"
+#include "../../Common/Tutorial/Tutorial.h"
+#include "../../Common/Tutorial/TutorialMode.h"
+#include "../../Common/Tutorial/TutorialEnum.h"
+#include "../../Minecraft.h"
 #include "XUI_Ctrl_SlotList.h"
 #include "XUI_Scene_Furnace.h"
 #include "XUI_Ctrl_BurnProgress.h"
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.h b/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.h
index 22cbf262..8c965e8b 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.h
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Furnace.h
@@ -1,8 +1,8 @@
 #pragma once
 using namespace std;
-#include "..\Media\xuiscene_furnace.h"
+#include "../Media/xuiscene_furnace.h"
 #include "XUI_Scene_AbstractContainer.h"
-#include "..\UI\IUIScene_FurnaceMenu.h"
+#include "../UI/IUIScene_FurnaceMenu.h"
 
 class CXuiCtrlSlotList;
 class CXuiCtrlFireProgress;
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.cpp
index 04e77e5e..111ba95a 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.cpp
@@ -1,13 +1,13 @@
 #include "stdafx.h"
 
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\..\Minecraft.World\net.minecraft.stats.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.effect.h"
-#include "..\..\MultiplayerLocalPlayer.h"
-#include "..\..\Common\Tutorial\Tutorial.h"
-#include "..\..\Common\Tutorial\TutorialMode.h"
-#include "..\..\Common\Tutorial\TutorialEnum.h"
-#include "..\..\Minecraft.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../../../Minecraft.World/net.minecraft.stats.h"
+#include "../../../Minecraft.World/net.minecraft.world.effect.h"
+#include "../../MultiplayerLocalPlayer.h"
+#include "../../Common/Tutorial/Tutorial.h"
+#include "../../Common/Tutorial/TutorialMode.h"
+#include "../../Common/Tutorial/TutorialEnum.h"
+#include "../../Minecraft.h"
 #include "XUI_Controls.h"
 #include "XUI_Scene_Inventory.h"
 
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.h b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.h
index 2a7b305c..6cccad7f 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.h
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory.h
@@ -1,9 +1,9 @@
 #pragma once
 using namespace std;
-#include "..\Media\xuiscene_inventory.h"
+#include "../Media/xuiscene_inventory.h"
 #include "XUI_Scene_AbstractContainer.h"
 #include "XUI_CustomMessages.h"
-#include "..\UI\IUIScene_InventoryMenu.h"
+#include "../UI/IUIScene_InventoryMenu.h"
 
 #define INVENTORY_UPDATE_EFFECTS_TIMER_ID (10)
 #define INVENTORY_UPDATE_EFFECTS_TIMER_TIME (1000) // 1 second
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.cpp
index 0793fc9e..21e3a6e9 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.cpp
@@ -1,26 +1,26 @@
 #include "stdafx.h"
 
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
 
-#include "..\..\..\Minecraft.World\Container.h"
-#include "..\..\..\Minecraft.World\Slot.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.item.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.entity.player.h"
+#include "../../../Minecraft.World/Container.h"
+#include "../../../Minecraft.World/Slot.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.item.h"
+#include "../../../Minecraft.World/net.minecraft.world.entity.player.h"
 
-#include "..\..\..\Minecraft.World\net.minecraft.stats.h"
-#include "..\..\MultiplayerLocalPlayer.h"
-#include "..\..\Common\Tutorial\Tutorial.h"
-#include "..\..\Common\Tutorial\TutorialMode.h"
-#include "..\..\Minecraft.h"
+#include "../../../Minecraft.World/net.minecraft.stats.h"
+#include "../../MultiplayerLocalPlayer.h"
+#include "../../Common/Tutorial/Tutorial.h"
+#include "../../Common/Tutorial/TutorialMode.h"
+#include "../../Minecraft.h"
 
 #include "XUI_Scene_AbstractContainer.h"
 #include "XUI_Ctrl_SlotItem.h"
 #include "XUI_Ctrl_SlotList.h"
 #include "XUI_Ctrl_SlotItemListItem.h"
 
-#include "..\..\Common\Potion_macros.h"
+#include "../../Common/Potion_macros.h"
 
 //--------------------------------------------------------------------------------------
 // Name: CXuiSceneInventoryCreative::OnInit
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.h b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.h
index bb3ff976..acccbe04 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.h
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Inventory_Creative.h
@@ -1,13 +1,13 @@
 #pragma once
 using namespace std;
 
-#include "..\Media\xuiscene_inventory_creative.h"
+#include "../Media/xuiscene_inventory_creative.h"
 #include "XUI_Scene_AbstractContainer.h"
 #include "XUI_CustomMessages.h"
-#include "..\..\..\Minecraft.World\AbstractContainerMenu.h"
-#include "..\..\..\Minecraft.World\SimpleContainer.h"
+#include "../../../Minecraft.World/AbstractContainerMenu.h"
+#include "../../../Minecraft.World/SimpleContainer.h"
 
-#include "..\UI\IUIScene_CreativeMenu.h"
+#include "../UI/IUIScene_CreativeMenu.h"
 
 #include <vector>
 
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Trading.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Trading.cpp
index fec13460..dedd049b 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Trading.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Trading.cpp
@@ -1,16 +1,16 @@
 #include "stdafx.h"
 
-#include "..\..\..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.item.trading.h"
-#include "..\..\MultiPlayerLocalPlayer.h"
-#include "..\..\Common\Tutorial\Tutorial.h"
-#include "..\..\Common\Tutorial\TutorialMode.h"
-#include "..\..\Common\Tutorial\TutorialEnum.h"
-#include "..\..\Minecraft.h"
+#include "../../../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../../../Minecraft.World/net.minecraft.world.item.trading.h"
+#include "../../MultiPlayerLocalPlayer.h"
+#include "../../Common/Tutorial/Tutorial.h"
+#include "../../Common/Tutorial/TutorialMode.h"
+#include "../../Common/Tutorial/TutorialEnum.h"
+#include "../../Minecraft.h"
 #include "XUI_Ctrl_SlotList.h"
 #include "XUI_Scene_Trading.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\..\Minecraft.World\JavaMath.h"
+#include "../../../Minecraft.World/StringHelpers.h"
+#include "../../../Minecraft.World/JavaMath.h"
 
 //--------------------------------------------------------------------------------------
 // Name: CXuiSceneTrading::OnInit
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Trading.h b/Minecraft.Client/Common/XUI/XUI_Scene_Trading.h
index 72194cbc..5916f713 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Trading.h
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Trading.h
@@ -1,7 +1,7 @@
 #pragma once
 using namespace std;
-#include "..\Media\xuiscene_trading.h"
-#include "..\UI\IUIScene_TradingMenu.h"
+#include "../Media/xuiscene_trading.h"
+#include "../UI/IUIScene_TradingMenu.h"
 
 #define TRADING_UPDATE_TIMER_ID (10)
 #define TRADING_UPDATE_TIMER_TIME (50)
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Trap.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Trap.cpp
index 99dc6e4c..69a60a39 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Trap.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Trap.cpp
@@ -1,13 +1,13 @@
 #include "stdafx.h"
 
-#include "..\..\..\Minecraft.World\DispenserTileEntity.h"
-#include "..\..\..\Minecraft.World\TrapMenu.h"
-#include "..\..\MultiplayerLocalPlayer.h"
+#include "../../../Minecraft.World/DispenserTileEntity.h"
+#include "../../../Minecraft.World/TrapMenu.h"
+#include "../../MultiplayerLocalPlayer.h"
 #include "XUI_Ctrl_SlotList.h"
 #include "XUI_Scene_Trap.h"
-#include "..\..\Common\Tutorial\Tutorial.h"
-#include "..\..\Common\Tutorial\TutorialMode.h"
-#include "..\..\Common\Tutorial\TutorialEnum.h"
+#include "../../Common/Tutorial/Tutorial.h"
+#include "../../Common/Tutorial/TutorialMode.h"
+#include "../../Common/Tutorial/TutorialEnum.h"
 
 //--------------------------------------------------------------------------------------
 // Name: CXuiSceneTrap::OnInit
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Trap.h b/Minecraft.Client/Common/XUI/XUI_Scene_Trap.h
index 3008a7ca..233825af 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Trap.h
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Trap.h
@@ -1,8 +1,8 @@
 #pragma once
 using namespace std;
-#include "..\Media\xuiscene_trap.h"
+#include "../Media/xuiscene_trap.h"
 #include "XUI_Scene_AbstractContainer.h"
-#include "..\UI\IUIScene_DispenserMenu.h"
+#include "../UI/IUIScene_DispenserMenu.h"
 #include "XUI_CustomMessages.h"
 
 class Container;
diff --git a/Minecraft.Client/Common/XUI/XUI_Scene_Win.cpp b/Minecraft.Client/Common/XUI/XUI_Scene_Win.cpp
index 0f0c678b..6f523bac 100644
--- a/Minecraft.Client/Common/XUI/XUI_Scene_Win.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Scene_Win.cpp
@@ -2,13 +2,13 @@
 //
 
 #include "stdafx.h"
-#include "..\..\Minecraft.h"
-#include "..\..\Common\Tutorial\TutorialMode.h"
-#include "..\..\Font.h"
-#include "..\..\..\Minecraft.World\Random.h"
-#include "..\..\..\Minecraft.World\SharedConstants.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\MultiplayerLocalPlayer.h"
+#include "../../Minecraft.h"
+#include "../../Common/Tutorial/TutorialMode.h"
+#include "../../Font.h"
+#include "../../../Minecraft.World/Random.h"
+#include "../../../Minecraft.World/SharedConstants.h"
+#include "../../../Minecraft.World/StringHelpers.h"
+#include "../../MultiplayerLocalPlayer.h"
 #include "XUI_Scene_Win.h"
 
 BYTE CScene_Win::s_winUserIndex = 0;
diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsAll.cpp b/Minecraft.Client/Common/XUI/XUI_SettingsAll.cpp
index c6dc7118..3f302363 100644
--- a/Minecraft.Client/Common/XUI/XUI_SettingsAll.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_SettingsAll.cpp
@@ -2,7 +2,7 @@
 //
 
 #include "stdafx.h"
-#include "..\XUI\XUI_SettingsAll.h"
+#include "../XUI/XUI_SettingsAll.h"
 
 //----------------------------------------------------------------------------------
 // Performs initialization tasks - retrieves controls.
diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsAudio.cpp b/Minecraft.Client/Common/XUI/XUI_SettingsAudio.cpp
index 0f0fe2e3..f55938f9 100644
--- a/Minecraft.Client/Common/XUI/XUI_SettingsAudio.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_SettingsAudio.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "..\XUI\XUI_SettingsAudio.h"
+#include "../XUI/XUI_SettingsAudio.h"
 
 //----------------------------------------------------------------------------------
 // Performs initialization tasks - retrieves controls.
diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsControl.cpp b/Minecraft.Client/Common/XUI/XUI_SettingsControl.cpp
index 7e2835a2..86f8863a 100644
--- a/Minecraft.Client/Common/XUI/XUI_SettingsControl.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_SettingsControl.cpp
@@ -2,7 +2,7 @@
 //
 
 #include "stdafx.h"
-#include "..\XUI\XUI_SettingsControl.h"
+#include "../XUI/XUI_SettingsControl.h"
 
 //----------------------------------------------------------------------------------
 // Performs initialization tasks - retrieves controls.
diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsGraphics.cpp b/Minecraft.Client/Common/XUI/XUI_SettingsGraphics.cpp
index 48a933e2..7b0f68a5 100644
--- a/Minecraft.Client/Common/XUI/XUI_SettingsGraphics.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_SettingsGraphics.cpp
@@ -2,7 +2,7 @@
 //
 
 #include "stdafx.h"
-#include "..\XUI\XUI_SettingsGraphics.h"
+#include "../XUI/XUI_SettingsGraphics.h"
 
 //----------------------------------------------------------------------------------
 // Performs initialization tasks - retrieves controls.
diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsOptions.cpp b/Minecraft.Client/Common/XUI/XUI_SettingsOptions.cpp
index 526847c7..96098883 100644
--- a/Minecraft.Client/Common/XUI/XUI_SettingsOptions.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_SettingsOptions.cpp
@@ -2,7 +2,7 @@
 //
 
 #include "stdafx.h"
-#include "..\XUI\XUI_SettingsOptions.h"
+#include "../XUI/XUI_SettingsOptions.h"
 
 int CScene_SettingsOptions::m_iDifficultySettingA[4]=
 {
diff --git a/Minecraft.Client/Common/XUI/XUI_SettingsUI.cpp b/Minecraft.Client/Common/XUI/XUI_SettingsUI.cpp
index da95d084..802cafe5 100644
--- a/Minecraft.Client/Common/XUI/XUI_SettingsUI.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_SettingsUI.cpp
@@ -2,7 +2,7 @@
 //
 
 #include "stdafx.h"
-#include "..\XUI\XUI_SettingsUI.h"
+#include "../XUI/XUI_SettingsUI.h"
 
 //----------------------------------------------------------------------------------
 // Performs initialization tasks - retrieves controls.
diff --git a/Minecraft.Client/Common/XUI/XUI_SignEntry.cpp b/Minecraft.Client/Common/XUI/XUI_SignEntry.cpp
index 378ac147..13fe2b91 100644
--- a/Minecraft.Client/Common/XUI/XUI_SignEntry.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_SignEntry.cpp
@@ -1,11 +1,11 @@
 #include "stdafx.h"
-#include "..\..\..\MultiplayerLevel.h"
-#include "..\..\..\Minecraft.World\SignTileEntity.h"
-#include "..\..\..\Minecraft.World\Entity.h"
-#include "..\..\..\Minecraft.World\Level.h"
-#include "..\..\..\Minecraft.Client\LocalPlayer.h"
-#include "..\..\..\Minecraft.Client\ClientConnection.h"
-#include "..\..\..\Minecraft.Client\MultiPlayerLocalPlayer.h"
+#include "../../../MultiplayerLevel.h"
+#include "../../../Minecraft.World/SignTileEntity.h"
+#include "../../../Minecraft.World/Entity.h"
+#include "../../../Minecraft.World/Level.h"
+#include "../../../Minecraft.Client/LocalPlayer.h"
+#include "../../../Minecraft.Client/ClientConnection.h"
+#include "../../../Minecraft.Client/MultiPlayerLocalPlayer.h"
 #include "XUI_SignEntry.h"
 
 HRESULT CScene_SignEntry::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
diff --git a/Minecraft.Client/Common/XUI/XUI_SkinSelect.h b/Minecraft.Client/Common/XUI/XUI_SkinSelect.h
index dbbb388c..e8e0f03d 100644
--- a/Minecraft.Client/Common/XUI/XUI_SkinSelect.h
+++ b/Minecraft.Client/Common/XUI/XUI_SkinSelect.h
@@ -2,8 +2,8 @@
 
 #include "../media/xuiscene_skinselect.h"
 #include "XUI_CustomMessages.h"
-#include "..\..\..\Minecraft.World\Definitions.h"
-#include "..\..\Textures.h"
+#include "../../../Minecraft.World/Definitions.h"
+#include "../../Textures.h"
 
 class DLCPack;
 
diff --git a/Minecraft.Client/Common/XUI/XUI_SocialPost.cpp b/Minecraft.Client/Common/XUI/XUI_SocialPost.cpp
index f237e7d8..2fae7597 100644
--- a/Minecraft.Client/Common/XUI/XUI_SocialPost.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_SocialPost.cpp
@@ -4,16 +4,16 @@
 #include "stdafx.h"
 
 #include <assert.h>
-#include "..\XUI\XUI_SocialPost.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\..\Minecraft.World\SharedConstants.h"
-#include "..\..\..\Minecraft.World\Random.h"
-#include "..\..\..\Minecraft.Client\SurvivalMode.h"
-#include "..\..\..\Minecraft.Client\CreateWorldScreen.h"
-#include "..\..\..\Minecraft.World\ConsoleSaveFileIO.h"
-#include "..\..\..\Minecraft.World\AABB.h"
-#include "..\..\..\Minecraft.World\Vec3.h"
-#include "..\..\LocalPlayer.h"
+#include "../XUI/XUI_SocialPost.h"
+#include "../../../Minecraft.World/StringHelpers.h"
+#include "../../../Minecraft.World/SharedConstants.h"
+#include "../../../Minecraft.World/Random.h"
+#include "../../../Minecraft.Client/SurvivalMode.h"
+#include "../../../Minecraft.Client/CreateWorldScreen.h"
+#include "../../../Minecraft.World/ConsoleSaveFileIO.h"
+#include "../../../Minecraft.World/AABB.h"
+#include "../../../Minecraft.World/Vec3.h"
+#include "../../LocalPlayer.h"
 
 
 //----------------------------------------------------------------------------------
diff --git a/Minecraft.Client/Common/XUI/XUI_SocialPost.h b/Minecraft.Client/Common/XUI/XUI_SocialPost.h
index 0dd37fa6..5d39e41e 100644
--- a/Minecraft.Client/Common/XUI/XUI_SocialPost.h
+++ b/Minecraft.Client/Common/XUI/XUI_SocialPost.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../media\xuiscene_socialpost.h"
+#include "../media/xuiscene_socialpost.h"
 #include "XUI_Ctrl_4JEdit.h"
 #include "XUI_CustomMessages.h"
 
diff --git a/Minecraft.Client/Common/XUI/XUI_Teleport.cpp b/Minecraft.Client/Common/XUI/XUI_Teleport.cpp
index 1d6ac3bf..1e00c0b7 100644
--- a/Minecraft.Client/Common/XUI/XUI_Teleport.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_Teleport.cpp
@@ -2,18 +2,18 @@
 
 #include <assert.h>
 #include "XUI_Teleport.h"
-#include "..\..\ServerPlayer.h"
-#include "..\..\PlayerConnection.h"
-#include "..\..\PlayerList.h"
-#include "..\..\MinecraftServer.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\PlayerRenderer.h"
+#include "../../ServerPlayer.h"
+#include "../../PlayerConnection.h"
+#include "../../PlayerList.h"
+#include "../../MinecraftServer.h"
+#include "../../../Minecraft.World/StringHelpers.h"
+#include "../../PlayerRenderer.h"
 #include "XUI_InGamePlayerOptions.h"
-#include "..\..\Minecraft.h"
-#include "..\..\MultiPlayerLocalPlayer.h"
-#include "..\..\ClientConnection.h"
-#include "..\..\..\Minecraft.World\net.minecraft.network.packet.h"
-#include "..\..\Xbox\Network\NetworkPlayerXbox.h"
+#include "../../Minecraft.h"
+#include "../../MultiPlayerLocalPlayer.h"
+#include "../../ClientConnection.h"
+#include "../../../Minecraft.World/net.minecraft.network.packet.h"
+#include "../../Xbox/Network/NetworkPlayerXbox.h"
 #include "TeleportCommand.h"
 
 //----------------------------------------------------------------------------------
diff --git a/Minecraft.Client/Common/XUI/XUI_TextEntry.cpp b/Minecraft.Client/Common/XUI/XUI_TextEntry.cpp
index 8934350d..6c5c2fef 100644
--- a/Minecraft.Client/Common/XUI/XUI_TextEntry.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_TextEntry.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "XUI_TextEntry.h"
-#include "..\..\MultiplayerLocalPlayer.h"
+#include "../../MultiplayerLocalPlayer.h"
 
 
 CScene_TextEntry::CommandParams CScene_TextEntry::CommandA[CScene_TextEntry::eCommand_MAX]=
diff --git a/Minecraft.Client/Common/XUI/XUI_TextEntry.h b/Minecraft.Client/Common/XUI/XUI_TextEntry.h
index 70dcf30b..884ec678 100644
--- a/Minecraft.Client/Common/XUI/XUI_TextEntry.h
+++ b/Minecraft.Client/Common/XUI/XUI_TextEntry.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "..\Media\xuiscene_text_entry.h"
+#include "../Media/xuiscene_text_entry.h"
 #include "XUI_Ctrl_4JEdit.h"
 
 
diff --git a/Minecraft.Client/Common/XUI/XUI_TransferToXboxOne.cpp b/Minecraft.Client/Common/XUI/XUI_TransferToXboxOne.cpp
index 5a2e67b4..329ee26e 100644
--- a/Minecraft.Client/Common/XUI/XUI_TransferToXboxOne.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_TransferToXboxOne.cpp
@@ -6,7 +6,7 @@
 #include "XUI_Ctrl_4JList.h"
 #include "XUI_Ctrl_4JIcon.h"
 #include "XUI_LoadSettings.h"
-#include "..\..\ProgressRenderer.h"
+#include "../../ProgressRenderer.h"
 #include "XUI_TransferToXboxOne.h"
 
 
diff --git a/Minecraft.Client/Common/XUI/XUI_TransferToXboxOne.h b/Minecraft.Client/Common/XUI/XUI_TransferToXboxOne.h
index f08de59a..dc80495c 100644
--- a/Minecraft.Client/Common/XUI/XUI_TransferToXboxOne.h
+++ b/Minecraft.Client/Common/XUI/XUI_TransferToXboxOne.h
@@ -2,7 +2,7 @@
 using namespace std;
 //#include <vector>
 
-#include "..\Media\xuiscene_TransferToXboxOne.h"
+#include "../Media/xuiscene_TransferToXboxOne.h"
 
 
 class CXuiCtrl4JList;
diff --git a/Minecraft.Client/Common/XUI/XUI_TutorialPopup.cpp b/Minecraft.Client/Common/XUI/XUI_TutorialPopup.cpp
index 98951d81..59bf3486 100644
--- a/Minecraft.Client/Common/XUI/XUI_TutorialPopup.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_TutorialPopup.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
-#include "..\..\Common\Tutorial\Tutorial.h"
-#include "..\..\MultiplayerLocalPlayer.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\..\Minecraft.World\Tile.h"
-#include "..\..\..\Minecraft.World\Item.h"
+#include "../../Common/Tutorial/Tutorial.h"
+#include "../../MultiplayerLocalPlayer.h"
+#include "../../../Minecraft.World/StringHelpers.h"
+#include "../../../Minecraft.World/Tile.h"
+#include "../../../Minecraft.World/Item.h"
 #include "XUI_Ctrl_CraftIngredientSlot.h"
 #include "XUI_XZP_Icons.h"
 
diff --git a/Minecraft.Client/Common/XUI/XUI_debug.cpp b/Minecraft.Client/Common/XUI/XUI_debug.cpp
index 61b818a0..07ba5980 100644
--- a/Minecraft.Client/Common/XUI/XUI_debug.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_debug.cpp
@@ -5,7 +5,7 @@
 
 #include <assert.h>
 #include "XUI_Debug.h"
-#include "..\..\..\Minecraft.Client\StatsCounter.h"
+#include "../../../Minecraft.Client/StatsCounter.h"
 
 LPCWSTR CScene_Debug::m_DebugCheckboxTextA[eDebugSetting_Max+1]=
 {
diff --git a/Minecraft.Client/CompassTexture.cpp b/Minecraft.Client/CompassTexture.cpp
index 93d6a62c..95a8e508 100644
--- a/Minecraft.Client/CompassTexture.cpp
+++ b/Minecraft.Client/CompassTexture.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 "CompassTexture.h"
 
diff --git a/Minecraft.Client/ConfirmScreen.cpp b/Minecraft.Client/ConfirmScreen.cpp
index b67ea19d..13a89a4e 100644
--- a/Minecraft.Client/ConfirmScreen.cpp
+++ b/Minecraft.Client/ConfirmScreen.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "ConfirmScreen.h"
 #include "SmallButton.h"
-#include "..\Minecraft.World\net.minecraft.locale.h"
+#include "../Minecraft.World/net.minecraft.locale.h"
 
 ConfirmScreen::ConfirmScreen(Screen *parent, const wstring& title1, const wstring& title2, int id)
 {
diff --git a/Minecraft.Client/ConnectScreen.cpp b/Minecraft.Client/ConnectScreen.cpp
index 2cf005b6..6ac4ed0b 100644
--- a/Minecraft.Client/ConnectScreen.cpp
+++ b/Minecraft.Client/ConnectScreen.cpp
@@ -5,7 +5,7 @@
 #include "Button.h"
 #include "Minecraft.h"
 #include "User.h"
-#include "..\Minecraft.World\net.minecraft.locale.h"
+#include "../Minecraft.World/net.minecraft.locale.h"
 
 
 ConnectScreen::ConnectScreen(Minecraft *minecraft, const wstring& ip, int port)
diff --git a/Minecraft.Client/ContainerScreen.cpp b/Minecraft.Client/ContainerScreen.cpp
index 17b45406..4ec572ac 100644
--- a/Minecraft.Client/ContainerScreen.cpp
+++ b/Minecraft.Client/ContainerScreen.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "ContainerScreen.h"
 #include "Textures.h"
-#include "..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "../Minecraft.World/net.minecraft.world.inventory.h"
 
 ContainerScreen::ContainerScreen(shared_ptr<Container> inventory, shared_ptr<Container> container) : AbstractContainerScreen(new ContainerMenu(inventory, container))
 {
diff --git a/Minecraft.Client/ControlsScreen.cpp b/Minecraft.Client/ControlsScreen.cpp
index 487dbb16..c047327d 100644
--- a/Minecraft.Client/ControlsScreen.cpp
+++ b/Minecraft.Client/ControlsScreen.cpp
@@ -2,7 +2,7 @@
 #include "ControlsScreen.h"
 #include "Options.h"
 #include "SmallButton.h"
-#include "..\Minecraft.World\net.minecraft.locale.h"
+#include "../Minecraft.World/net.minecraft.locale.h"
 
 ControlsScreen::ControlsScreen(Screen *lastScreen, Options *options)
 {
diff --git a/Minecraft.Client/CraftingScreen.cpp b/Minecraft.Client/CraftingScreen.cpp
index c28df18d..cc947c0c 100644
--- a/Minecraft.Client/CraftingScreen.cpp
+++ b/Minecraft.Client/CraftingScreen.cpp
@@ -2,7 +2,7 @@
 #include "CraftingScreen.h"
 #include "Textures.h"
 #include "MultiplayerLocalPlayer.h"
-#include "..\Minecraft.World\net.minecraft.world.inventory.h"
+#include "../Minecraft.World/net.minecraft.world.inventory.h"
 
 CraftingScreen::CraftingScreen(shared_ptr<Inventory> inventory, Level *level, int x, int y, int z) : AbstractContainerScreen(new CraftingMenu(inventory, level, x, y, z))
 {
diff --git a/Minecraft.Client/CreateWorldScreen.cpp b/Minecraft.Client/CreateWorldScreen.cpp
index b9856c7e..d9709afb 100644
--- a/Minecraft.Client/CreateWorldScreen.cpp
+++ b/Minecraft.Client/CreateWorldScreen.cpp
@@ -3,12 +3,12 @@
 #include "EditBox.h"
 #include "Button.h"
 #include "SurvivalMode.h"
-#include "..\Minecraft.World\net.minecraft.locale.h"
-#include "..\Minecraft.World\StringHelpers.h"
-#include "..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\Minecraft.World\net.minecraft.world.level.storage.h"
-#include "..\Minecraft.World\SharedConstants.h"
-#include "..\Minecraft.World\Random.h"
+#include "../Minecraft.World/net.minecraft.locale.h"
+#include "../Minecraft.World/StringHelpers.h"
+#include "../Minecraft.World/net.minecraft.world.level.h"
+#include "../Minecraft.World/net.minecraft.world.level.storage.h"
+#include "../Minecraft.World/SharedConstants.h"
+#include "../Minecraft.World/Random.h"
 
 CreateWorldScreen::CreateWorldScreen(Screen *lastScreen)
 {
diff --git a/Minecraft.Client/CreativeMode.cpp b/Minecraft.Client/CreativeMode.cpp
index 48342ebc..b78f5344 100644
--- a/Minecraft.Client/CreativeMode.cpp
+++ b/Minecraft.Client/CreativeMode.cpp
@@ -2,11 +2,11 @@
 #include "CreativeMode.h"
 #include "User.h"
 #include "LocalPlayer.h"
-#include "..\Minecraft.World\\net.minecraft.world.entity.player.h"
-#include "..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "../Minecraft.World//net.minecraft.world.entity.player.h"
+#include "../Minecraft.World/net.minecraft.world.item.h"
+#include "../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../Minecraft.World/net.minecraft.world.level.h"
+#include "../Minecraft.World/net.minecraft.world.level.tile.h"
 
 CreativeMode::CreativeMode(Minecraft *minecraft) : GameMode(minecraft)
 {
diff --git a/Minecraft.Client/CreeperModel.cpp b/Minecraft.Client/CreeperModel.cpp
index 51237ce6..ee889d01 100644
--- a/Minecraft.Client/CreeperModel.cpp
+++ b/Minecraft.Client/CreeperModel.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "..\Minecraft.World\Mth.h"
+#include "../Minecraft.World/Mth.h"
 #include "CreeperModel.h"
 #include "ModelPart.h"
 
diff --git a/Minecraft.Client/CreeperRenderer.cpp b/Minecraft.Client/CreeperRenderer.cpp
index 483d14e3..56b9bd75 100644
--- a/Minecraft.Client/CreeperRenderer.cpp
+++ b/Minecraft.Client/CreeperRenderer.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "CreeperRenderer.h"
 #include "CreeperModel.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.monster.h"
-#include "..\Minecraft.World\Mth.h"
+#include "../Minecraft.World/net.minecraft.world.entity.monster.h"
+#include "../Minecraft.World/Mth.h"
 
 CreeperRenderer::CreeperRenderer() : MobRenderer( new CreeperModel(), 0.5f )
 {
diff --git a/Minecraft.Client/CritParticle.cpp b/Minecraft.Client/CritParticle.cpp
index 6c71b027..b3ed2f05 100644
--- a/Minecraft.Client/CritParticle.cpp
+++ b/Minecraft.Client/CritParticle.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "CritParticle.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.h"
-#include "..\Minecraft.World\Random.h"
-#include "..\Minecraft.World\net.minecraft.world.phys.h"
-#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "../Minecraft.World/net.minecraft.world.entity.h"
+#include "../Minecraft.World/Random.h"
+#include "../Minecraft.World/net.minecraft.world.phys.h"
+#include "../Minecraft.World/net.minecraft.world.level.h"
 
 void CritParticle::_init(Level *level, shared_ptr<Entity> entity, ePARTICLE_TYPE type)
 {
diff --git a/Minecraft.Client/CritParticle2.cpp b/Minecraft.Client/CritParticle2.cpp
index 363e8f08..2620d406 100644
--- a/Minecraft.Client/CritParticle2.cpp
+++ b/Minecraft.Client/CritParticle2.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "CritParticle2.h"
-#include "..\Minecraft.World\JavaMath.h"
+#include "../Minecraft.World/JavaMath.h"
 
 void CritParticle2::_init(double xa, double ya, double za, float scale)
 {
diff --git a/Minecraft.Client/Cube.h b/Minecraft.Client/Cube.h
index 3aee2b65..2dd074e4 100644
--- a/Minecraft.Client/Cube.h
+++ b/Minecraft.Client/Cube.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "..\Minecraft.World\ArrayWithLength.h"
+#include "../Minecraft.World/ArrayWithLength.h"
 #include "Vertex.h"
 #include "Polygon.h"
 
diff --git a/Minecraft.Client/Culler.h b/Minecraft.Client/Culler.h
index bd428ac0..cb1f8a02 100644
--- a/Minecraft.Client/Culler.h
+++ b/Minecraft.Client/Culler.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "..\Minecraft.World\AABB.h"
+#include "../Minecraft.World/AABB.h"
 
 class Culler
 {
diff --git a/Minecraft.Client/DLCTexturePack.cpp b/Minecraft.Client/DLCTexturePack.cpp
index 3d1e05a2..ac4c3cf7 100644
--- a/Minecraft.Client/DLCTexturePack.cpp
+++ b/Minecraft.Client/DLCTexturePack.cpp
@@ -1,19 +1,19 @@
 #include "stdafx.h"
-#include "Common\DLC\DLCGameRulesFile.h"
-#include "Common\DLC\DLCGameRulesHeader.h"
-#include "Common\DLC\DLCGameRules.h"
+#include "Common/DLC/DLCGameRulesFile.h"
+#include "Common/DLC/DLCGameRulesHeader.h"
+#include "Common/DLC/DLCGameRules.h"
 #include "DLCTexturePack.h"
-#include "Common\DLC\DLCColourTableFile.h"
-#include "Common\DLC\DLCUIDataFile.h"
-#include "Common\DLC\DLCTextureFile.h"
-#include "Common\DLC\DLCLocalisationFile.h"
-#include "..\Minecraft.World\StringHelpers.h"
+#include "Common/DLC/DLCColourTableFile.h"
+#include "Common/DLC/DLCUIDataFile.h"
+#include "Common/DLC/DLCTextureFile.h"
+#include "Common/DLC/DLCLocalisationFile.h"
+#include "../Minecraft.World/StringHelpers.h"
 #include "StringTable.h"
-#include "Common\DLC\DLCAudioFile.h"
+#include "Common/DLC/DLCAudioFile.h"
 
 #if defined _XBOX || defined _WINDOWS64
-#include "Xbox\XML\ATGXmlParser.h"
-#include "Xbox\XML\xmlFilesCallback.h"
+#include "Xbox/XML/ATGXmlParser.h"
+#include "Xbox/XML/xmlFilesCallback.h"
 #endif
 
 DLCTexturePack::DLCTexturePack(DWORD id, DLCPack *pack, TexturePack *fallback) : AbstractTexturePack(id, NULL, pack->getName(), fallback)
diff --git a/Minecraft.Client/DeathScreen.cpp b/Minecraft.Client/DeathScreen.cpp
index a06606ec..36fa468d 100644
--- a/Minecraft.Client/DeathScreen.cpp
+++ b/Minecraft.Client/DeathScreen.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "..\Minecraft.World\StringHelpers.h"
+#include "../Minecraft.World/StringHelpers.h"
 #include "DeathScreen.h"
 #include "Button.h"
 #include "MultiplayerLocalPlayer.h"
diff --git a/Minecraft.Client/DefaultRenderer.cpp b/Minecraft.Client/DefaultRenderer.cpp
index d4c15737..cfe88911 100644
--- a/Minecraft.Client/DefaultRenderer.cpp
+++ b/Minecraft.Client/DefaultRenderer.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "DefaultRenderer.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.h"
+#include "../Minecraft.World/net.minecraft.world.entity.h"
 
 void DefaultRenderer::render(shared_ptr<Entity> entity, double x, double y, double z, float rot, float a)
 {
diff --git a/Minecraft.Client/DefaultTexturePack.cpp b/Minecraft.Client/DefaultTexturePack.cpp
index d2974b6d..4a2e46f4 100644
--- a/Minecraft.Client/DefaultTexturePack.cpp
+++ b/Minecraft.Client/DefaultTexturePack.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "DefaultTexturePack.h"
 #include "Textures.h"
-#include "..\Minecraft.World\StringHelpers.h"
+#include "../Minecraft.World/StringHelpers.h"
 
 
 DefaultTexturePack::DefaultTexturePack() : AbstractTexturePack(0, NULL, L"Minecraft", NULL)
diff --git a/Minecraft.Client/DemoLevel.cpp b/Minecraft.Client/DemoLevel.cpp
index 52edc0ba..7ae62af1 100644
--- a/Minecraft.Client/DemoLevel.cpp
+++ b/Minecraft.Client/DemoLevel.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "DemoLevel.h"
-#include "..\Minecraft.World\net.minecraft.world.level.storage.h"
+#include "../Minecraft.World/net.minecraft.world.level.storage.h"
 
 DemoLevel::DemoLevel(shared_ptr<LevelStorage> levelStorage, const wstring& levelName) : Level(levelStorage, levelName, DEMO_LEVEL_SEED)
 {
diff --git a/Minecraft.Client/DemoLevel.h b/Minecraft.Client/DemoLevel.h
index 8364d5b4..8a61bbb6 100644
--- a/Minecraft.Client/DemoLevel.h
+++ b/Minecraft.Client/DemoLevel.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "../Minecraft.World/net.minecraft.world.level.h"
 
 class DemoLevel : public Level
 {
diff --git a/Minecraft.Client/DemoMode.cpp b/Minecraft.Client/DemoMode.cpp
index 3b24af7a..75d0ab9f 100644
--- a/Minecraft.Client/DemoMode.cpp
+++ b/Minecraft.Client/DemoMode.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "DemoMode.h"
-#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "../Minecraft.World/net.minecraft.world.level.h"
 
 DemoMode::DemoMode(Minecraft *minecraft) : SurvivalMode(minecraft)
 {
diff --git a/Minecraft.Client/DerivedServerLevel.cpp b/Minecraft.Client/DerivedServerLevel.cpp
index a67408d7..b1788b2d 100644
--- a/Minecraft.Client/DerivedServerLevel.cpp
+++ b/Minecraft.Client/DerivedServerLevel.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "DerivedServerLevel.h"
-#include "..\Minecraft.World\SavedDataStorage.h"
-#include "..\Minecraft.World\DerivedLevelData.h"
+#include "../Minecraft.World/SavedDataStorage.h"
+#include "../Minecraft.World/DerivedLevelData.h"
 
 DerivedServerLevel::DerivedServerLevel(MinecraftServer *server, shared_ptr<LevelStorage> levelStorage, const wstring& levelName, int dimension, LevelSettings *levelSettings, ServerLevel *wrapped)
 	: ServerLevel(server, levelStorage, levelName, dimension, levelSettings)
diff --git a/Minecraft.Client/DisconnectedScreen.cpp b/Minecraft.Client/DisconnectedScreen.cpp
index b445e4d0..815ce20a 100644
--- a/Minecraft.Client/DisconnectedScreen.cpp
+++ b/Minecraft.Client/DisconnectedScreen.cpp
@@ -2,7 +2,7 @@
 #include "DisconnectedScreen.h"
 #include "TitleScreen.h"
 #include "Button.h"
-#include "..\Minecraft.World\net.minecraft.locale.h"
+#include "../Minecraft.World/net.minecraft.locale.h"
 
 DisconnectedScreen::DisconnectedScreen(const wstring& title, const wstring reason, void *reasonObjects, ...)
 {
diff --git a/Minecraft.Client/DragonBreathParticle.cpp b/Minecraft.Client/DragonBreathParticle.cpp
index 0d0f75f3..6bce3739 100644
--- a/Minecraft.Client/DragonBreathParticle.cpp
+++ b/Minecraft.Client/DragonBreathParticle.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "..\Minecraft.World\JavaMath.h"
+#include "../Minecraft.World/JavaMath.h"
 #include "DragonBreathParticle.h"
 
 void DragonBreathParticle::init(Level *level, double x, double y, double z, double xa, double ya, double za, float scale)
diff --git a/Minecraft.Client/DragonModel.cpp b/Minecraft.Client/DragonModel.cpp
index 39861829..a112b584 100644
--- a/Minecraft.Client/DragonModel.cpp
+++ b/Minecraft.Client/DragonModel.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "DragonModel.h"
-#include "..\Minecraft.World\Mth.h"
-#include "..\Minecraft.World\Enderdragon.h"
+#include "../Minecraft.World/Mth.h"
+#include "../Minecraft.World/Enderdragon.h"
 
 DragonModel::DragonModel(float g) : Model()
 {
diff --git a/Minecraft.Client/DripParticle.cpp b/Minecraft.Client/DripParticle.cpp
index 9463976e..2bdd922c 100644
--- a/Minecraft.Client/DripParticle.cpp
+++ b/Minecraft.Client/DripParticle.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
-#include "..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\Minecraft.World\net.minecraft.world.level.material.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
-#include "..\Minecraft.World\JavaMath.h"
-#include "..\Minecraft.World\Mth.h"
+#include "../Minecraft.World/net.minecraft.world.level.h"
+#include "../Minecraft.World/net.minecraft.world.level.material.h"
+#include "../Minecraft.World/net.minecraft.world.level.tile.h"
+#include "../Minecraft.World/JavaMath.h"
+#include "../Minecraft.World/Mth.h"
 #include "DripParticle.h"
 
 DripParticle::DripParticle(Level *level, double x, double y, double z, Material *material) : Particle(level, x, y, z, 0, 0, 0)
diff --git a/Minecraft.Client/Durango/Durango_App.cpp b/Minecraft.Client/Durango/Durango_App.cpp
index 2ec81a29..cde1b4a9 100644
--- a/Minecraft.Client/Durango/Durango_App.cpp
+++ b/Minecraft.Client/Durango/Durango_App.cpp
@@ -1,17 +1,17 @@
 #include "stdafx.h"
-#include "..\Common\Consoles_App.h"
-#include "..\User.h"
-#include "..\..\Minecraft.Client\Minecraft.h"
-#include "..\..\Minecraft.Client\MinecraftServer.h"
-#include "..\..\Minecraft.Client\PlayerList.h"
-#include "..\..\Minecraft.Client\ServerPlayer.h"
-#include "..\..\Minecraft.World\Level.h"
-#include "..\..\Minecraft.World\LevelSettings.h"
-#include "..\..\Minecraft.World\BiomeSource.h"
-#include "..\..\Minecraft.World\LevelType.h"
-#include "ServiceConfig\Events-XBLA.8-149E11AEEvents.h"
-#include "..\..\Minecraft.World\DurangoStats.h"
-#include "..\..\Minecraft.Client\Durango\XML\xmlFilesCallback.h"
+#include "../Common/Consoles_App.h"
+#include "../User.h"
+#include "../../Minecraft.Client/Minecraft.h"
+#include "../../Minecraft.Client/MinecraftServer.h"
+#include "../../Minecraft.Client/PlayerList.h"
+#include "../../Minecraft.Client/ServerPlayer.h"
+#include "../../Minecraft.World/Level.h"
+#include "../../Minecraft.World/LevelSettings.h"
+#include "../../Minecraft.World/BiomeSource.h"
+#include "../../Minecraft.World/LevelType.h"
+#include "ServiceConfig/Events-XBLA.8-149E11AEEvents.h"
+#include "../../Minecraft.World/DurangoStats.h"
+#include "../../Minecraft.Client/Durango/XML/xmlFilesCallback.h"
 
 CConsoleMinecraftApp app;
 
diff --git a/Minecraft.Client/Durango/Durango_Minecraft.cpp b/Minecraft.Client/Durango/Durango_Minecraft.cpp
index 48d5c319..339cdb2f 100644
--- a/Minecraft.Client/Durango/Durango_Minecraft.cpp
+++ b/Minecraft.Client/Durango/Durango_Minecraft.cpp
@@ -4,35 +4,35 @@
 #include "stdafx.h"
 
 #include <assert.h>
-#include "..\MinecraftServer.h"
-#include "..\LocalPlayer.h"
-#include "..\..\Minecraft.World\ItemInstance.h"
-#include "..\..\Minecraft.World\MapItem.h"
-#include "..\..\Minecraft.World\Recipes.h"
-#include "..\..\Minecraft.World\Recipy.h"
-#include "..\..\Minecraft.World\Language.h"
-#include "..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\Minecraft.World\AABB.h"
-#include "..\..\Minecraft.World\Vec3.h"
-#include "..\..\Minecraft.World\Level.h"
-#include "..\..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "../MinecraftServer.h"
+#include "../LocalPlayer.h"
+#include "../../Minecraft.World/ItemInstance.h"
+#include "../../Minecraft.World/MapItem.h"
+#include "../../Minecraft.World/Recipes.h"
+#include "../../Minecraft.World/Recipy.h"
+#include "../../Minecraft.World/Language.h"
+#include "../../Minecraft.World/StringHelpers.h"
+#include "../../Minecraft.World/AABB.h"
+#include "../../Minecraft.World/Vec3.h"
+#include "../../Minecraft.World/Level.h"
+#include "../../Minecraft.World/net.minecraft.world.level.tile.h"
 
-#include "Leaderboards\GameProgress.h"
-#include "..\ClientConnection.h"
-#include "..\User.h"
-#include "..\..\Minecraft.World\Socket.h"
-#include "..\..\Minecraft.World\ThreadName.h"
-#include "..\..\Minecraft.Client\StatsCounter.h"
-#include "..\ConnectScreen.h"
-#include "Leaderboards\DurangoLeaderboardManager.h"
-#include "..\..\Minecraft.Client\Tesselator.h"
-#include "..\..\Minecraft.Client\Options.h"
-#include "Sentient\SentientManager.h"
-#include "..\..\Minecraft.World\IntCache.h"
-#include "..\Textures.h"
+#include "Leaderboards/GameProgress.h"
+#include "../ClientConnection.h"
+#include "../User.h"
+#include "../../Minecraft.World/Socket.h"
+#include "../../Minecraft.World/ThreadName.h"
+#include "../../Minecraft.Client/StatsCounter.h"
+#include "../ConnectScreen.h"
+#include "Leaderboards/DurangoLeaderboardManager.h"
+#include "../../Minecraft.Client/Tesselator.h"
+#include "../../Minecraft.Client/Options.h"
+#include "Sentient/SentientManager.h"
+#include "../../Minecraft.World/IntCache.h"
+#include "../Textures.h"
 #include "Resource.h"
-#include "..\..\Minecraft.World\compression.h"
-#include "..\..\Minecraft.World\OldChunkStorage.h"
+#include "../../Minecraft.World/compression.h"
+#include "../../Minecraft.World/OldChunkStorage.h"
 #include <agile.h>
 
 //using namespace Windows::Xbox::Input;
diff --git a/Minecraft.Client/Durango/Durango_UIController.h b/Minecraft.Client/Durango/Durango_UIController.h
index 28fe08ad..4ad3410e 100644
--- a/Minecraft.Client/Durango/Durango_UIController.h
+++ b/Minecraft.Client/Durango/Durango_UIController.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "..\Common\UI\UIController.h"
+#include "../Common/UI/UIController.h"
 
 class ConsoleUIController : public UIController
 {
diff --git a/Minecraft.Client/Durango/Leaderboards/DurangoLeaderboardManager.cpp b/Minecraft.Client/Durango/Leaderboards/DurangoLeaderboardManager.cpp
index cbedb033..31f8a57c 100644
--- a/Minecraft.Client/Durango/Leaderboards/DurangoLeaderboardManager.cpp
+++ b/Minecraft.Client/Durango/Leaderboards/DurangoLeaderboardManager.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "DurangoLeaderboardManager.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "../../../Minecraft.World/StringHelpers.h"
 
 namespace WFC = Windows::Foundation::Collections;
 namespace CC = concurrency;
diff --git a/Minecraft.Client/Durango/Leaderboards/DurangoLeaderboardManager.h b/Minecraft.Client/Durango/Leaderboards/DurangoLeaderboardManager.h
index 233d8b71..2425b949 100644
--- a/Minecraft.Client/Durango/Leaderboards/DurangoLeaderboardManager.h
+++ b/Minecraft.Client/Durango/Leaderboards/DurangoLeaderboardManager.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Common\Leaderboards\LeaderboardManager.h"
+#include "Common/Leaderboards/LeaderboardManager.h"
 
 namespace P = Platform;
 namespace PC = Platform::Collections;
diff --git a/Minecraft.Client/Durango/Leaderboards/DurangoStatsDebugger.cpp b/Minecraft.Client/Durango/Leaderboards/DurangoStatsDebugger.cpp
index caa5857e..5e0f74f8 100644
--- a/Minecraft.Client/Durango/Leaderboards/DurangoStatsDebugger.cpp
+++ b/Minecraft.Client/Durango/Leaderboards/DurangoStatsDebugger.cpp
@@ -1,15 +1,15 @@
 #include "stdafx.h"
 
-#include "..\Minecraft.World\Tile.h"
-#include "..\Minecraft.World\Item.h"
+#include "../Minecraft.World/Tile.h"
+#include "../Minecraft.World/Item.h"
 
-#include "..\Minecraft.World\DurangoStats.h"
+#include "../Minecraft.World/DurangoStats.h"
 
-#include "..\Minecraft.World\EntityIO.h"
+#include "../Minecraft.World/EntityIO.h"
 
-#include "..\Minecraft.World\StringHelpers.h"
+#include "../Minecraft.World/StringHelpers.h"
 
-#include "Common\Console_Awards_enum.h"
+#include "Common/Console_Awards_enum.h"
 
 #include "DurangoStatsDebugger.h"
 
diff --git a/Minecraft.Client/Durango/Leaderboards/GameProgress.cpp b/Minecraft.Client/Durango/Leaderboards/GameProgress.cpp
index dd07f3e9..0ad923b0 100644
--- a/Minecraft.Client/Durango/Leaderboards/GameProgress.cpp
+++ b/Minecraft.Client/Durango/Leaderboards/GameProgress.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 
-#include "Durango\ServiceConfig\Events-XBLA.8-149E11AEEvents.h"
+#include "Durango/ServiceConfig/Events-XBLA.8-149E11AEEvents.h"
 
-#include "..\Minecraft.World\DurangoStats.h"
+#include "../Minecraft.World/DurangoStats.h"
 
 #include "GameProgress.h"
 
diff --git a/Minecraft.Client/Durango/Network/DQRNetworkManager.cpp b/Minecraft.Client/Durango/Network/DQRNetworkManager.cpp
index f13cc4aa..568ae180 100644
--- a/Minecraft.Client/Durango/Network/DQRNetworkManager.cpp
+++ b/Minecraft.Client/Durango/Network/DQRNetworkManager.cpp
@@ -5,11 +5,11 @@
 #include <collection.h>
 #include <ppltasks.h>
 #include <ws2tcpip.h>
-#include "..\Minecraft.World\StringHelpers.h"
+#include "../Minecraft.World/StringHelpers.h"
 #include "base64.h"
 
 #ifdef _DURANGO
-#include "..\Minecraft.World\DurangoStats.h"
+#include "../Minecraft.World/DurangoStats.h"
 #endif
 
 #include "ChatIntegrationLayer.h"
diff --git a/Minecraft.Client/Durango/Network/DQRNetworkManager.h b/Minecraft.Client/Durango/Network/DQRNetworkManager.h
index 5f7b8d90..77065613 100644
--- a/Minecraft.Client/Durango/Network/DQRNetworkManager.h
+++ b/Minecraft.Client/Durango/Network/DQRNetworkManager.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "DQRNetworkPlayer.h"
-#include "..\Minecraft.World\C4JThread.h"
+#include "../Minecraft.World/C4JThread.h"
 #include <collection.h>
 
 class IDQRNetworkManagerListener;
diff --git a/Minecraft.Client/Durango/Network/DQRNetworkManager_FriendSessions.cpp b/Minecraft.Client/Durango/Network/DQRNetworkManager_FriendSessions.cpp
index 3a14a2d5..29cd5c9b 100644
--- a/Minecraft.Client/Durango/Network/DQRNetworkManager_FriendSessions.cpp
+++ b/Minecraft.Client/Durango/Network/DQRNetworkManager_FriendSessions.cpp
@@ -5,11 +5,11 @@
 #include <collection.h>
 #include <ppltasks.h>
 #include <ws2tcpip.h>
-#include "..\Minecraft.World\StringHelpers.h"
+#include "../Minecraft.World/StringHelpers.h"
 #include "base64.h"
 
 #ifdef _DURANGO
-#include "..\Minecraft.World\DurangoStats.h"
+#include "../Minecraft.World/DurangoStats.h"
 #endif
 
 #include "ChatIntegrationLayer.h"
diff --git a/Minecraft.Client/Durango/Network/DQRNetworkManager_Log.cpp b/Minecraft.Client/Durango/Network/DQRNetworkManager_Log.cpp
index cf66ea6f..ea353246 100644
--- a/Minecraft.Client/Durango/Network/DQRNetworkManager_Log.cpp
+++ b/Minecraft.Client/Durango/Network/DQRNetworkManager_Log.cpp
@@ -5,11 +5,11 @@
 #include <collection.h>
 #include <ppltasks.h>
 #include <ws2tcpip.h>
-#include "..\Minecraft.World\StringHelpers.h"
+#include "../Minecraft.World/StringHelpers.h"
 #include "base64.h"
 
 #ifdef _DURANGO
-#include "..\Minecraft.World\DurangoStats.h"
+#include "../Minecraft.World/DurangoStats.h"
 #endif
 
 #include "ChatIntegrationLayer.h"
diff --git a/Minecraft.Client/Durango/Network/DQRNetworkManager_SendReceive.cpp b/Minecraft.Client/Durango/Network/DQRNetworkManager_SendReceive.cpp
index 9232d095..d4b40ab1 100644
--- a/Minecraft.Client/Durango/Network/DQRNetworkManager_SendReceive.cpp
+++ b/Minecraft.Client/Durango/Network/DQRNetworkManager_SendReceive.cpp
@@ -5,11 +5,11 @@
 #include <collection.h>
 #include <ppltasks.h>
 #include <ws2tcpip.h>
-#include "..\Minecraft.World\StringHelpers.h"
+#include "../Minecraft.World/StringHelpers.h"
 #include "base64.h"
 
 #ifdef _DURANGO
-#include "..\Minecraft.World\DurangoStats.h"
+#include "../Minecraft.World/DurangoStats.h"
 #endif
 
 #include "ChatIntegrationLayer.h"
diff --git a/Minecraft.Client/Durango/Network/DQRNetworkManager_XRNSEvent.cpp b/Minecraft.Client/Durango/Network/DQRNetworkManager_XRNSEvent.cpp
index c985a191..5054e66b 100644
--- a/Minecraft.Client/Durango/Network/DQRNetworkManager_XRNSEvent.cpp
+++ b/Minecraft.Client/Durango/Network/DQRNetworkManager_XRNSEvent.cpp
@@ -5,11 +5,11 @@
 #include <collection.h>
 #include <ppltasks.h>
 #include <ws2tcpip.h>
-#include "..\Minecraft.World\StringHelpers.h"
+#include "../Minecraft.World/StringHelpers.h"
 #include "base64.h"
 
 #ifdef _DURANGO
-#include "..\Minecraft.World\DurangoStats.h"
+#include "../Minecraft.World/DurangoStats.h"
 #endif
 
 #include "ChatIntegrationLayer.h"
diff --git a/Minecraft.Client/Durango/Network/NetworkPlayerDurango.h b/Minecraft.Client/Durango/Network/NetworkPlayerDurango.h
index c95e8aef..2fef6dfa 100644
--- a/Minecraft.Client/Durango/Network/NetworkPlayerDurango.h
+++ b/Minecraft.Client/Durango/Network/NetworkPlayerDurango.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "..\..\Common\Network\NetworkPlayerInterface.h"
+#include "../../Common/Network/NetworkPlayerInterface.h"
 #include "DQRNetworkPlayer.h"
 
 // This is an implementation of the INetworkPlayer interface, for Durango. It effectively wraps the DQRNetworkPlayer class in a non-platform-specific way.
diff --git a/Minecraft.Client/Durango/Network/PlatformNetworkManagerDurango.cpp b/Minecraft.Client/Durango/Network/PlatformNetworkManagerDurango.cpp
index 3efba5ed..a3e4b52c 100644
--- a/Minecraft.Client/Durango/Network/PlatformNetworkManagerDurango.cpp
+++ b/Minecraft.Client/Durango/Network/PlatformNetworkManagerDurango.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"	
-#include "..\..\..\Minecraft.World\Socket.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "../../../Minecraft.World/Socket.h"
+#include "../../../Minecraft.World/StringHelpers.h"
 #include "PlatformNetworkManagerDurango.h"
 #include "NetworkPlayerDurango.h"
 
diff --git a/Minecraft.Client/Durango/Network/PlatformNetworkManagerDurango.h b/Minecraft.Client/Durango/Network/PlatformNetworkManagerDurango.h
index 55807227..2d78657f 100644
--- a/Minecraft.Client/Durango/Network/PlatformNetworkManagerDurango.h
+++ b/Minecraft.Client/Durango/Network/PlatformNetworkManagerDurango.h
@@ -1,10 +1,10 @@
 #pragma once
 using namespace std;
 #include <vector>
-#include "..\..\..\Minecraft.World\C4JThread.h"
-#include "..\..\Common\Network\NetworkPlayerInterface.h"
-#include "..\..\Common\Network\PlatformNetworkManagerInterface.h"
-#include "..\..\Common\Network\SessionInfo.h"
+#include "../../../Minecraft.World/C4JThread.h"
+#include "../../Common/Network/NetworkPlayerInterface.h"
+#include "../../Common/Network/PlatformNetworkManagerInterface.h"
+#include "../../Common/Network/SessionInfo.h"
 #include "DQRNetworkManager.h"
 
 #define MINECRAFT_DURANGO_PARTY_SEARCH_DELAY_MILLISECONDS 30000
diff --git a/Minecraft.Client/Durango/Sentient/DurangoTelemetry.cpp b/Minecraft.Client/Durango/Sentient/DurangoTelemetry.cpp
index d51ce966..1f1dff71 100644
--- a/Minecraft.Client/Durango/Sentient/DurangoTelemetry.cpp
+++ b/Minecraft.Client/Durango/Sentient/DurangoTelemetry.cpp
@@ -1,16 +1,16 @@
 #include "stdafx.h"
 
-#include "..\Minecraft.World\StringHelpers.h"
+#include "../Minecraft.World/StringHelpers.h"
 
-#include "..\Minecraft.World\Player.h"
-#include "..\Minecraft.World\Level.h"
-#include "..\Minecraft.World\LevelData.h"
-#include "..\Minecraft.World\LevelSettings.h"
+#include "../Minecraft.World/Player.h"
+#include "../Minecraft.World/Level.h"
+#include "../Minecraft.World/LevelData.h"
+#include "../Minecraft.World/LevelSettings.h"
 
-#include "Common\Network\GameNetworkManager.h"
+#include "Common/Network/GameNetworkManager.h"
 #include "MultiPlayerLocalPlayer.h"
 
-#include "..\ServiceConfig\Events-XBLA.8-149E11AEEvents.h"
+#include "../ServiceConfig/Events-XBLA.8-149E11AEEvents.h"
 
 #include "DurangoTelemetry.h"
 
diff --git a/Minecraft.Client/Durango/Sentient/DurangoTelemetry.h b/Minecraft.Client/Durango/Sentient/DurangoTelemetry.h
index 4f086696..0bab9193 100644
--- a/Minecraft.Client/Durango/Sentient/DurangoTelemetry.h
+++ b/Minecraft.Client/Durango/Sentient/DurangoTelemetry.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "..\..\..\Minecraft.World\DurangoStats.h"
+#include "../../../Minecraft.World/DurangoStats.h"
 
-#include "..\..\Common\Telemetry\TelemetryManager.h"
+#include "../../Common/Telemetry/TelemetryManager.h"
 
 class CDurangoTelemetryManager : public CTelemetryManager
 {
diff --git a/Minecraft.Client/Durango/XboxGameMode.cpp b/Minecraft.Client/Durango/XboxGameMode.cpp
index 1b55fdd9..709a6589 100644
--- a/Minecraft.Client/Durango/XboxGameMode.cpp
+++ b/Minecraft.Client/Durango/XboxGameMode.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "XboxGameMode.h"
-#include "..\Common\Tutorial\Tutorial.h"
+#include "../Common/Tutorial/Tutorial.h"
 
 XboxGameMode::XboxGameMode(int iPad, Minecraft *minecraft, ClientConnection *connection)
 	: TutorialMode(iPad, minecraft, connection)
diff --git a/Minecraft.Client/Durango/XboxGameMode.h b/Minecraft.Client/Durango/XboxGameMode.h
index 347cdf30..a9f0d6cd 100644
--- a/Minecraft.Client/Durango/XboxGameMode.h
+++ b/Minecraft.Client/Durango/XboxGameMode.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "..\Common\Tutorial\TutorialMode.h"
+#include "../Common/Tutorial/TutorialMode.h"
 
 class XboxGameMode : public TutorialMode
 {
diff --git a/Minecraft.Client/EchantmentTableParticle.cpp b/Minecraft.Client/EchantmentTableParticle.cpp
index 5af7ef36..9cfdcda0 100644
--- a/Minecraft.Client/EchantmentTableParticle.cpp
+++ b/Minecraft.Client/EchantmentTableParticle.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "..\Minecraft.World\JavaMath.h"
+#include "../Minecraft.World/JavaMath.h"
 #include "EchantmentTableParticle.h"
 
 EchantmentTableParticle::EchantmentTableParticle(Level *level, double x, double y, double z, double xd, double yd, double zd) : Particle(level, x, y, z, xd, yd, zd)
diff --git a/Minecraft.Client/EditBox.cpp b/Minecraft.Client/EditBox.cpp
index 54ee62ef..e4d71cb9 100644
--- a/Minecraft.Client/EditBox.cpp
+++ b/Minecraft.Client/EditBox.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "EditBox.h"
-#include "..\Minecraft.World\SharedConstants.h"
+#include "../Minecraft.World/SharedConstants.h"
 
 EditBox::EditBox(Screen *screen, Font *font, int x, int y, int width, int height, const wstring& value)
 {
diff --git a/Minecraft.Client/EnchantTableRenderer.cpp b/Minecraft.Client/EnchantTableRenderer.cpp
index 43f2b040..41e01644 100644
--- a/Minecraft.Client/EnchantTableRenderer.cpp
+++ b/Minecraft.Client/EnchantTableRenderer.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "BookModel.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
-#include "..\Minecraft.World\Mth.h"
+#include "../Minecraft.World/net.minecraft.world.level.tile.entity.h"
+#include "../Minecraft.World/Mth.h"
 #include "EnchantTableRenderer.h"
 
 EnchantTableRenderer::EnchantTableRenderer()
diff --git a/Minecraft.Client/EnderChestRenderer.cpp b/Minecraft.Client/EnderChestRenderer.cpp
index 2996b65f..8befdc99 100644
--- a/Minecraft.Client/EnderChestRenderer.cpp
+++ b/Minecraft.Client/EnderChestRenderer.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
+#include "../Minecraft.World/net.minecraft.world.level.tile.entity.h"
 #include "ModelPart.h"
 #include "EnderChestRenderer.h"
 
diff --git a/Minecraft.Client/EnderCrystalRenderer.cpp b/Minecraft.Client/EnderCrystalRenderer.cpp
index 452206bc..cde8a812 100644
--- a/Minecraft.Client/EnderCrystalRenderer.cpp
+++ b/Minecraft.Client/EnderCrystalRenderer.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "EnderCrystalModel.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.boss.enderdragon.h"
+#include "../Minecraft.World/net.minecraft.world.entity.boss.enderdragon.h"
 #include "EnderCrystalRenderer.h"
 
 EnderCrystalRenderer::EnderCrystalRenderer()
diff --git a/Minecraft.Client/EnderDragonRenderer.cpp b/Minecraft.Client/EnderDragonRenderer.cpp
index 8c531d4e..961c00ca 100644
--- a/Minecraft.Client/EnderDragonRenderer.cpp
+++ b/Minecraft.Client/EnderDragonRenderer.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "DragonModel.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.boss.enderdragon.h"
+#include "../Minecraft.World/net.minecraft.world.entity.boss.enderdragon.h"
 #include "Tesselator.h"
 #include "Lighting.h"
 #include "EnderDragonRenderer.h"
diff --git a/Minecraft.Client/EnderParticle.cpp b/Minecraft.Client/EnderParticle.cpp
index 3889bf92..efbad137 100644
--- a/Minecraft.Client/EnderParticle.cpp
+++ b/Minecraft.Client/EnderParticle.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "EnderParticle.h"
-#include "..\Minecraft.World\JavaMath.h"
-#include "..\Minecraft.World\Random.h"
+#include "../Minecraft.World/JavaMath.h"
+#include "../Minecraft.World/Random.h"
 
 // 4J Stu - This class was originally "PortalParticle" but I have split the two uses of the particle
 // End creatures/items (e.g. EnderMan, EyeOfEnder, etc) use this particle
diff --git a/Minecraft.Client/EndermanRenderer.cpp b/Minecraft.Client/EndermanRenderer.cpp
index 8802376a..75f2a2d9 100644
--- a/Minecraft.Client/EndermanRenderer.cpp
+++ b/Minecraft.Client/EndermanRenderer.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "EndermanRenderer.h"
 #include "EndermanModel.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.monster.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "../Minecraft.World/net.minecraft.world.entity.monster.h"
+#include "../Minecraft.World/net.minecraft.world.level.tile.h"
 
 EndermanRenderer::EndermanRenderer() : MobRenderer(new EndermanModel(), 0.5f)
 {
diff --git a/Minecraft.Client/EntityRenderDispatcher.cpp b/Minecraft.Client/EntityRenderDispatcher.cpp
index dfc9a11e..cba92df0 100644
--- a/Minecraft.Client/EntityRenderDispatcher.cpp
+++ b/Minecraft.Client/EntityRenderDispatcher.cpp
@@ -1,18 +1,18 @@
 #include "stdafx.h"
 #include "EntityRenderDispatcher.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.projectile.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.monster.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.item.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.global.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.player.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.boss.enderdragon.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.npc.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.item.alchemy.h"
+#include "../Minecraft.World/net.minecraft.world.entity.projectile.h"
+#include "../Minecraft.World/net.minecraft.world.entity.animal.h"
+#include "../Minecraft.World/net.minecraft.world.entity.monster.h"
+#include "../Minecraft.World/net.minecraft.world.entity.item.h"
+#include "../Minecraft.World/net.minecraft.world.entity.global.h"
+#include "../Minecraft.World/net.minecraft.world.entity.player.h"
+#include "../Minecraft.World/net.minecraft.world.entity.boss.enderdragon.h"
+#include "../Minecraft.World/net.minecraft.world.entity.npc.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.item.alchemy.h"
 #include "SpiderRenderer.h"
 #include "PigRenderer.h"
 #include "SheepRenderer.h"
diff --git a/Minecraft.Client/EntityRenderDispatcher.h b/Minecraft.Client/EntityRenderDispatcher.h
index 248be18f..c1a3d447 100644
--- a/Minecraft.Client/EntityRenderDispatcher.h
+++ b/Minecraft.Client/EntityRenderDispatcher.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "EntityRenderer.h"
-#include "..\Minecraft.World\Entity.h"
-#include "..\Minecraft.World\JavaIntHash.h"
+#include "../Minecraft.World/Entity.h"
+#include "../Minecraft.World/JavaIntHash.h"
 class font;
 using namespace std;
 
diff --git a/Minecraft.Client/EntityRenderer.cpp b/Minecraft.Client/EntityRenderer.cpp
index 6c0247ed..137379d1 100644
--- a/Minecraft.Client/EntityRenderer.cpp
+++ b/Minecraft.Client/EntityRenderer.cpp
@@ -3,13 +3,13 @@
 #include "HumanoidModel.h"
 #include "EntityRenderDispatcher.h"
 #include "Options.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
-#include "..\Minecraft.World\net.minecraft.world.h"
-#include "..\Minecraft.World\Entity.h"
-#include "..\Minecraft.World\Level.h"
-#include "..\Minecraft.World\AABB.h"
-#include "..\Minecraft.World\Mth.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
+#include "../Minecraft.World/net.minecraft.world.level.tile.h"
+#include "../Minecraft.World/net.minecraft.world.h"
+#include "../Minecraft.World/Entity.h"
+#include "../Minecraft.World/Level.h"
+#include "../Minecraft.World/AABB.h"
+#include "../Minecraft.World/Mth.h"
+#include "../Minecraft.World/net.minecraft.world.entity.animal.h"
 #include "LocalPlayer.h"
 
 // 4J - added
diff --git a/Minecraft.Client/EntityTileRenderer.cpp b/Minecraft.Client/EntityTileRenderer.cpp
index a2301d42..93cd95e6 100644
--- a/Minecraft.Client/EntityTileRenderer.cpp
+++ b/Minecraft.Client/EntityTileRenderer.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "EntityTileRenderer.h"
 #include "TileEntityRenderDispatcher.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
+#include "../Minecraft.World/net.minecraft.world.level.tile.entity.h"
 
 EntityTileRenderer *EntityTileRenderer::instance = new EntityTileRenderer;
 
diff --git a/Minecraft.Client/EntityTracker.cpp b/Minecraft.Client/EntityTracker.cpp
index 8f1dbcd8..396f1285 100644
--- a/Minecraft.Client/EntityTracker.cpp
+++ b/Minecraft.Client/EntityTracker.cpp
@@ -5,19 +5,19 @@
 #include "TrackedEntity.h"
 #include "ServerPlayer.h"
 #include "ServerLevel.h"
-#include "..\Minecraft.World\Mth.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.item.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.monster.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.global.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.projectile.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.boss.enderdragon.h"
-#include "..\Minecraft.World\net.minecraft.network.packet.h"
-#include "..\Minecraft.World\net.minecraft.network.h"
-#include "..\Minecraft.World\net.minecraft.world.level.dimension.h"
-#include "..\Minecraft.World\BasicTypeContainers.h"
+#include "../Minecraft.World/Mth.h"
+#include "../Minecraft.World/net.minecraft.world.entity.h"
+#include "../Minecraft.World/net.minecraft.world.entity.item.h"
+#include "../Minecraft.World/net.minecraft.world.entity.monster.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.global.h"
+#include "../Minecraft.World/net.minecraft.world.entity.projectile.h"
+#include "../Minecraft.World/net.minecraft.world.entity.boss.enderdragon.h"
+#include "../Minecraft.World/net.minecraft.network.packet.h"
+#include "../Minecraft.World/net.minecraft.network.h"
+#include "../Minecraft.World/net.minecraft.world.level.dimension.h"
+#include "../Minecraft.World/BasicTypeContainers.h"
 #include "PlayerConnection.h"
 
 EntityTracker::EntityTracker(ServerLevel *level)
diff --git a/Minecraft.Client/EntityTracker.h b/Minecraft.Client/EntityTracker.h
index 82b01d07..3c018416 100644
--- a/Minecraft.Client/EntityTracker.h
+++ b/Minecraft.Client/EntityTracker.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "..\Minecraft.World\HashExtension.h"
-#include "..\Minecraft.World\JavaIntHash.h"
+#include "../Minecraft.World/HashExtension.h"
+#include "../Minecraft.World/JavaIntHash.h"
 class Entity;
 class ServerPlayer;
 class TrackedEntity;
diff --git a/Minecraft.Client/ExperienceOrbRenderer.cpp b/Minecraft.Client/ExperienceOrbRenderer.cpp
index 1771f833..f84311ae 100644
--- a/Minecraft.Client/ExperienceOrbRenderer.cpp
+++ b/Minecraft.Client/ExperienceOrbRenderer.cpp
@@ -1,12 +1,12 @@
 #include "stdafx.h"
 #include "ExperienceOrbRenderer.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.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.tile.h"
+#include "../Minecraft.World/net.minecraft.world.item.h"
 #include "Tesselator.h"
 #include "EntityRenderDispatcher.h"
-#include "..\Minecraft.World\Mth.h"
-#include "..\Minecraft.World\JavaMath.h"
+#include "../Minecraft.World/Mth.h"
+#include "../Minecraft.World/JavaMath.h"
 
 ExperienceOrbRenderer::ExperienceOrbRenderer()
 {
diff --git a/Minecraft.Client/ExplodeParticle.cpp b/Minecraft.Client/ExplodeParticle.cpp
index fa950a03..fb39d47c 100644
--- a/Minecraft.Client/ExplodeParticle.cpp
+++ b/Minecraft.Client/ExplodeParticle.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "ExplodeParticle.h"
-#include "..\Minecraft.World\JavaMath.h"
-#include "..\Minecraft.World\Random.h"
+#include "../Minecraft.World/JavaMath.h"
+#include "../Minecraft.World/Random.h"
 
 ExplodeParticle::ExplodeParticle(Level *level, double x, double y, double z, double xa, double ya, double za) : Particle(level, x, y, z, xa, ya, za)
 {
diff --git a/Minecraft.Client/Extrax64Stubs.cpp b/Minecraft.Client/Extrax64Stubs.cpp
index 334f0123..1bb6c3d5 100644
--- a/Minecraft.Client/Extrax64Stubs.cpp
+++ b/Minecraft.Client/Extrax64Stubs.cpp
@@ -4,33 +4,33 @@
 #endif // __PS3__
 
 #ifdef __PS3__
-#include "PS3\Sentient\SentientManager.h"
+#include "PS3/Sentient/SentientManager.h"
 #include "StatsCounter.h"
-#include "PS3\Social\SocialManager.h"
+#include "PS3/Social/SocialManager.h"
 #include <libsn.h>
 #include <libsntuner.h>
 #elif defined _DURANGO
-#include "Durango\Sentient\SentientManager.h"
+#include "Durango/Sentient/SentientManager.h"
 #include "StatsCounter.h"
-#include "Durango\Social\SocialManager.h"
-#include "Durango\Sentient\DynamicConfigurations.h"
-#include "Durango\DurangoExtras\xcompress.h"
+#include "Durango/Social/SocialManager.h"
+#include "Durango/Sentient/DynamicConfigurations.h"
+#include "Durango/DurangoExtras/xcompress.h"
 #elif defined _WINDOWS64
-#include "Windows64\Sentient\SentientManager.h"
+#include "Windows64/Sentient/SentientManager.h"
 #include "StatsCounter.h"
-#include "Windows64\Social\SocialManager.h"
-#include "Windows64\Sentient\DynamicConfigurations.h"
+#include "Windows64/Social/SocialManager.h"
+#include "Windows64/Sentient/DynamicConfigurations.h"
 #elif defined __PSVITA__
-#include "PSVita\Sentient\SentientManager.h"
+#include "PSVita/Sentient/SentientManager.h"
 #include "StatsCounter.h"
-#include "PSVita\Social\SocialManager.h"
-#include "PSVita\Sentient\DynamicConfigurations.h"
+#include "PSVita/Social/SocialManager.h"
+#include "PSVita/Sentient/DynamicConfigurations.h"
 #include <libperf.h>
 #else
-#include "Orbis\Sentient\SentientManager.h"
+#include "Orbis/Sentient/SentientManager.h"
 #include "StatsCounter.h"
-#include "Orbis\Social\SocialManager.h"
-#include "Orbis\Sentient\DynamicConfigurations.h"
+#include "Orbis/Social/SocialManager.h"
+#include "Orbis/Sentient/DynamicConfigurations.h"
 #include <perf.h>
 #endif
 
diff --git a/Minecraft.Client/FallingTileRenderer.cpp b/Minecraft.Client/FallingTileRenderer.cpp
index 02e23dad..b5369ed8 100644
--- a/Minecraft.Client/FallingTileRenderer.cpp
+++ b/Minecraft.Client/FallingTileRenderer.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "FallingTileRenderer.h"
 #include "TileRenderer.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.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.entity.item.h"
+#include "../Minecraft.World/net.minecraft.world.level.h"
+#include "../Minecraft.World/net.minecraft.world.level.tile.h"
 #include "EntityRenderDispatcher.h"
 
 FallingTileRenderer::FallingTileRenderer() : EntityRenderer()
diff --git a/Minecraft.Client/FireballRenderer.cpp b/Minecraft.Client/FireballRenderer.cpp
index 836e8be3..dc229b1f 100644
--- a/Minecraft.Client/FireballRenderer.cpp
+++ b/Minecraft.Client/FireballRenderer.cpp
@@ -1,11 +1,11 @@
 #include "stdafx.h"
 #include "FireballRenderer.h"
 #include "EntityRenderDispatcher.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.projectile.h"
-#include "..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
-#include "..\Minecraft.World\net.minecraft.world.phys.h"
-#include "..\Minecraft.World\net.minecraft.world.h"
+#include "../Minecraft.World/net.minecraft.world.entity.projectile.h"
+#include "../Minecraft.World/net.minecraft.world.item.h"
+#include "../Minecraft.World/net.minecraft.world.level.tile.h"
+#include "../Minecraft.World/net.minecraft.world.phys.h"
+#include "../Minecraft.World/net.minecraft.world.h"
 
 FireballRenderer::FireballRenderer(float scale)
 {
diff --git a/Minecraft.Client/FishingHookRenderer.cpp b/Minecraft.Client/FishingHookRenderer.cpp
index 0408e96e..4f7d964d 100644
--- a/Minecraft.Client/FishingHookRenderer.cpp
+++ b/Minecraft.Client/FishingHookRenderer.cpp
@@ -2,10 +2,10 @@
 #include "FishingHookRenderer.h"
 #include "EntityRenderDispatcher.h"
 #include "Options.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.projectile.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.player.h"
-#include "..\Minecraft.World\Vec3.h"
-#include "..\Minecraft.World\Mth.h"
+#include "../Minecraft.World/net.minecraft.world.entity.projectile.h"
+#include "../Minecraft.World/net.minecraft.world.entity.player.h"
+#include "../Minecraft.World/Vec3.h"
+#include "../Minecraft.World/Mth.h"
 #include "MultiPlayerLocalPlayer.h"
 
 void FishingHookRenderer::render(shared_ptr<Entity> _hook, double x, double y, double z, float rot, float a)
diff --git a/Minecraft.Client/FlameParticle.cpp b/Minecraft.Client/FlameParticle.cpp
index eb12dbfd..ce9aed59 100644
--- a/Minecraft.Client/FlameParticle.cpp
+++ b/Minecraft.Client/FlameParticle.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
-#include "..\Minecraft.World\JavaMath.h"
-#include "..\Minecraft.World\Random.h"
+#include "../Minecraft.World/JavaMath.h"
+#include "../Minecraft.World/Random.h"
 #include "FlameParticle.h"
 
 FlameParticle::FlameParticle(Level *level, double x, double y, double z, double xd, double yd, double zd) : Particle(level, x, y, z, xd, yd, zd)
diff --git a/Minecraft.Client/Font.cpp b/Minecraft.Client/Font.cpp
index 17f72853..cd1c2f1e 100644
--- a/Minecraft.Client/Font.cpp
+++ b/Minecraft.Client/Font.cpp
@@ -3,10 +3,10 @@
 #include "Font.h"
 #include "Options.h"
 #include "Tesselator.h"
-#include "..\Minecraft.World\IntBuffer.h"
-#include "..\Minecraft.World\net.minecraft.h"
-#include "..\Minecraft.World\StringHelpers.h"
-#include "..\Minecraft.World\Random.h"
+#include "../Minecraft.World/IntBuffer.h"
+#include "../Minecraft.World/net.minecraft.h"
+#include "../Minecraft.World/StringHelpers.h"
+#include "../Minecraft.World/Random.h"
 
 Font::Font(Options *options, const wstring& name, Textures* textures, bool enforceUnicode, TEXTURE_NAME textureName, int cols, int rows, int charWidth, int charHeight, unsigned short charMap[]/* = nullptr */) : textures(textures)
 {
diff --git a/Minecraft.Client/FootstepParticle.cpp b/Minecraft.Client/FootstepParticle.cpp
index 18331b32..0b377c31 100644
--- a/Minecraft.Client/FootstepParticle.cpp
+++ b/Minecraft.Client/FootstepParticle.cpp
@@ -2,8 +2,8 @@
 #include "FootstepParticle.h"
 #include "Textures.h"
 #include "Tesselator.h"
-#include "..\Minecraft.World\Mth.h"
-#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "../Minecraft.World/Mth.h"
+#include "../Minecraft.World/net.minecraft.world.level.h"
 
 FootstepParticle::FootstepParticle(Textures *textures, Level *level, double x, double y, double z) : Particle(level, x, y, z, 0, 0, 0)
 {
diff --git a/Minecraft.Client/Frustum.cpp b/Minecraft.Client/Frustum.cpp
index c40f7c6f..74faa376 100644
--- a/Minecraft.Client/Frustum.cpp
+++ b/Minecraft.Client/Frustum.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "..\Minecraft.World\FloatBuffer.h"
+#include "../Minecraft.World/FloatBuffer.h"
 #include "Frustum.h"
 
 Frustum *Frustum::frustum = new Frustum();
diff --git a/Minecraft.Client/FrustumData.h b/Minecraft.Client/FrustumData.h
index 7285f145..1801d983 100644
--- a/Minecraft.Client/FrustumData.h
+++ b/Minecraft.Client/FrustumData.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "..\Minecraft.World\AABB.h"
+#include "../Minecraft.World/AABB.h"
 
 class FrustumData
 {
diff --git a/Minecraft.Client/FurnaceScreen.cpp b/Minecraft.Client/FurnaceScreen.cpp
index 20ec7104..915a8dbc 100644
--- a/Minecraft.Client/FurnaceScreen.cpp
+++ b/Minecraft.Client/FurnaceScreen.cpp
@@ -3,8 +3,8 @@
 #include "Textures.h"
 #include "LocalPlayer.h"
 #include "Font.h"
-#include "..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\Minecraft.World\FurnaceTileEntity.h"
+#include "../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../Minecraft.World/FurnaceTileEntity.h"
 
 FurnaceScreen::FurnaceScreen(shared_ptr<Inventory> inventory, shared_ptr<FurnaceTileEntity> furnace) : AbstractContainerScreen(new FurnaceMenu(inventory, furnace))
 {
diff --git a/Minecraft.Client/GameMode.cpp b/Minecraft.Client/GameMode.cpp
index a11d6c07..7d791d28 100644
--- a/Minecraft.Client/GameMode.cpp
+++ b/Minecraft.Client/GameMode.cpp
@@ -2,13 +2,13 @@
 #include "GameMode.h"
 #include "LocalPlayer.h"
 #include "LevelRenderer.h"
-#include "..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
-#include "..\Minecraft.World\net.minecraft.world.level.dimension.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\net.minecraft.world.level.chunk.h"
+#include "../Minecraft.World/net.minecraft.world.level.h"
+#include "../Minecraft.World/net.minecraft.world.level.tile.h"
+#include "../Minecraft.World/net.minecraft.world.level.dimension.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/net.minecraft.world.level.chunk.h"
 
 GameMode::GameMode(Minecraft *minecraft)
 {
diff --git a/Minecraft.Client/GameRenderer.cpp b/Minecraft.Client/GameRenderer.cpp
index 508b3a1a..2de50f16 100644
--- a/Minecraft.Client/GameRenderer.cpp
+++ b/Minecraft.Client/GameRenderer.cpp
@@ -17,34 +17,34 @@
 #include "GuiParticles.h"
 #include "MultiPlayerLevel.h"
 #include "Chunk.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.h"
-#include "..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.player.h"
-#include "..\Minecraft.World\net.minecraft.world.phys.h"
-#include "..\Minecraft.World\net.minecraft.world.level.material.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
-#include "..\Minecraft.World\net.minecraft.world.level.chunk.h"
-#include "..\Minecraft.World\net.minecraft.world.level.biome.h"
-#include "..\Minecraft.World\net.minecraft.world.level.dimension.h"
-#include "..\Minecraft.World\System.h"
-#include "..\Minecraft.World\FloatBuffer.h"
-#include "..\Minecraft.World\ThreadName.h"
-#include "..\Minecraft.World\SparseLightStorage.h"
-#include "..\Minecraft.World\CompressedTileStorage.h"
-#include "..\Minecraft.World\SparseDataStorage.h"
-#include "..\Minecraft.World\JavaMath.h"
-#include "..\Minecraft.World\Facing.h"
-#include "..\Minecraft.World\MobEffect.h"
-#include "..\Minecraft.World\IntCache.h"
-#include "..\Minecraft.World\SmoothFloat.h"
-#include "..\Minecraft.World\MobEffectInstance.h"
-#include "..\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.entity.player.h"
+#include "../Minecraft.World/net.minecraft.world.phys.h"
+#include "../Minecraft.World/net.minecraft.world.level.material.h"
+#include "../Minecraft.World/net.minecraft.world.level.tile.h"
+#include "../Minecraft.World/net.minecraft.world.level.chunk.h"
+#include "../Minecraft.World/net.minecraft.world.level.biome.h"
+#include "../Minecraft.World/net.minecraft.world.level.dimension.h"
+#include "../Minecraft.World/System.h"
+#include "../Minecraft.World/FloatBuffer.h"
+#include "../Minecraft.World/ThreadName.h"
+#include "../Minecraft.World/SparseLightStorage.h"
+#include "../Minecraft.World/CompressedTileStorage.h"
+#include "../Minecraft.World/SparseDataStorage.h"
+#include "../Minecraft.World/JavaMath.h"
+#include "../Minecraft.World/Facing.h"
+#include "../Minecraft.World/MobEffect.h"
+#include "../Minecraft.World/IntCache.h"
+#include "../Minecraft.World/SmoothFloat.h"
+#include "../Minecraft.World/MobEffectInstance.h"
+#include "../Minecraft.World/Item.h"
 #include "Camera.h"
-#include "..\Minecraft.World\SoundTypes.h"
+#include "../Minecraft.World/SoundTypes.h"
 #include "HumanoidModel.h"
-#include "..\Minecraft.World\Item.h"
-#include "..\Minecraft.World\compression.h"
-#include "PS3\PS3Extras\ShutdownManager.h"
+#include "../Minecraft.World/Item.h"
+#include "../Minecraft.World/compression.h"
+#include "PS3/PS3Extras/ShutdownManager.h"
 
 #include "TexturePackRepository.h"
 #include "TexturePack.h"
diff --git a/Minecraft.Client/GameRenderer.h b/Minecraft.Client/GameRenderer.h
index 3729726b..075ecfee 100644
--- a/Minecraft.Client/GameRenderer.h
+++ b/Minecraft.Client/GameRenderer.h
@@ -9,8 +9,8 @@ class SparseLightStorage;
 class CompressedTileStorage;
 class SparseDataStorage;
 
-#include "..\Minecraft.World\SmoothFloat.h"
-#include "..\Minecraft.World\C4JThread.h"
+#include "../Minecraft.World/SmoothFloat.h"
+#include "../Minecraft.World/C4JThread.h"
 
 class GameRenderer
 {
diff --git a/Minecraft.Client/GhastModel.cpp b/Minecraft.Client/GhastModel.cpp
index 460c28ff..c15daa80 100644
--- a/Minecraft.Client/GhastModel.cpp
+++ b/Minecraft.Client/GhastModel.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
-#include "..\Minecraft.World\Random.h"
-#include "..\Minecraft.World\Mth.h"
+#include "../Minecraft.World/Random.h"
+#include "../Minecraft.World/Mth.h"
 #include "GhastModel.h"
 #include "ModelPart.h"
 
diff --git a/Minecraft.Client/GhastRenderer.cpp b/Minecraft.Client/GhastRenderer.cpp
index 1d8a2833..79474798 100644
--- a/Minecraft.Client/GhastRenderer.cpp
+++ b/Minecraft.Client/GhastRenderer.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "GhastRenderer.h"
 #include "GhastModel.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.monster.h"
+#include "../Minecraft.World/net.minecraft.world.entity.monster.h"
 
 GhastRenderer::GhastRenderer() : MobRenderer(new GhastModel(), 0.5f)
 {
diff --git a/Minecraft.Client/Gui.cpp b/Minecraft.Client/Gui.cpp
index 7d76edbd..176ad4c7 100644
--- a/Minecraft.Client/Gui.cpp
+++ b/Minecraft.Client/Gui.cpp
@@ -9,24 +9,24 @@
 #include "Lighting.h"
 #include "ChatScreen.h"
 #include "MultiPlayerLevel.h"
-#include "..\Minecraft.World\JavaMath.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.player.h"
-#include "..\Minecraft.World\net.minecraft.world.effect.h"
-#include "..\Minecraft.World\net.minecraft.world.food.h"
-#include "..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\Minecraft.World\LevelData.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
-#include "..\Minecraft.World\System.h"
-#include "..\Minecraft.World\Language.h"
+#include "../Minecraft.World/JavaMath.h"
+#include "../Minecraft.World/net.minecraft.world.entity.player.h"
+#include "../Minecraft.World/net.minecraft.world.effect.h"
+#include "../Minecraft.World/net.minecraft.world.food.h"
+#include "../Minecraft.World/net.minecraft.world.item.h"
+#include "../Minecraft.World/net.minecraft.world.level.h"
+#include "../Minecraft.World/LevelData.h"
+#include "../Minecraft.World/net.minecraft.world.level.tile.h"
+#include "../Minecraft.World/System.h"
+#include "../Minecraft.World/Language.h"
 #include "EntityRenderDispatcher.h"
-#include "..\Minecraft.World\Dimension.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.boss.enderdragon.h"
+#include "../Minecraft.World/Dimension.h"
+#include "../Minecraft.World/net.minecraft.world.entity.boss.enderdragon.h"
 #include "EnderDragonRenderer.h"
-#include "..\Minecraft.World\net.minecraft.h"
-#include "..\Minecraft.World\net.minecraft.world.h"
-#include "..\Minecraft.World\LevelChunk.h"
-#include "..\Minecraft.World\Biome.h"
+#include "../Minecraft.World/net.minecraft.h"
+#include "../Minecraft.World/net.minecraft.world.h"
+#include "../Minecraft.World/LevelChunk.h"
+#include "../Minecraft.World/Biome.h"
 
 #define RENDER_HUD 0
 //#ifndef _XBOX
diff --git a/Minecraft.Client/GuiParticle.cpp b/Minecraft.Client/GuiParticle.cpp
index 25859c70..1c47448b 100644
--- a/Minecraft.Client/GuiParticle.cpp
+++ b/Minecraft.Client/GuiParticle.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "GuiParticle.h"
-#include "..\Minecraft.World\Random.h"
+#include "../Minecraft.World/Random.h"
 
 Random *GuiParticle::random = new Random();
 
diff --git a/Minecraft.Client/HugeExplosionParticle.cpp b/Minecraft.Client/HugeExplosionParticle.cpp
index 273eed2b..616c5372 100644
--- a/Minecraft.Client/HugeExplosionParticle.cpp
+++ b/Minecraft.Client/HugeExplosionParticle.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "HugeExplosionParticle.h"
-#include "..\Minecraft.World\Random.h"
+#include "../Minecraft.World/Random.h"
 #include "Textures.h"
 #include "Tesselator.h"
 #include "Lighting.h"
diff --git a/Minecraft.Client/HugeExplosionSeedParticle.cpp b/Minecraft.Client/HugeExplosionSeedParticle.cpp
index 7514cc44..222bc729 100644
--- a/Minecraft.Client/HugeExplosionSeedParticle.cpp
+++ b/Minecraft.Client/HugeExplosionSeedParticle.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "HugeExplosionSeedParticle.h"
-#include "..\Minecraft.World\Random.h"
-#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "../Minecraft.World/Random.h"
+#include "../Minecraft.World/net.minecraft.world.level.h"
 
 HugeExplosionSeedParticle::HugeExplosionSeedParticle(Level *level, double x, double y, double z, double xa, double ya, double za) : Particle(level,x,y,z,0,0,0)
 {
diff --git a/Minecraft.Client/HumanoidMobRenderer.cpp b/Minecraft.Client/HumanoidMobRenderer.cpp
index 389116ed..404e4df0 100644
--- a/Minecraft.Client/HumanoidMobRenderer.cpp
+++ b/Minecraft.Client/HumanoidMobRenderer.cpp
@@ -4,11 +4,11 @@
 #include "HumanoidModel.h"
 #include "ModelPart.h"
 #include "EntityRenderDispatcher.h"
-#include "..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.monster.h"
-#include "..\Minecraft.World\net.minecraft.h"
+#include "../Minecraft.World/net.minecraft.world.item.h"
+#include "../Minecraft.World/net.minecraft.world.level.tile.h"
+#include "../Minecraft.World/net.minecraft.world.entity.h"
+#include "../Minecraft.World/net.minecraft.world.entity.monster.h"
+#include "../Minecraft.World/net.minecraft.h"
 
 void HumanoidMobRenderer::_init(HumanoidModel *humanoidModel, float scale)
 {
diff --git a/Minecraft.Client/HumanoidModel.cpp b/Minecraft.Client/HumanoidModel.cpp
index 444d9c90..3f7c75bd 100644
--- a/Minecraft.Client/HumanoidModel.cpp
+++ b/Minecraft.Client/HumanoidModel.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "HumanoidModel.h"
-#include "..\Minecraft.World\Mth.h"
-#include "..\Minecraft.World\Entity.h"
+#include "../Minecraft.World/Mth.h"
+#include "../Minecraft.World/Entity.h"
 #include "ModelPart.h"
 
 // 4J added 
diff --git a/Minecraft.Client/InBedChatScreen.cpp b/Minecraft.Client/InBedChatScreen.cpp
index fca3d022..5c3c068f 100644
--- a/Minecraft.Client/InBedChatScreen.cpp
+++ b/Minecraft.Client/InBedChatScreen.cpp
@@ -2,8 +2,8 @@
 #include "InBedChatScreen.h"
 #include "Button.h"
 #include "MultiplayerLocalPlayer.h"
-#include "..\Minecraft.World\net.minecraft.locale.h"
-#include "..\Minecraft.World\StringHelpers.h"
+#include "../Minecraft.World/net.minecraft.locale.h"
+#include "../Minecraft.World/StringHelpers.h"
 
 void InBedChatScreen::init()
 {
diff --git a/Minecraft.Client/Input.cpp b/Minecraft.Client/Input.cpp
index 645f3477..d2ea33ed 100644
--- a/Minecraft.Client/Input.cpp
+++ b/Minecraft.Client/Input.cpp
@@ -1,11 +1,11 @@
 #include "stdafx.h"
 #include "Minecraft.h"
 #include "GameMode.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.storage.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.storage.h"
 #include "Input.h"
-#include "..\Minecraft.Client\LocalPlayer.h"
+#include "../Minecraft.Client/LocalPlayer.h"
 #include "Options.h"
 
 Input::Input()
diff --git a/Minecraft.Client/InventoryScreen.cpp b/Minecraft.Client/InventoryScreen.cpp
index 726a5e8d..977ffe1c 100644
--- a/Minecraft.Client/InventoryScreen.cpp
+++ b/Minecraft.Client/InventoryScreen.cpp
@@ -8,7 +8,7 @@
 #include "Button.h"
 #include "AchievementScreen.h"
 #include "StatsScreen.h"
-#include "..\Minecraft.World\net.minecraft.stats.h"
+#include "../Minecraft.World/net.minecraft.stats.h"
 
 InventoryScreen::InventoryScreen(shared_ptr<Player> player) : AbstractContainerScreen(player->inventoryMenu)
 {
diff --git a/Minecraft.Client/ItemFrameRenderer.cpp b/Minecraft.Client/ItemFrameRenderer.cpp
index 40769fb9..aba7088b 100644
--- a/Minecraft.Client/ItemFrameRenderer.cpp
+++ b/Minecraft.Client/ItemFrameRenderer.cpp
@@ -1,20 +1,20 @@
 #include "stdafx.h"
 #include "ItemRenderer.h"
-#include "tileRenderer.h"
-#include "entityRenderDispatcher.h"
+#include "TileRenderer.h"
+#include "EntityRenderDispatcher.h"
 //#include "ItemFrame"
 #include "ItemFrameRenderer.h"
 
-#include "..\Minecraft.World\JavaMath.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.Item.h"
-#include "..\Minecraft.World\net.minecraft.world.Item.h"
-#include "..\Minecraft.World\net.minecraft.world.Item.alchemy.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
-#include "..\Minecraft.World\StringHelpers.h"
+#include "../Minecraft.World/JavaMath.h"
+#include "../Minecraft.World/net.minecraft.world.entity.item.h"
+#include "../Minecraft.World/net.minecraft.world.item.h"
+#include "../Minecraft.World/net.minecraft.world.item.alchemy.h"
+#include "../Minecraft.World/net.minecraft.world.level.tile.h"
+#include "../Minecraft.World/StringHelpers.h"
 #include "Minecraft.h"
-#include "..\Minecraft.World\Item.h"
-#include "..\Minecraft.World\net.minecraft.world.h"
-#include "..\Minecraft.World\net.minecraft.h"
+#include "../Minecraft.World/Item.h"
+#include "../Minecraft.World/net.minecraft.world.h"
+#include "../Minecraft.World/net.minecraft.h"
 #include "CompassTexture.h"
 #include "Minimap.h"
 
diff --git a/Minecraft.Client/ItemInHandRenderer.cpp b/Minecraft.Client/ItemInHandRenderer.cpp
index cee9254d..a3124623 100644
--- a/Minecraft.Client/ItemInHandRenderer.cpp
+++ b/Minecraft.Client/ItemInHandRenderer.cpp
@@ -10,12 +10,12 @@
 #include "MultiplayerLocalPlayer.h"
 #include "Minimap.h"
 #include "MultiPlayerLevel.h"
-#include "..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.player.h"
-#include "..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\Minecraft.World\net.minecraft.world.h"
+#include "../Minecraft.World/net.minecraft.world.item.h"
+#include "../Minecraft.World/net.minecraft.world.level.tile.h"
+#include "../Minecraft.World/net.minecraft.world.entity.h"
+#include "../Minecraft.World/net.minecraft.world.entity.player.h"
+#include "../Minecraft.World/net.minecraft.world.level.h"
+#include "../Minecraft.World/net.minecraft.world.h"
 
 int ItemInHandRenderer::list = -1;
 int ItemInHandRenderer::listGlint = -1;
diff --git a/Minecraft.Client/ItemRenderer.cpp b/Minecraft.Client/ItemRenderer.cpp
index 03d0d3a5..8d599c17 100644
--- a/Minecraft.Client/ItemRenderer.cpp
+++ b/Minecraft.Client/ItemRenderer.cpp
@@ -2,13 +2,13 @@
 #include "ItemRenderer.h"
 #include "TileRenderer.h"
 #include "entityRenderDispatcher.h"
-#include "..\Minecraft.World\JavaMath.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.item.h"
-#include "..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\Minecraft.World\net.minecraft.world.item.alchemy.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
-#include "..\Minecraft.World\StringHelpers.h"
-#include "..\Minecraft.World\net.minecraft.world.h"
+#include "../Minecraft.World/JavaMath.h"
+#include "../Minecraft.World/net.minecraft.world.entity.item.h"
+#include "../Minecraft.World/net.minecraft.world.item.h"
+#include "../Minecraft.World/net.minecraft.world.item.alchemy.h"
+#include "../Minecraft.World/net.minecraft.world.level.tile.h"
+#include "../Minecraft.World/StringHelpers.h"
+#include "../Minecraft.World/net.minecraft.world.h"
 #include "Options.h"
 
 ItemRenderer::ItemRenderer() : EntityRenderer()
diff --git a/Minecraft.Client/ItemSpriteRenderer.cpp b/Minecraft.Client/ItemSpriteRenderer.cpp
index 5a1ea620..b821280b 100644
--- a/Minecraft.Client/ItemSpriteRenderer.cpp
+++ b/Minecraft.Client/ItemSpriteRenderer.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "ItemSpriteRenderer.h"
 #include "EntityRenderDispatcher.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.projectile.h"
-#include "..\Minecraft.World\net.minecraft.world.item.alchemy.h"
-#include "..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\Minecraft.World\net.minecraft.world.h"
+#include "../Minecraft.World/net.minecraft.world.entity.projectile.h"
+#include "../Minecraft.World/net.minecraft.world.item.alchemy.h"
+#include "../Minecraft.World/net.minecraft.world.item.h"
+#include "../Minecraft.World/net.minecraft.world.h"
 
 ItemSpriteRenderer::ItemSpriteRenderer(Item *sourceItem, int sourceItemAuxValue /*= 0*/) : EntityRenderer()
 {
diff --git a/Minecraft.Client/JoinMultiplayerScreen.cpp b/Minecraft.Client/JoinMultiplayerScreen.cpp
index a98e7bee..50f405e0 100644
--- a/Minecraft.Client/JoinMultiplayerScreen.cpp
+++ b/Minecraft.Client/JoinMultiplayerScreen.cpp
@@ -3,7 +3,7 @@
 #include "Button.h"
 #include "EditBox.h"
 #include "Options.h"
-#include "..\Minecraft.World\net.minecraft.locale.h"
+#include "../Minecraft.World/net.minecraft.locale.h"
 
 JoinMultiplayerScreen::JoinMultiplayerScreen(Screen *lastScreen)
 {
diff --git a/Minecraft.Client/LavaParticle.cpp b/Minecraft.Client/LavaParticle.cpp
index ac0608e5..85a03d8d 100644
--- a/Minecraft.Client/LavaParticle.cpp
+++ b/Minecraft.Client/LavaParticle.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "LavaParticle.h"
-#include "..\Minecraft.World\JavaMath.h"
-#include "..\Minecraft.World\Random.h"
-#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "../Minecraft.World/JavaMath.h"
+#include "../Minecraft.World/Random.h"
+#include "../Minecraft.World/net.minecraft.world.level.h"
 
 LavaParticle::LavaParticle(Level *level, double x, double y, double z) : Particle(level, x, y, z, 0, 0, 0)
 {
diff --git a/Minecraft.Client/LavaSlimeModel.cpp b/Minecraft.Client/LavaSlimeModel.cpp
index 427b9547..556ce518 100644
--- a/Minecraft.Client/LavaSlimeModel.cpp
+++ b/Minecraft.Client/LavaSlimeModel.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
-#include "..\Minecraft.World\Mth.h"
+#include "../Minecraft.World/Mth.h"
 #include "LavaSlimeModel.h"
 #include "ModelPart.h"
-#include "..\Minecraft.World\LavaSlime.h"
+#include "../Minecraft.World/LavaSlime.h"
 
 
 LavaSlimeModel::LavaSlimeModel() 
diff --git a/Minecraft.Client/LavaSlimeRenderer.cpp b/Minecraft.Client/LavaSlimeRenderer.cpp
index 3d2cbf47..38a40aa2 100644
--- a/Minecraft.Client/LavaSlimeRenderer.cpp
+++ b/Minecraft.Client/LavaSlimeRenderer.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.monster.h"
+#include "../Minecraft.World/net.minecraft.world.entity.monster.h"
 #include "LavaSlimeModel.h"
 #include "LavaSlimeRenderer.h"
 
diff --git a/Minecraft.Client/LevelRenderer.cpp b/Minecraft.Client/LevelRenderer.cpp
index 2868b1ba..2757daeb 100644
--- a/Minecraft.Client/LevelRenderer.cpp
+++ b/Minecraft.Client/LevelRenderer.cpp
@@ -61,8 +61,8 @@
 #include "../Minecraft.World/BasicTypeContainers.h"
 
 #ifdef __PS3__
-#include "PS3\SPU_Tasks\LevelRenderer_cull\LevelRenderer_cull.h"
-#include "PS3\SPU_Tasks\LevelRenderer_FindNearestChunk\LevelRenderer_FindNearestChunk.h"
+#include "PS3/SPU_Tasks/LevelRenderer_cull/LevelRenderer_cull.h"
+#include "PS3/SPU_Tasks/LevelRenderer_FindNearestChunk/LevelRenderer_FindNearestChunk.h"
 #include "C4JSpursJob.h"
 
 static LevelRenderer_cull_DataIn g_cullDataIn[4] __attribute__((__aligned__(16)));
diff --git a/Minecraft.Client/Lighting.cpp b/Minecraft.Client/Lighting.cpp
index 50529d51..738741a1 100644
--- a/Minecraft.Client/Lighting.cpp
+++ b/Minecraft.Client/Lighting.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "Lighting.h"
-#include "..\Minecraft.World\FloatBuffer.h"
-#include "..\Minecraft.World\Vec3.h"
+#include "../Minecraft.World/FloatBuffer.h"
+#include "../Minecraft.World/Vec3.h"
 
 FloatBuffer *Lighting::lb = new FloatBuffer(16);
 
diff --git a/Minecraft.Client/LightningBoltRenderer.cpp b/Minecraft.Client/LightningBoltRenderer.cpp
index d02ea7f7..466b351e 100644
--- a/Minecraft.Client/LightningBoltRenderer.cpp
+++ b/Minecraft.Client/LightningBoltRenderer.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "LightningBoltRenderer.h"
 #include "Tesselator.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.global.h"
+#include "../Minecraft.World/net.minecraft.world.entity.global.h"
 
 void LightningBoltRenderer::render(shared_ptr<Entity> _bolt, double x, double y, double z, float rot, float a)
 {
diff --git a/Minecraft.Client/LocalPlayer.cpp b/Minecraft.Client/LocalPlayer.cpp
index ea66b9e1..53ac603b 100644
--- a/Minecraft.Client/LocalPlayer.cpp
+++ b/Minecraft.Client/LocalPlayer.cpp
@@ -16,41 +16,41 @@
 #include "CreativeMode.h"
 #include "GameRenderer.h"
 #include "ItemInHandRenderer.h"
-#include "..\Minecraft.World\LevelData.h"
-#include "..\Minecraft.World\net.minecraft.world.damagesource.h"
-#include "..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\Minecraft.World\net.minecraft.world.food.h"
-#include "..\Minecraft.World\net.minecraft.world.effect.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.player.h"
-#include "..\Minecraft.World\ItemEntity.h"
-#include "..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\Minecraft.World\net.minecraft.world.phys.h"
-#include "..\Minecraft.World\net.minecraft.stats.h"
-#include "..\Minecraft.World\com.mojang.nbt.h"
-#include "..\Minecraft.World\Random.h"
-#include "..\Minecraft.World\Mth.h"
+#include "../Minecraft.World/LevelData.h"
+#include "../Minecraft.World/net.minecraft.world.damagesource.h"
+#include "../Minecraft.World/net.minecraft.world.item.h"
+#include "../Minecraft.World/net.minecraft.world.food.h"
+#include "../Minecraft.World/net.minecraft.world.effect.h"
+#include "../Minecraft.World/net.minecraft.world.entity.player.h"
+#include "../Minecraft.World/ItemEntity.h"
+#include "../Minecraft.World/net.minecraft.world.level.h"
+#include "../Minecraft.World/net.minecraft.world.phys.h"
+#include "../Minecraft.World/net.minecraft.stats.h"
+#include "../Minecraft.World/com.mojang.nbt.h"
+#include "../Minecraft.World/Random.h"
+#include "../Minecraft.World/Mth.h"
 #include "AchievementPopup.h"
 #include "CritParticle.h"
 
 // 4J : WESTY : Added for new achievements.
-#include "..\Minecraft.World\item.h"
-#include "..\Minecraft.World\mapitem.h"
-#include "..\Minecraft.World\tile.h"
+#include "../Minecraft.World/item.h"
+#include "../Minecraft.World/mapitem.h"
+#include "../Minecraft.World/tile.h"
 
 // 4J Stu - Added for tutorial callbacks
 #include "Minecraft.h"
 
-#include "..\Minecraft.World\Minecart.h"
-#include "..\Minecraft.World\Boat.h"
-#include "..\Minecraft.World\Pig.h"
+#include "../Minecraft.World/Minecart.h"
+#include "../Minecraft.World/Boat.h"
+#include "../Minecraft.World/Pig.h"
 
-#include "..\Minecraft.World\StringHelpers.h"
+#include "../Minecraft.World/StringHelpers.h"
 
 #include "Options.h"
-#include "..\Minecraft.World\Dimension.h"
+#include "../Minecraft.World/Dimension.h"
 
 #ifndef _DURANGO
-#include "..\Minecraft.World\CommonStats.h"
+#include "../Minecraft.World/CommonStats.h"
 #endif
 
 
@@ -1150,7 +1150,7 @@ void LocalPlayer::setAndBroadcastCustomCape(DWORD capeId)
 }
 
 // 4J TODO - Remove
-#include "..\Minecraft.World\LevelChunk.h"
+#include "../Minecraft.World/LevelChunk.h"
 void LocalPlayer::mapPlayerChunk(const unsigned int flagTileType)
 {
 	int cx = this->xChunk;
diff --git a/Minecraft.Client/MemoryTracker.cpp b/Minecraft.Client/MemoryTracker.cpp
index c1652d3b..eda6b7fb 100644
--- a/Minecraft.Client/MemoryTracker.cpp
+++ b/Minecraft.Client/MemoryTracker.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "MemoryTracker.h"
-#include "..\Minecraft.World\IntBuffer.h"
-#include "..\Minecraft.World\ByteBuffer.h"
-#include "..\Minecraft.World\FloatBuffer.h"
+#include "../Minecraft.World/IntBuffer.h"
+#include "../Minecraft.World/ByteBuffer.h"
+#include "../Minecraft.World/FloatBuffer.h"
 
 unordered_map<int,int> MemoryTracker::GL_LIST_IDS;
 vector<int> MemoryTracker::TEXTURE_IDS;
diff --git a/Minecraft.Client/MinecartRenderer.cpp b/Minecraft.Client/MinecartRenderer.cpp
index 0cae8346..33041842 100644
--- a/Minecraft.Client/MinecartRenderer.cpp
+++ b/Minecraft.Client/MinecartRenderer.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "MinecartRenderer.h"
 #include "MinecartModel.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.item.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "../Minecraft.World/net.minecraft.world.entity.item.h"
+#include "../Minecraft.World/net.minecraft.world.level.tile.h"
 
 MinecartRenderer::MinecartRenderer()
 {
diff --git a/Minecraft.Client/Minecraft.cpp b/Minecraft.Client/Minecraft.cpp
index 1892fb36..83b06443 100644
--- a/Minecraft.Client/Minecraft.cpp
+++ b/Minecraft.Client/Minecraft.cpp
@@ -34,43 +34,43 @@
 #include "FrustumCuller.h"
 #include "Camera.h"
 
-#include "..\Minecraft.World\MobEffect.h"
-#include "..\Minecraft.World\Difficulty.h"
-#include "..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.player.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.item.h"
-#include "..\Minecraft.World\net.minecraft.world.phys.h"
-#include "..\Minecraft.World\File.h"
-#include "..\Minecraft.World\net.minecraft.world.level.storage.h"
-#include "..\Minecraft.World\net.minecraft.h"
-#include "..\Minecraft.World\net.minecraft.stats.h"
-#include "..\Minecraft.World\System.h"
-#include "..\Minecraft.World\ByteBuffer.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
-#include "..\Minecraft.World\net.minecraft.world.level.chunk.h"
-#include "..\Minecraft.World\net.minecraft.world.level.dimension.h"
-#include "..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\Minecraft.World\Minecraft.World.h"
+#include "../Minecraft.World/MobEffect.h"
+#include "../Minecraft.World/Difficulty.h"
+#include "../Minecraft.World/net.minecraft.world.level.h"
+#include "../Minecraft.World/net.minecraft.world.entity.h"
+#include "../Minecraft.World/net.minecraft.world.entity.player.h"
+#include "../Minecraft.World/net.minecraft.world.entity.item.h"
+#include "../Minecraft.World/net.minecraft.world.phys.h"
+#include "../Minecraft.World/File.h"
+#include "../Minecraft.World/net.minecraft.world.level.storage.h"
+#include "../Minecraft.World/net.minecraft.h"
+#include "../Minecraft.World/net.minecraft.stats.h"
+#include "../Minecraft.World/System.h"
+#include "../Minecraft.World/ByteBuffer.h"
+#include "../Minecraft.World/net.minecraft.world.level.tile.h"
+#include "../Minecraft.World/net.minecraft.world.level.chunk.h"
+#include "../Minecraft.World/net.minecraft.world.level.dimension.h"
+#include "../Minecraft.World/net.minecraft.world.item.h"
+#include "../Minecraft.World/Minecraft.World.h"
 #include "ClientConnection.h"
-#include "..\Minecraft.World\HellRandomLevelSource.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.monster.h"
-#include "..\Minecraft.World\StrongholdFeature.h"
-#include "..\Minecraft.World\IntCache.h"
-#include "..\Minecraft.World\Villager.h"
-#include "..\Minecraft.World\SparseLightStorage.h"
-#include "..\Minecraft.World\SparseDataStorage.h"
+#include "../Minecraft.World/HellRandomLevelSource.h"
+#include "../Minecraft.World/net.minecraft.world.entity.animal.h"
+#include "../Minecraft.World/net.minecraft.world.entity.monster.h"
+#include "../Minecraft.World/StrongholdFeature.h"
+#include "../Minecraft.World/IntCache.h"
+#include "../Minecraft.World/Villager.h"
+#include "../Minecraft.World/SparseLightStorage.h"
+#include "../Minecraft.World/SparseDataStorage.h"
 #include "TextureManager.h"
 #ifdef _XBOX
-#include "Xbox\Network\NetworkPlayerXbox.h"
+#include "Xbox/Network/NetworkPlayerXbox.h"
 #endif
-#include "Common\UI\IUIScene_CreativeMenu.h"
-#include "Common\UI\UIFontData.h"
+#include "Common/UI/IUIScene_CreativeMenu.h"
+#include "Common/UI/UIFontData.h"
 #include "DLCTexturePack.h"
 
 #ifdef __ORBIS__
-#include "Orbis\Network\PsPlusUpsellWrapper_Orbis.h"
+#include "Orbis/Network/PsPlusUpsellWrapper_Orbis.h"
 #endif
 
 // 4J Turning this on will change the graph at the bottom of the debug overlay to show the number of packets of each type added per fram
diff --git a/Minecraft.Client/MinecraftServer.cpp b/Minecraft.Client/MinecraftServer.cpp
index ceb9554b..6991cde8 100644
--- a/Minecraft.Client/MinecraftServer.cpp
+++ b/Minecraft.Client/MinecraftServer.cpp
@@ -14,40 +14,40 @@
 #include "Settings.h"
 #include "ServerChunkCache.h"
 #include "ServerLevelListener.h"
-#include "..\Minecraft.World\AABB.h"
-#include "..\Minecraft.World\Vec3.h"
-#include "..\Minecraft.World\net.minecraft.network.h"
-#include "..\Minecraft.World\net.minecraft.world.level.dimension.h"
-#include "..\Minecraft.World\net.minecraft.world.level.storage.h"
-#include "..\Minecraft.World\net.minecraft.world.h"
-#include "..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
-#include "..\Minecraft.World\Pos.h"
-#include "..\Minecraft.World\System.h"
-#include "..\Minecraft.World\StringHelpers.h"
+#include "../Minecraft.World/AABB.h"
+#include "../Minecraft.World/Vec3.h"
+#include "../Minecraft.World/net.minecraft.network.h"
+#include "../Minecraft.World/net.minecraft.world.level.dimension.h"
+#include "../Minecraft.World/net.minecraft.world.level.storage.h"
+#include "../Minecraft.World/net.minecraft.world.h"
+#include "../Minecraft.World/net.minecraft.world.level.h"
+#include "../Minecraft.World/net.minecraft.world.level.tile.h"
+#include "../Minecraft.World/Pos.h"
+#include "../Minecraft.World/System.h"
+#include "../Minecraft.World/StringHelpers.h"
 #ifdef SPLIT_SAVES
-#include "..\Minecraft.World\ConsoleSaveFileSplit.h"
+#include "../Minecraft.World/ConsoleSaveFileSplit.h"
 #endif
-#include "..\Minecraft.World\ConsoleSaveFileOriginal.h"
-#include "..\Minecraft.World\Socket.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.h"
+#include "../Minecraft.World/ConsoleSaveFileOriginal.h"
+#include "../Minecraft.World/Socket.h"
+#include "../Minecraft.World/net.minecraft.world.entity.h"
 #include "ProgressRenderer.h"
 #include "ServerPlayer.h"
 #include "GameRenderer.h"
-#include "..\Minecraft.World\ThreadName.h"
-#include "..\Minecraft.World\IntCache.h"
-#include "..\Minecraft.World\CompressedTileStorage.h"
-#include "..\Minecraft.World\SparseLightStorage.h"
-#include "..\Minecraft.World\SparseDataStorage.h"
-#include "..\Minecraft.World\compression.h"
+#include "../Minecraft.World/ThreadName.h"
+#include "../Minecraft.World/IntCache.h"
+#include "../Minecraft.World/CompressedTileStorage.h"
+#include "../Minecraft.World/SparseLightStorage.h"
+#include "../Minecraft.World/SparseDataStorage.h"
+#include "../Minecraft.World/compression.h"
 #ifdef _XBOX
-#include "Common\XUI\XUI_DebugSetCamera.h"
+#include "Common/XUI/XUI_DebugSetCamera.h"
 #endif
-#include "PS3\PS3Extras\ShutdownManager.h"
+#include "PS3/PS3Extras/ShutdownManager.h"
 #include "ServerCommandDispatcher.h"
-#include "..\Minecraft.World\BiomeSource.h"
+#include "../Minecraft.World/BiomeSource.h"
 #include "PlayerChunkMap.h"
-#include "Common\Telemetry\TelemetryManager.h"
+#include "Common/Telemetry/TelemetryManager.h"
 
 #define DEBUG_SERVER_DONT_SPAWN_MOBS 0
 
@@ -149,7 +149,7 @@ bool MinecraftServer::initServer(__int64 seed, NetworkGameInitData *initData, DW
         //localIp = settings->getString(L"server-ip", L"");
         //onlineMode = settings->getBoolean(L"online-mode", true);
 		//motd = settings->getString(L"motd", L"A Minecraft Server");
-        //motd.replace('§', '$');
+        //motd.replace('§', '$');
 
         setAnimals(settings->getBoolean(L"spawn-animals", true));
 		setNpcsEnabled(settings->getBoolean(L"spawn-npcs", true));
diff --git a/Minecraft.Client/Minimap.cpp b/Minecraft.Client/Minimap.cpp
index c18cd267..3cf6209e 100644
--- a/Minecraft.Client/Minimap.cpp
+++ b/Minecraft.Client/Minimap.cpp
@@ -5,8 +5,8 @@
 #include "Options.h"
 #include "Textures.h"
 #include "Tesselator.h"
-#include "..\Minecraft.World\net.minecraft.world.level.saveddata.h"
-#include "..\Minecraft.World\net.minecraft.world.level.material.h"
+#include "../Minecraft.World/net.minecraft.world.level.saveddata.h"
+#include "../Minecraft.World/net.minecraft.world.level.material.h"
 
 #ifdef __ORBIS__
 short Minimap::LUT[256];	// 4J added
diff --git a/Minecraft.Client/Minimap.h b/Minecraft.Client/Minimap.h
index 758d8a8a..84e439e6 100644
--- a/Minecraft.Client/Minimap.h
+++ b/Minecraft.Client/Minimap.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "..\Minecraft.World\MapItem.h"
+#include "../Minecraft.World/MapItem.h"
 class Options;
 class Font;
 class Textures;
diff --git a/Minecraft.Client/MobRenderer.cpp b/Minecraft.Client/MobRenderer.cpp
index 8874ab9c..4188cd5a 100644
--- a/Minecraft.Client/MobRenderer.cpp
+++ b/Minecraft.Client/MobRenderer.cpp
@@ -1,11 +1,11 @@
 #include "stdafx.h"
 #include "MobRenderer.h"
 #include "MultiPlayerLocalPlayer.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.player.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.projectile.h"
-#include "..\Minecraft.World\StringHelpers.h"
-#include "..\Minecraft.World\Mth.h"
+#include "../Minecraft.World/net.minecraft.world.entity.h"
+#include "../Minecraft.World/net.minecraft.world.entity.player.h"
+#include "../Minecraft.World/net.minecraft.world.entity.projectile.h"
+#include "../Minecraft.World/StringHelpers.h"
+#include "../Minecraft.World/Mth.h"
 #include "entityRenderDispatcher.h"
 
 MobRenderer::MobRenderer(Model *model, float shadow) : EntityRenderer()
diff --git a/Minecraft.Client/MobSpawnerRenderer.cpp b/Minecraft.Client/MobSpawnerRenderer.cpp
index 4ee772dd..f403aa2d 100644
--- a/Minecraft.Client/MobSpawnerRenderer.cpp
+++ b/Minecraft.Client/MobSpawnerRenderer.cpp
@@ -2,8 +2,8 @@
 #include "MobSpawnerRenderer.h"
 #include "TileEntityRenderDispatcher.h"
 #include "EntityRenderDispatcher.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.level.tile.entity.h"
+#include "../Minecraft.World/net.minecraft.world.entity.h"
 
 void MobSpawnerRenderer::render(shared_ptr<TileEntity> _spawner, double x, double y, double z, float a, bool setColor, float alpha, bool useCompiled)
 {
diff --git a/Minecraft.Client/ModelPart.h b/Minecraft.Client/ModelPart.h
index 65d6a03b..f6ff59f6 100644
--- a/Minecraft.Client/ModelPart.h
+++ b/Minecraft.Client/ModelPart.h
@@ -1,9 +1,9 @@
 #pragma once
-#include "..\Minecraft.World\ArrayWithLength.h"
+#include "../Minecraft.World/ArrayWithLength.h"
 #include "Vertex.h"
 #include "Polygon.h"
 #include "Model.h"
-#include "..\Minecraft.Client\SkinBox.h"
+#include "../Minecraft.Client/SkinBox.h"
 
 class Cube;
 
diff --git a/Minecraft.Client/MultiPlayerChunkCache.cpp b/Minecraft.Client/MultiPlayerChunkCache.cpp
index 8c6c90e7..9241b22d 100644
--- a/Minecraft.Client/MultiPlayerChunkCache.cpp
+++ b/Minecraft.Client/MultiPlayerChunkCache.cpp
@@ -1,14 +1,14 @@
 #include "stdafx.h"
 #include "MultiPlayerChunkCache.h"
 #include "ServerChunkCache.h"
-#include "..\Minecraft.World\net.minecraft.world.level.chunk.h"
-#include "..\Minecraft.World\net.minecraft.world.level.dimension.h"
-#include "..\Minecraft.World\Arrays.h"
-#include "..\Minecraft.World\StringHelpers.h"
+#include "../Minecraft.World/net.minecraft.world.level.chunk.h"
+#include "../Minecraft.World/net.minecraft.world.level.dimension.h"
+#include "../Minecraft.World/Arrays.h"
+#include "../Minecraft.World/StringHelpers.h"
 #include "MinecraftServer.h"
 #include "ServerLevel.h"
-#include "..\Minecraft.World\Tile.h"
-#include "..\Minecraft.World\WaterLevelChunk.h"
+#include "../Minecraft.World/Tile.h"
+#include "../Minecraft.World/WaterLevelChunk.h"
 
 MultiPlayerChunkCache::MultiPlayerChunkCache(Level *level)
 {
diff --git a/Minecraft.Client/MultiPlayerChunkCache.h b/Minecraft.Client/MultiPlayerChunkCache.h
index 8fc427a6..a1496e32 100644
--- a/Minecraft.Client/MultiPlayerChunkCache.h
+++ b/Minecraft.Client/MultiPlayerChunkCache.h
@@ -1,7 +1,7 @@
 #pragma once
-#include "..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\Minecraft.World\net.minecraft.world.level.chunk.h"
-#include "..\Minecraft.World\RandomLevelSource.h"
+#include "../Minecraft.World/net.minecraft.world.level.h"
+#include "../Minecraft.World/net.minecraft.world.level.chunk.h"
+#include "../Minecraft.World/RandomLevelSource.h"
 
 using namespace std;
 class ServerChunkCache;
diff --git a/Minecraft.Client/MultiPlayerGameMode.cpp b/Minecraft.Client/MultiPlayerGameMode.cpp
index 7de59803..696814d4 100644
--- a/Minecraft.Client/MultiPlayerGameMode.cpp
+++ b/Minecraft.Client/MultiPlayerGameMode.cpp
@@ -6,12 +6,12 @@
 #include "Minecraft.h"
 #include "ClientConnection.h"
 #include "LevelRenderer.h"
-#include "..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.player.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
-#include "..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\Minecraft.World\net.minecraft.h"
+#include "../Minecraft.World/net.minecraft.world.level.h"
+#include "../Minecraft.World/net.minecraft.world.item.h"
+#include "../Minecraft.World/net.minecraft.world.entity.player.h"
+#include "../Minecraft.World/net.minecraft.world.level.tile.h"
+#include "../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../Minecraft.World/net.minecraft.h"
 
 MultiPlayerGameMode::MultiPlayerGameMode(Minecraft *minecraft, ClientConnection *connection)
 {
diff --git a/Minecraft.Client/MultiPlayerLevel.cpp b/Minecraft.Client/MultiPlayerLevel.cpp
index 24b12bcd..b023d1da 100644
--- a/Minecraft.Client/MultiPlayerLevel.cpp
+++ b/Minecraft.Client/MultiPlayerLevel.cpp
@@ -3,15 +3,15 @@
 #include "MultiPlayerLocalPlayer.h"
 #include "ClientConnection.h"
 #include "MultiPlayerChunkCache.h"
-#include "..\Minecraft.World\net.minecraft.world.level.storage.h"
-#include "..\Minecraft.World\net.minecraft.world.level.dimension.h"
-#include "..\Minecraft.World\Pos.h"
+#include "../Minecraft.World/net.minecraft.world.level.storage.h"
+#include "../Minecraft.World/net.minecraft.world.level.dimension.h"
+#include "../Minecraft.World/Pos.h"
 #include "MinecraftServer.h"
 #include "ServerLevel.h"
 #include "Minecraft.h"
-#include "..\Minecraft.World\PrimedTnt.h"
-#include "..\Minecraft.World\Tile.h"
-#include "..\Minecraft.World\TileEntity.h"
+#include "../Minecraft.World/PrimedTnt.h"
+#include "../Minecraft.World/Tile.h"
+#include "../Minecraft.World/TileEntity.h"
 
 MultiPlayerLevel::ResetInfo::ResetInfo(int x, int y, int z, int tile, int data)
 {
diff --git a/Minecraft.Client/MultiPlayerLocalPlayer.cpp b/Minecraft.Client/MultiPlayerLocalPlayer.cpp
index bb2630e5..6e5658a9 100644
--- a/Minecraft.Client/MultiPlayerLocalPlayer.cpp
+++ b/Minecraft.Client/MultiPlayerLocalPlayer.cpp
@@ -1,17 +1,17 @@
 #include "stdafx.h"
-//#include "..\Minecraft.World\JavaMath.h"
+//#include "../Minecraft.World/JavaMath.h"
 #include "MultiplayerLocalPlayer.h"
 #include "ClientConnection.h"
-#include "..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\Minecraft.World\net.minecraft.network.h"
-#include "..\Minecraft.World\Mth.h"
-#include "..\Minecraft.World\AABB.h"
-#include "..\Minecraft.World\net.minecraft.stats.h"
-#include "..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\Minecraft.World\net.minecraft.world.level.dimension.h"
-#include "..\Minecraft.World\net.minecraft.world.effect.h"
-#include "..\Minecraft.World\LevelData.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.item.h"
+#include "../Minecraft.World/net.minecraft.world.level.h"
+#include "../Minecraft.World/net.minecraft.network.h"
+#include "../Minecraft.World/Mth.h"
+#include "../Minecraft.World/AABB.h"
+#include "../Minecraft.World/net.minecraft.stats.h"
+#include "../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../Minecraft.World/net.minecraft.world.level.dimension.h"
+#include "../Minecraft.World/net.minecraft.world.effect.h"
+#include "../Minecraft.World/LevelData.h"
+#include "../Minecraft.World/net.minecraft.world.entity.item.h"
 
 
 
diff --git a/Minecraft.Client/MushroomCowRenderer.cpp b/Minecraft.Client/MushroomCowRenderer.cpp
index 688fab5c..d7f0e721 100644
--- a/Minecraft.Client/MushroomCowRenderer.cpp
+++ b/Minecraft.Client/MushroomCowRenderer.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "../Minecraft.World/net.minecraft.world.entity.animal.h"
+#include "../Minecraft.World/net.minecraft.world.level.tile.h"
 #include "QuadrupedModel.h"
 #include "ModelPart.h"
 #include "MushroomCowRenderer.h"
diff --git a/Minecraft.Client/NameEntryScreen.cpp b/Minecraft.Client/NameEntryScreen.cpp
index c9df7024..d6b1e965 100644
--- a/Minecraft.Client/NameEntryScreen.cpp
+++ b/Minecraft.Client/NameEntryScreen.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "NameEntryScreen.h"
 #include "Button.h"
-#include "..\Minecraft.World\StringHelpers.h"
+#include "../Minecraft.World/StringHelpers.h"
 
 const wstring NameEntryScreen::allowedChars = L"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 ,.:-_'*!\"#%/()=+?[]{}<>";
 
diff --git a/Minecraft.Client/NetherPortalParticle.cpp b/Minecraft.Client/NetherPortalParticle.cpp
index 4b70d38f..b8fb1db6 100644
--- a/Minecraft.Client/NetherPortalParticle.cpp
+++ b/Minecraft.Client/NetherPortalParticle.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "NetherPortalParticle.h"
-#include "..\Minecraft.World\JavaMath.h"
-#include "..\Minecraft.World\Random.h"
+#include "../Minecraft.World/JavaMath.h"
+#include "../Minecraft.World/Random.h"
 #include "Minecraft.h"
 
 // 4J Stu - This class was originally "PortalParticle" but I have split the two uses of the particle
diff --git a/Minecraft.Client/NoteParticle.cpp b/Minecraft.Client/NoteParticle.cpp
index 2e2320c8..b95cc984 100644
--- a/Minecraft.Client/NoteParticle.cpp
+++ b/Minecraft.Client/NoteParticle.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "..\Minecraft.World\Mth.h"
+#include "../Minecraft.World/Mth.h"
 #include "NoteParticle.h"
 
 void NoteParticle::init(Level *level, double x, double y, double z, double xa, double ya, double za, float scale)
diff --git a/Minecraft.Client/OffsettedRenderList.cpp b/Minecraft.Client/OffsettedRenderList.cpp
index 729d26f9..cc81eab2 100644
--- a/Minecraft.Client/OffsettedRenderList.cpp
+++ b/Minecraft.Client/OffsettedRenderList.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "..\Minecraft.World\IntBuffer.h"
+#include "../Minecraft.World/IntBuffer.h"
 #include "OffsettedRenderList.h"
 
 // 4J added
diff --git a/Minecraft.Client/Options.cpp b/Minecraft.Client/Options.cpp
index 9952fc8c..fcc8468f 100644
--- a/Minecraft.Client/Options.cpp
+++ b/Minecraft.Client/Options.cpp
@@ -3,16 +3,16 @@
 #include "KeyMapping.h"
 #include "LevelRenderer.h"
 #include "Textures.h"
-#include "..\Minecraft.World\net.minecraft.locale.h"
-#include "..\Minecraft.World\Language.h"
-#include "..\Minecraft.World\File.h"
-#include "..\Minecraft.World\BufferedReader.h"
-#include "..\Minecraft.World\DataInputStream.h"
-#include "..\Minecraft.World\InputStreamReader.h"
-#include "..\Minecraft.World\FileInputStream.h"
-#include "..\Minecraft.World\FileOutputStream.h"
-#include "..\Minecraft.World\DataOutputStream.h"
-#include "..\Minecraft.World\StringHelpers.h"
+#include "../Minecraft.World/net.minecraft.locale.h"
+#include "../Minecraft.World/Language.h"
+#include "../Minecraft.World/File.h"
+#include "../Minecraft.World/BufferedReader.h"
+#include "../Minecraft.World/DataInputStream.h"
+#include "../Minecraft.World/InputStreamReader.h"
+#include "../Minecraft.World/FileInputStream.h"
+#include "../Minecraft.World/FileOutputStream.h"
+#include "../Minecraft.World/DataOutputStream.h"
+#include "../Minecraft.World/StringHelpers.h"
 
 // 4J - the Option sub-class used to be an java enumerated type, trying to emulate that functionality here
 const Options::Option Options::Option::options[17] =
diff --git a/Minecraft.Client/Options.h b/Minecraft.Client/Options.h
index 8be61ac6..3cf1b82c 100644
--- a/Minecraft.Client/Options.h
+++ b/Minecraft.Client/Options.h
@@ -2,7 +2,7 @@
 using namespace std;
 class Minecraft;
 class KeyMapping;
-#include "..\Minecraft.World\File.h"
+#include "../Minecraft.World/File.h"
 
 class Options
 {
diff --git a/Minecraft.Client/OptionsScreen.cpp b/Minecraft.Client/OptionsScreen.cpp
index b5c2f5e6..d8e0c2e6 100644
--- a/Minecraft.Client/OptionsScreen.cpp
+++ b/Minecraft.Client/OptionsScreen.cpp
@@ -5,7 +5,7 @@
 #include "Options.h"
 #include "ControlsScreen.h"
 #include "VideoSettingsScreen.h"
-#include "..\Minecraft.World\net.minecraft.locale.h"
+#include "../Minecraft.World/net.minecraft.locale.h"
 
 OptionsScreen::OptionsScreen(Screen *lastScreen, Options *options)
 {
diff --git a/Minecraft.Client/Orbis/Leaderboards/OrbisLeaderboardManager.cpp b/Minecraft.Client/Orbis/Leaderboards/OrbisLeaderboardManager.cpp
index b7662197..16ee326e 100644
--- a/Minecraft.Client/Orbis/Leaderboards/OrbisLeaderboardManager.cpp
+++ b/Minecraft.Client/Orbis/Leaderboards/OrbisLeaderboardManager.cpp
@@ -4,19 +4,19 @@
 
 #include "base64.h"
 
-#include "..\Orbis_App.h"
-#include "..\..\Common\Consoles_App.h"
+#include "../Orbis_App.h"
+#include "../../Common/Consoles_App.h"
 
-#include "Common\Network\Sony\SQRNetworkManager.h"
+#include "Common/Network/Sony/SQRNetworkManager.h"
 
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "../../../Minecraft.World/StringHelpers.h"
 
 #include <cstdlib>
 
 #include <np.h>
 //#include <sys/ppu_thread.h>
 
-#include "Orbis\OrbisExtras\ShutdownManager.h"
+#include "Orbis/OrbisExtras/ShutdownManager.h"
 
 
 LeaderboardManager *LeaderboardManager::m_instance = new OrbisLeaderboardManager(); //Singleton instance of the LeaderboardManager
@@ -133,7 +133,7 @@ void OrbisLeaderboardManager::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 PlayStation®Plus subscription and they are able to access the Leaderboards.
 
 		// NotifyAsyncPlusFeature();
 
diff --git a/Minecraft.Client/Orbis/Leaderboards/OrbisLeaderboardManager.h b/Minecraft.Client/Orbis/Leaderboards/OrbisLeaderboardManager.h
index c2243a93..430d3c06 100644
--- a/Minecraft.Client/Orbis/Leaderboards/OrbisLeaderboardManager.h
+++ b/Minecraft.Client/Orbis/Leaderboards/OrbisLeaderboardManager.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Common\Leaderboards\LeaderboardManager.h"
+#include "Common/Leaderboards/LeaderboardManager.h"
 
 class OrbisLeaderboardManager : public LeaderboardManager
 {
diff --git a/Minecraft.Client/Orbis/Network/Orbis_NPToolkit.cpp b/Minecraft.Client/Orbis/Network/Orbis_NPToolkit.cpp
index d1c9cf15..a5e7fce9 100644
--- a/Minecraft.Client/Orbis/Network/Orbis_NPToolkit.cpp
+++ b/Minecraft.Client/Orbis/Network/Orbis_NPToolkit.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 
 #include "Orbis_NPToolkit.h"
-#include "Orbis\ps4__np_conf.h"
+#include "Orbis/ps4__np_conf.h"
 #include "Orbis/Network/SonyCommerce_Orbis.h"
 
 // #define NP_TITLE_ID "CUSA00265_00"
diff --git a/Minecraft.Client/Orbis/Network/SQRNetworkManager_Orbis.cpp b/Minecraft.Client/Orbis/Network/SQRNetworkManager_Orbis.cpp
index 5c02cb08..b2ef49bb 100644
--- a/Minecraft.Client/Orbis/Network/SQRNetworkManager_Orbis.cpp
+++ b/Minecraft.Client/Orbis/Network/SQRNetworkManager_Orbis.cpp
@@ -12,9 +12,9 @@
 #include "../ps4__np_conf.h"
 #include "Orbis_NPToolkit.h"
 #include "SonyVoiceChat_Orbis.h"
-#include "Common\Network\Sony\SonyHttp.h"
-#include "..\..\..\Minecraft.World\C4JThread.h"
-// #include "..\PS3Extras\PS3Strings.h"
+#include "Common/Network/Sony/SonyHttp.h"
+#include "../../../Minecraft.World/C4JThread.h"
+// #include "../PS3Extras/PS3Strings.h"
 
 
 int (* SQRNetworkManager_Orbis::s_SignInCompleteCallbackFn)(void *pParam, bool bContinue, int pad) = NULL;
diff --git a/Minecraft.Client/Orbis/Network/SQRNetworkManager_Orbis.h b/Minecraft.Client/Orbis/Network/SQRNetworkManager_Orbis.h
index 5b19f63e..8bc917a2 100644
--- a/Minecraft.Client/Orbis/Network/SQRNetworkManager_Orbis.h
+++ b/Minecraft.Client/Orbis/Network/SQRNetworkManager_Orbis.h
@@ -8,7 +8,7 @@
 #include <unordered_map>
 // #include "SonyVoiceChat_Orbis.h"
 
-#include "..\..\Common\Network\Sony\SQRNetworkManager.h"
+#include "../../Common/Network/Sony/SQRNetworkManager.h"
 
 class SQRNetworkPlayer;
 class ISQRNetworkManagerListener;
diff --git a/Minecraft.Client/Orbis/Network/SonyCommerce_Orbis.cpp b/Minecraft.Client/Orbis/Network/SonyCommerce_Orbis.cpp
index 34ab67e4..4a576d7b 100644
--- a/Minecraft.Client/Orbis/Network/SonyCommerce_Orbis.cpp
+++ b/Minecraft.Client/Orbis/Network/SonyCommerce_Orbis.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 
 #include "SonyCommerce_Orbis.h"
-#include "PS3\PS3Extras\ShutdownManager.h"
+#include "PS3/PS3Extras/ShutdownManager.h"
 #include <sys/event.h>
 
 
@@ -600,7 +600,7 @@ int SonyCommerce_Orbis::createSession()
 	//
 	// sce::Toolkit::NP::Commerce::Interface::CreateSession
 	// 
-	// 	This function is provided to maintain compatibility with the PlayStation®Vita and PlayStation®3 platforms. Because commerce on the PlayStation®4 is not session based, SCE_TOOLKIT_NP_SUCCESS is always returned.
+	// 	This function is provided to maintain compatibility with the PlayStation®Vita and PlayStation®3 platforms. Because commerce on the PlayStation®4 is not session based, SCE_TOOLKIT_NP_SUCCESS is always returned.
 
 	int ret = sce::Toolkit::NP::Commerce::Interface::createSession();
 
@@ -1145,8 +1145,8 @@ void SonyCommerce_Orbis::CreateSession( CallbackFunc cb, LPVOID lpParam )
 	setCallback(cb,lpParam);
 
 	// We don't need to create a session on PS4, from the Sony docs - 
-//	This function is provided to maintain compatibility with the PlayStation®Vita and PlayStation®3 
-//	platforms. Because commerce on the PlayStation®4 is not session based, SCE_TOOLKIT_NP_SUCCESS is always returned.
+//	This function is provided to maintain compatibility with the PlayStation®Vita and PlayStation®3 
+//	platforms. Because commerce on the PlayStation®4 is not session based, SCE_TOOLKIT_NP_SUCCESS is always returned.
 
 
 
diff --git a/Minecraft.Client/Orbis/Network/SonyCommerce_Orbis.h b/Minecraft.Client/Orbis/Network/SonyCommerce_Orbis.h
index a2a42d57..3942fa56 100644
--- a/Minecraft.Client/Orbis/Network/SonyCommerce_Orbis.h
+++ b/Minecraft.Client/Orbis/Network/SonyCommerce_Orbis.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Common\Network\Sony\SonyCommerce.h"
+#include "Common/Network/Sony/SonyCommerce.h"
 class OrbisNPToolkit;
 	
 class SonyCommerce_Orbis : public SonyCommerce
diff --git a/Minecraft.Client/Orbis/Network/SonyRemoteStorage_Orbis.h b/Minecraft.Client/Orbis/Network/SonyRemoteStorage_Orbis.h
index 0b36c41d..a04411b3 100644
--- a/Minecraft.Client/Orbis/Network/SonyRemoteStorage_Orbis.h
+++ b/Minecraft.Client/Orbis/Network/SonyRemoteStorage_Orbis.h
@@ -1,7 +1,7 @@
 #pragma once 
 
 
-#include "Common\Network\Sony\SonyRemoteStorage.h"
+#include "Common/Network/Sony/SonyRemoteStorage.h"
 
 class SonyRemoteStorage_Orbis : public SonyRemoteStorage
 {
diff --git a/Minecraft.Client/Orbis/Orbis_App.cpp b/Minecraft.Client/Orbis/Orbis_App.cpp
index 9af5ee12..2a3d2f4a 100644
--- a/Minecraft.Client/Orbis/Orbis_App.cpp
+++ b/Minecraft.Client/Orbis/Orbis_App.cpp
@@ -1,22 +1,22 @@
 
 #include "stdafx.h"
-#include "..\Common\Consoles_App.h"
-#include "..\User.h"
-#include "..\..\Minecraft.Client\Minecraft.h"
-#include "..\..\Minecraft.Client\MinecraftServer.h"
-#include "..\..\Minecraft.Client\PlayerList.h"
-#include "..\..\Minecraft.Client\ServerPlayer.h"
-#include "..\..\Minecraft.World\Level.h"
-#include "..\..\Minecraft.World\LevelSettings.h"
-#include "..\..\Minecraft.World\BiomeSource.h"
-#include "..\..\Minecraft.World\LevelType.h"
-#include "..\..\Orbis\Network\SonyCommerce_Orbis.h"
-#include "..\..\Minecraft.World\StringHelpers.h"
+#include "../Common/Consoles_App.h"
+#include "../User.h"
+#include "../../Minecraft.Client/Minecraft.h"
+#include "../../Minecraft.Client/MinecraftServer.h"
+#include "../../Minecraft.Client/PlayerList.h"
+#include "../../Minecraft.Client/ServerPlayer.h"
+#include "../../Minecraft.World/Level.h"
+#include "../../Minecraft.World/LevelSettings.h"
+#include "../../Minecraft.World/BiomeSource.h"
+#include "../../Minecraft.World/LevelType.h"
+#include "../../Orbis/Network/SonyCommerce_Orbis.h"
+#include "../../Minecraft.World/StringHelpers.h"
 #include "Network/Orbis_NPToolkit.h"
-#include "Orbis\Network\SonyRemoteStorage_Orbis.h"
+#include "Orbis/Network/SonyRemoteStorage_Orbis.h"
 
 #include <system_service.h>
-#include "..\..\Common\Network\Sony\SonyRemoteStorage.h"
+#include "../../Common/Network/Sony/SonyRemoteStorage.h"
 #include <save_data_dialog.h>
 #include <error_dialog.h>
 
diff --git a/Minecraft.Client/Orbis/Orbis_App.h b/Minecraft.Client/Orbis/Orbis_App.h
index 1c09579f..d00b0d3f 100644
--- a/Minecraft.Client/Orbis/Orbis_App.h
+++ b/Minecraft.Client/Orbis/Orbis_App.h
@@ -3,8 +3,8 @@
 class C4JStringTable;
 #include <np_toolkit.h>
 
-#include "..\..\Common\Network\Sony\SonyCommerce.h"
-#include "..\..\Common\Network\Sony\SonyRemoteStorage.h"
+#include "../../Common/Network/Sony/SonyCommerce.h"
+#include "../../Common/Network/Sony/SonyRemoteStorage.h"
 
 #define PRODUCT_CODE_SIZE 9
 #define SAVEFOLDERPREFIX_SIZE 10
diff --git a/Minecraft.Client/Orbis/Orbis_Minecraft.cpp b/Minecraft.Client/Orbis/Orbis_Minecraft.cpp
index 947b9df8..364ef2b5 100644
--- a/Minecraft.Client/Orbis/Orbis_Minecraft.cpp
+++ b/Minecraft.Client/Orbis/Orbis_Minecraft.cpp
@@ -6,41 +6,41 @@
 #include <assert.h>
 #include <system_service.h>
 #include <codecvt>
-#include "GameConfig\Minecraft.spa.h"
-#include "..\MinecraftServer.h"
-#include "..\LocalPlayer.h"
-#include "..\..\Minecraft.World\ItemInstance.h"
-#include "..\..\Minecraft.World\MapItem.h"
-#include "..\..\Minecraft.World\Recipes.h"
-#include "..\..\Minecraft.World\Recipy.h"
-#include "..\..\Minecraft.World\Language.h"
-#include "..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\Minecraft.World\AABB.h"
-#include "..\..\Minecraft.World\Vec3.h"
-#include "..\..\Minecraft.World\Level.h"
-#include "..\..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "GameConfig/Minecraft.spa.h"
+#include "../MinecraftServer.h"
+#include "../LocalPlayer.h"
+#include "../../Minecraft.World/ItemInstance.h"
+#include "../../Minecraft.World/MapItem.h"
+#include "../../Minecraft.World/Recipes.h"
+#include "../../Minecraft.World/Recipy.h"
+#include "../../Minecraft.World/Language.h"
+#include "../../Minecraft.World/StringHelpers.h"
+#include "../../Minecraft.World/AABB.h"
+#include "../../Minecraft.World/Vec3.h"
+#include "../../Minecraft.World/Level.h"
+#include "../../Minecraft.World/net.minecraft.world.level.tile.h"
 
-#include "..\ClientConnection.h"
-#include "..\User.h"
-#include "..\..\Minecraft.World\Socket.h"
-#include "..\..\Minecraft.World\ThreadName.h"
-#include "..\..\Minecraft.Client\StatsCounter.h"
-#include "..\ConnectScreen.h"
-//#include "Social\SocialManager.h"
-//#include "Leaderboards\LeaderboardManager.h"
-//#include "XUI\XUI_Scene_Container.h"
+#include "../ClientConnection.h"
+#include "../User.h"
+#include "../../Minecraft.World/Socket.h"
+#include "../../Minecraft.World/ThreadName.h"
+#include "../../Minecraft.Client/StatsCounter.h"
+#include "../ConnectScreen.h"
+//#include "Social/SocialManager.h"
+//#include "Leaderboards/LeaderboardManager.h"
+//#include "XUI/XUI_Scene_Container.h"
 //#include "NetworkManager.h"
-#include "..\..\Minecraft.Client\Tesselator.h"
-#include "..\..\Minecraft.Client\Options.h"
-#include "Sentient\SentientManager.h"
-#include "..\..\Minecraft.World\IntCache.h"
-#include "..\Textures.h"
-#include "..\..\Minecraft.World\compression.h"
-#include "..\..\Minecraft.World\OldChunkStorage.h"
-#include "Leaderboards\OrbisLeaderboardManager.h"
+#include "../../Minecraft.Client/Tesselator.h"
+#include "../../Minecraft.Client/Options.h"
+#include "Sentient/SentientManager.h"
+#include "../../Minecraft.World/IntCache.h"
+#include "../Textures.h"
+#include "../../Minecraft.World/compression.h"
+#include "../../Minecraft.World/OldChunkStorage.h"
+#include "Leaderboards/OrbisLeaderboardManager.h"
 
 #include "Network/Orbis_NPToolkit.h"
-#include "Orbis\Network\SonyVoiceChat_Orbis.h"
+#include "Orbis/Network/SonyVoiceChat_Orbis.h"
 
 #define THEME_NAME		"584111F70AAAAAAA"
 #define THEME_FILESIZE	2797568
diff --git a/Minecraft.Client/Orbis/Orbis_PlayerUID.cpp b/Minecraft.Client/Orbis/Orbis_PlayerUID.cpp
index 114e6ae8..0dcd81c8 100644
--- a/Minecraft.Client/Orbis/Orbis_PlayerUID.cpp
+++ b/Minecraft.Client/Orbis/Orbis_PlayerUID.cpp
@@ -3,7 +3,7 @@
 
 #include "stdafx.h"
 #include "Orbis_PlayerUID.h"
-#include "..\Minecraft.World\StringHelpers.h"
+#include "../Minecraft.World/StringHelpers.h"
 
 #include <libnetctl.h>
 
diff --git a/Minecraft.Client/Orbis/Orbis_UIController.cpp b/Minecraft.Client/Orbis/Orbis_UIController.cpp
index 38cc79e9..035894f7 100644
--- a/Minecraft.Client/Orbis/Orbis_UIController.cpp
+++ b/Minecraft.Client/Orbis/Orbis_UIController.cpp
@@ -2,8 +2,8 @@
 #include "Orbis_UIController.h"
 
 // Temp
-#include "..\Minecraft.h"
-#include "..\Textures.h"
+#include "../Minecraft.h"
+#include "../Textures.h"
 
 #define _ENABLEIGGY
 
diff --git a/Minecraft.Client/Orbis/Orbis_UIController.h b/Minecraft.Client/Orbis/Orbis_UIController.h
index fcd901e2..940769e1 100644
--- a/Minecraft.Client/Orbis/Orbis_UIController.h
+++ b/Minecraft.Client/Orbis/Orbis_UIController.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "..\Common\UI\UIController.h"
+#include "../Common/UI/UIController.h"
 
 class ConsoleUIController : public UIController
 {
diff --git a/Minecraft.Client/Orbis/user_malloc.cpp b/Minecraft.Client/Orbis/user_malloc.cpp
index 6a85e83b..67656ff0 100644
--- a/Minecraft.Client/Orbis/user_malloc.cpp
+++ b/Minecraft.Client/Orbis/user_malloc.cpp
@@ -9,7 +9,7 @@ extern "C"
 #include <stdlib.h>
 #include <mspace.h>
 #include <kernel.h>
-#include "..\Minecraft.World\System.h"
+#include "../Minecraft.World/System.h"
 
 static size_t s_heapLength;
 static size_t s_memLength;
diff --git a/Minecraft.Client/OzelotModel.cpp b/Minecraft.Client/OzelotModel.cpp
index 9c22cc4b..63ab51f6 100644
--- a/Minecraft.Client/OzelotModel.cpp
+++ b/Minecraft.Client/OzelotModel.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "ModelPart.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
-#include "..\Minecraft.World\Mth.h"
+#include "../Minecraft.World/net.minecraft.world.entity.animal.h"
+#include "../Minecraft.World/Mth.h"
 #include "OzelotModel.h"
 
 const float OzelotModel::xo = 0;
diff --git a/Minecraft.Client/OzelotRenderer.cpp b/Minecraft.Client/OzelotRenderer.cpp
index d56b35f9..45575767 100644
--- a/Minecraft.Client/OzelotRenderer.cpp
+++ b/Minecraft.Client/OzelotRenderer.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
+#include "../Minecraft.World/net.minecraft.world.entity.animal.h"
 #include "OzelotRenderer.h"
 
 OzelotRenderer::OzelotRenderer(Model *model, float shadow) : MobRenderer(model, shadow)
diff --git a/Minecraft.Client/PS3/Audio/PS3_SoundEngine.cpp b/Minecraft.Client/PS3/Audio/PS3_SoundEngine.cpp
index fcce5f05..9e6f299c 100644
--- a/Minecraft.Client/PS3/Audio/PS3_SoundEngine.cpp
+++ b/Minecraft.Client/PS3/Audio/PS3_SoundEngine.cpp
@@ -1,13 +1,13 @@
-#include "..\stdafx.h"
+#include "../stdafx.h"
 #include <sysutil/sysutil_sysparam.h>
 #include <cell/sysmodule.h>
 #include <sys/spu_initialize.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <cell/audio.h>
-#include "..\..\Common\Audio\SoundEngine.h"
-#include "..\..\Common\Consoles_App.h"
-#include "..\..\PS3\Miles\include\mss.h"
+#include "../../Common/Audio/SoundEngine.h"
+#include "../../Common/Consoles_App.h"
+#include "../../PS3/Miles/include/mss.h"
 
 // This file has the platform specific functions required for PS3 audio
 
diff --git a/Minecraft.Client/PS3/Leaderboards/PS3LeaderboardManager.cpp b/Minecraft.Client/PS3/Leaderboards/PS3LeaderboardManager.cpp
index 38380bfb..1f6ebd69 100644
--- a/Minecraft.Client/PS3/Leaderboards/PS3LeaderboardManager.cpp
+++ b/Minecraft.Client/PS3/Leaderboards/PS3LeaderboardManager.cpp
@@ -4,19 +4,19 @@
 
 #include "base64.h"
 
-#include "..\PS3_App.h"
-#include "..\..\Common\Consoles_App.h"
+#include "../PS3_App.h"
+#include "../../Common/Consoles_App.h"
 
-#include "Common\Network\Sony\SQRNetworkManager.h"
+#include "Common/Network/Sony/SQRNetworkManager.h"
 
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "../../../Minecraft.World/StringHelpers.h"
 
 #include <cstdlib>
 
 #include <np.h>
 #include <sys/ppu_thread.h>
 
-#include "PS3\PS3Extras\ShutdownManager.h"
+#include "PS3/PS3Extras/ShutdownManager.h"
 
 #ifdef __PS3__
 LeaderboardManager *LeaderboardManager::m_instance = new PS3LeaderboardManager(); //Singleton instance of the LeaderboardManager
diff --git a/Minecraft.Client/PS3/Leaderboards/PS3LeaderboardManager.h b/Minecraft.Client/PS3/Leaderboards/PS3LeaderboardManager.h
index 7a85896d..dbe6bd72 100644
--- a/Minecraft.Client/PS3/Leaderboards/PS3LeaderboardManager.h
+++ b/Minecraft.Client/PS3/Leaderboards/PS3LeaderboardManager.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "..\..\Common\Leaderboards\LeaderboardManager.h"
-#include "..\..\..\Minecraft.World\x64headers\extraX64.h"
+#include "../../Common/Leaderboards/LeaderboardManager.h"
+#include "../../../Minecraft.World/x64headers/extraX64.h"
 
-#include "PS3\Passphrase\ps3__np_conf.h"
+#include "PS3/Passphrase/ps3__np_conf.h"
 
 using namespace std;
 
diff --git a/Minecraft.Client/PS3/Network/SQRNetworkManager_PS3.cpp b/Minecraft.Client/PS3/Network/SQRNetworkManager_PS3.cpp
index 46b1916d..60362c97 100644
--- a/Minecraft.Client/PS3/Network/SQRNetworkManager_PS3.cpp
+++ b/Minecraft.Client/PS3/Network/SQRNetworkManager_PS3.cpp
@@ -15,9 +15,9 @@
 #include "SonyVoiceChat.h"
 #include "Common/Network/Sony/SonyHttp.h"
 #endif
-#include "..\..\..\Minecraft.World\C4JThread.h"
-#include "..\PS3Extras\PS3Strings.h"
-#include "PS3\Network\SonyRemoteStorage_PS3.h"
+#include "../../../Minecraft.World/C4JThread.h"
+#include "../PS3Extras/PS3Strings.h"
+#include "PS3/Network/SonyRemoteStorage_PS3.h"
 
 int (* SQRNetworkManager_PS3::s_SignInCompleteCallbackFn)(void *pParam, bool bContinue, int pad) = NULL;
 void * SQRNetworkManager_PS3::s_SignInCompleteParam = NULL;
diff --git a/Minecraft.Client/PS3/Network/SQRNetworkManager_PS3.h b/Minecraft.Client/PS3/Network/SQRNetworkManager_PS3.h
index 6143bbb5..715e80b2 100644
--- a/Minecraft.Client/PS3/Network/SQRNetworkManager_PS3.h
+++ b/Minecraft.Client/PS3/Network/SQRNetworkManager_PS3.h
@@ -9,7 +9,7 @@
 #endif
 #include <queue>
 
-#include "..\..\Common\Network\Sony\SQRNetworkManager.h"
+#include "../../Common/Network/Sony/SQRNetworkManager.h"
 
 class SQRNetworkPlayer;
 class ISQRNetworkManagerListener;
diff --git a/Minecraft.Client/PS3/Network/SonyCommerce_PS3.cpp b/Minecraft.Client/PS3/Network/SonyCommerce_PS3.cpp
index 230e0309..cc82970f 100644
--- a/Minecraft.Client/PS3/Network/SonyCommerce_PS3.cpp
+++ b/Minecraft.Client/PS3/Network/SonyCommerce_PS3.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 
 #include "SonyCommerce_PS3.h"
-#include "..\PS3Extras\ShutdownManager.h"
+#include "../PS3Extras/ShutdownManager.h"
 #include <sys/event.h>
 
 
diff --git a/Minecraft.Client/PS3/Network/SonyCommerce_PS3.h b/Minecraft.Client/PS3/Network/SonyCommerce_PS3.h
index 1f43341a..38857b0d 100644
--- a/Minecraft.Client/PS3/Network/SonyCommerce_PS3.h
+++ b/Minecraft.Client/PS3/Network/SonyCommerce_PS3.h
@@ -6,7 +6,7 @@
 #include <np.h>
 #include <np/drm.h>
 #include <np/commerce2.h>
-#include "Common\Network\Sony\SonyCommerce.h"
+#include "Common/Network/Sony/SonyCommerce.h"
 
 #define SCE_TOOLKIT_NP_SKU_PRICE_LEN	(SCE_NP_COMMERCE2_CURRENCY_CODE_LEN \
 	+ SCE_NP_COMMERCE2_CURRENCY_SYMBOL_LEN \
diff --git a/Minecraft.Client/PS3/Network/SonyRemoteStorage_PS3.h b/Minecraft.Client/PS3/Network/SonyRemoteStorage_PS3.h
index ffbc57b0..61518006 100644
--- a/Minecraft.Client/PS3/Network/SonyRemoteStorage_PS3.h
+++ b/Minecraft.Client/PS3/Network/SonyRemoteStorage_PS3.h
@@ -1,7 +1,7 @@
 #pragma once 
 
 
-#include "Common\Network\Sony\sceRemoteStorage\header\sceRemoteStorage.h"
+#include "Common/Network/Sony/sceRemoteStorage/header/sceRemoteStorage.h"
 
 class SonyRemoteStorage_PS3 : public SonyRemoteStorage
 {
diff --git a/Minecraft.Client/PS3/PS3Extras/C4JSpursJob.cpp b/Minecraft.Client/PS3/PS3Extras/C4JSpursJob.cpp
index fd8ddd9a..f970ded2 100644
--- a/Minecraft.Client/PS3/PS3Extras/C4JSpursJob.cpp
+++ b/Minecraft.Client/PS3/PS3Extras/C4JSpursJob.cpp
@@ -7,7 +7,7 @@
 #include <cell/spurs.h>
 #include "C4JSpursJob.h"
 #include "C4JThread_SPU.h"
-// #include "PS3\SPU_Tasks\SPUMemTools\SPUMemTools.h"
+// #include "PS3/SPU_Tasks/SPUMemTools/SPUMemTools.h"
 
 
 using namespace cell::Spurs::JobQueue;
diff --git a/Minecraft.Client/PS3/PS3Extras/C4JThread_SPU.cpp b/Minecraft.Client/PS3/PS3Extras/C4JThread_SPU.cpp
index 94d7ef87..aea6712b 100644
--- a/Minecraft.Client/PS3/PS3Extras/C4JThread_SPU.cpp
+++ b/Minecraft.Client/PS3/PS3Extras/C4JThread_SPU.cpp
@@ -3,9 +3,9 @@
 #include "stdafx.h"
 
 #include "C4JThread_SPU.h"
-#include "PS3\SPU_Tasks\ChunkUpdate\ChunkRebuildData.h"
-#include "PS3\SPU_Tasks\CompressedTile\CompressedTileStorage_SPU.h"
-#include "PS3\SPU_Tasks\LevelRenderChunks\LevelRenderChunks.h"
+#include "PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.h"
+#include "PS3/SPU_Tasks/CompressedTile/CompressedTileStorage_SPU.h"
+#include "PS3/SPU_Tasks/LevelRenderChunks/LevelRenderChunks.h"
 
 #define SPURS_MAX_SPU					6
 #define SPURS_PPU_THREAD_PRIORITY		2
diff --git a/Minecraft.Client/PS3/PS3Extras/DirectX/sal.h b/Minecraft.Client/PS3/PS3Extras/DirectX/sal.h
index 3576d7ed..f81fdeef 100644
--- a/Minecraft.Client/PS3/PS3Extras/DirectX/sal.h
+++ b/Minecraft.Client/PS3/PS3Extras/DirectX/sal.h
@@ -157,7 +157,7 @@
 #endif
 
 #if defined(_MSC_EXTENSIONS) && !defined( MIDL_PASS ) && !defined(__midl) && !defined(RC_INVOKED)
-#include "codeanalysis\sourceannotations.h"
+#include "codeanalysis/sourceannotations.h"
 #endif
 
 //============================================================================
diff --git a/Minecraft.Client/PS3/PS3Extras/Ps3Types.h b/Minecraft.Client/PS3/PS3Extras/Ps3Types.h
index b6cf351d..0d26e4f9 100644
--- a/Minecraft.Client/PS3/PS3Extras/Ps3Types.h
+++ b/Minecraft.Client/PS3/PS3Extras/Ps3Types.h
@@ -71,7 +71,7 @@ extern Cnullptr nullptr;
 
 
 // #include <math.h>
-// #include "DirectX\DirectXMath.h"
+// #include "DirectX/DirectXMath.h"
 // using namespace DirectX;
 
 #define S_OK 0
diff --git a/Minecraft.Client/PS3/PS3Extras/ShutdownManager.cpp b/Minecraft.Client/PS3/PS3Extras/ShutdownManager.cpp
index e7eca53f..ce7365e3 100644
--- a/Minecraft.Client/PS3/PS3Extras/ShutdownManager.cpp
+++ b/Minecraft.Client/PS3/PS3Extras/ShutdownManager.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "ShutdownManager.h"
-#include "..\..\Common\Leaderboards\LeaderboardManager.h"
-#include "..\..\MinecraftServer.h"
+#include "../../Common/Leaderboards/LeaderboardManager.h"
+#include "../../MinecraftServer.h"
 #ifdef __PS3__
 #include "C4JSpursJob.h"
 
diff --git a/Minecraft.Client/PS3/PS3_App.cpp b/Minecraft.Client/PS3/PS3_App.cpp
index d2ab7150..addea2aa 100644
--- a/Minecraft.Client/PS3/PS3_App.cpp
+++ b/Minecraft.Client/PS3/PS3_App.cpp
@@ -1,19 +1,19 @@
 
 #include "stdafx.h"
-#include "..\Common\Consoles_App.h"
-#include "..\User.h"
-#include "..\..\Minecraft.Client\Minecraft.h"
-#include "..\..\Minecraft.Client\MinecraftServer.h"
-#include "..\..\Minecraft.Client\PlayerList.h"
-#include "..\..\Minecraft.Client\ServerPlayer.h"
-#include "..\..\Minecraft.World\Level.h"
-#include "..\..\Minecraft.World\LevelSettings.h"
-#include "..\..\Minecraft.World\BiomeSource.h"
-#include "..\..\Minecraft.World\LevelType.h"
-#include "..\..\PS3\Network\SonyCommerce_PS3.h"
-#include "..\..\Minecraft.World\StringHelpers.h"
-#include "PS3Extras\ShutdownManager.h"
-#include "PS3\Network\SonyRemoteStorage_PS3.h"
+#include "../Common/Consoles_App.h"
+#include "../User.h"
+#include "../../Minecraft.Client/Minecraft.h"
+#include "../../Minecraft.Client/MinecraftServer.h"
+#include "../../Minecraft.Client/PlayerList.h"
+#include "../../Minecraft.Client/ServerPlayer.h"
+#include "../../Minecraft.World/Level.h"
+#include "../../Minecraft.World/LevelSettings.h"
+#include "../../Minecraft.World/BiomeSource.h"
+#include "../../Minecraft.World/LevelType.h"
+#include "../../PS3/Network/SonyCommerce_PS3.h"
+#include "../../Minecraft.World/StringHelpers.h"
+#include "PS3Extras/ShutdownManager.h"
+#include "PS3/Network/SonyRemoteStorage_PS3.h"
 
 
 
diff --git a/Minecraft.Client/PS3/PS3_App.h b/Minecraft.Client/PS3/PS3_App.h
index d1ecdb6f..5c987391 100644
--- a/Minecraft.Client/PS3/PS3_App.h
+++ b/Minecraft.Client/PS3/PS3_App.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "..\..\Common\Network\Sony\SonyCommerce.h"
-#include "..\..\Common\Network\Sony\SonyRemoteStorage.h"
+#include "../../Common/Network/Sony/SonyCommerce.h"
+#include "../../Common/Network/Sony/SonyRemoteStorage.h"
 
 #define PRODUCT_CODE_SIZE 9
 #define SAVEFOLDERPREFIX_SIZE 10
diff --git a/Minecraft.Client/PS3/PS3_Minecraft.cpp b/Minecraft.Client/PS3/PS3_Minecraft.cpp
index 821a47d9..82c89b15 100644
--- a/Minecraft.Client/PS3/PS3_Minecraft.cpp
+++ b/Minecraft.Client/PS3/PS3_Minecraft.cpp
@@ -17,9 +17,9 @@ SYS_PROCESS_PARAM(1001, 0x10000);  // thread priority, and stack size
 #include <sysutil/sysutil_gamecontent.h>
 //#include <sysutil/sysutil_screenshot.h>
 
-#include "Leaderboards\PS3LeaderboardManager.h"
-#include "PS3\PS3Extras\PS3Strings.h"
-#include "PS3\PS3Extras\ShutdownManager.h"
+#include "Leaderboards/PS3LeaderboardManager.h"
+#include "PS3/PS3Extras/PS3Strings.h"
+#include "PS3/PS3Extras/ShutdownManager.h"
 #include <sysutil/sysutil_bgmplayback.h>
 #include <sysutil/sysutil_msgdialog.h>
 
@@ -54,48 +54,48 @@ char secureFileId[CELL_SAVEDATA_SECUREFILEID_SIZE] =
 // --wrap malloc --wrap free --wrap memalign --wrap calloc --wrap realloc --wrap reallocalign  --wrap _malloc_init 
 
 #if HEAPINSPECTOR_PS3
-#include "HeapInspector\Server\HeapInspectorServer.h"
-#include "HeapInspector\Server\PS3\HeapHooks.hpp"
+#include "HeapInspector/Server/HeapInspectorServer.h"
+#include "HeapInspector/Server/PS3/HeapHooks.hpp"
 #endif
 
 #include "PS3_App.h"
-#include "GameConfig\Minecraft.spa.h"
-#include "..\MinecraftServer.h"
-#include "..\LocalPlayer.h"
-#include "..\..\Minecraft.World\ItemInstance.h"
-#include "..\..\Minecraft.World\MapItem.h"
-#include "..\..\Minecraft.World\Recipes.h"
-#include "..\..\Minecraft.World\Recipy.h"
-#include "..\..\Minecraft.World\Language.h"
-#include "..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\Minecraft.World\AABB.h"
-#include "..\..\Minecraft.World\Vec3.h"
-#include "..\..\Minecraft.World\Level.h"
-#include "..\..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "GameConfig/Minecraft.spa.h"
+#include "../MinecraftServer.h"
+#include "../LocalPlayer.h"
+#include "../../Minecraft.World/ItemInstance.h"
+#include "../../Minecraft.World/MapItem.h"
+#include "../../Minecraft.World/Recipes.h"
+#include "../../Minecraft.World/Recipy.h"
+#include "../../Minecraft.World/Language.h"
+#include "../../Minecraft.World/StringHelpers.h"
+#include "../../Minecraft.World/AABB.h"
+#include "../../Minecraft.World/Vec3.h"
+#include "../../Minecraft.World/Level.h"
+#include "../../Minecraft.World/net.minecraft.world.level.tile.h"
 
-#include "..\ClientConnection.h"
-#include "..\User.h"
-#include "..\..\Minecraft.World\Socket.h"
-#include "..\..\Minecraft.World\ThreadName.h"
-#include "..\..\Minecraft.Client\StatsCounter.h"
-#include "..\ConnectScreen.h"
-//#include "Social\SocialManager.h"
-//#include "Leaderboards\LeaderboardManager.h"
-//#include "XUI\XUI_Scene_Container.h"
+#include "../ClientConnection.h"
+#include "../User.h"
+#include "../../Minecraft.World/Socket.h"
+#include "../../Minecraft.World/ThreadName.h"
+#include "../../Minecraft.Client/StatsCounter.h"
+#include "../ConnectScreen.h"
+//#include "Social/SocialManager.h"
+//#include "Leaderboards/LeaderboardManager.h"
+//#include "XUI/XUI_Scene_Container.h"
 //#include "NetworkManager.h"
-#include "..\..\Minecraft.Client\Tesselator.h"
-#include "..\Common\Console_Awards_enum.h"
-#include "..\..\Minecraft.Client\Options.h"
-#include "Sentient\SentientManager.h"
-#include "..\..\Minecraft.World\IntCache.h"
-#include "..\Textures.h"
+#include "../../Minecraft.Client/Tesselator.h"
+#include "../Common/Console_Awards_enum.h"
+#include "../../Minecraft.Client/Options.h"
+#include "Sentient/SentientManager.h"
+#include "../../Minecraft.World/IntCache.h"
+#include "../Textures.h"
 #include "Resource.h"
-#include "..\..\Minecraft.World\compression.h"
-#include "..\..\Minecraft.World\OldChunkStorage.h"
-#include "PS3\PS3Extras\EdgeZLib.h"
+#include "../../Minecraft.World/compression.h"
+#include "../../Minecraft.World/OldChunkStorage.h"
+#include "PS3/PS3Extras/EdgeZLib.h"
 #include "C4JThread_SPU.h"
-#include "Common\Network\Sony\SQRNetworkManager.h"
-#include "Common\UI\IUIScene_PauseMenu.h"
+#include "Common/Network/Sony/SQRNetworkManager.h"
+#include "Common/UI/IUIScene_PauseMenu.h"
 
 #include <cell/sysmodule.h>
 
@@ -961,10 +961,10 @@ int main()
 	}
 	else
 	{
-		StorageManager.SetGameSaveFolderTitle((WCHAR *)app.GetString(IDS_GAMENAME));//"Minecraft: PlayStation®3 Edition");//GAMENAME);
+		StorageManager.SetGameSaveFolderTitle((WCHAR *)app.GetString(IDS_GAMENAME));//"Minecraft: PlayStation®3 Edition");//GAMENAME);
 	}
-	StorageManager.SetSaveCacheFolderTitle((WCHAR *)app.GetString(IDS_SAVECACHEFILE));//"Minecraft: PlayStation®3 Edition");//GAMENAME);
-	StorageManager.SetOptionsFolderTitle((WCHAR *)app.GetString(IDS_OPTIONSFILE));//"Minecraft: PlayStation®3 Edition");//GAMENAME);
+	StorageManager.SetSaveCacheFolderTitle((WCHAR *)app.GetString(IDS_SAVECACHEFILE));//"Minecraft: PlayStation®3 Edition");//GAMENAME);
+	StorageManager.SetOptionsFolderTitle((WCHAR *)app.GetString(IDS_OPTIONSFILE));//"Minecraft: PlayStation®3 Edition");//GAMENAME);
 	StorageManager.SetGameSaveFolderPrefix(app.GetSaveFolderPrefix());
 	StorageManager.SetMaxSaves(99);
 	byteArray baOptionsIcon = app.getArchiveFile(L"DefaultOptionsImage320x176.png");
diff --git a/Minecraft.Client/PS3/PS3_PlayerUID.cpp b/Minecraft.Client/PS3/PS3_PlayerUID.cpp
index 8256ac21..9a2a8a0a 100644
--- a/Minecraft.Client/PS3/PS3_PlayerUID.cpp
+++ b/Minecraft.Client/PS3/PS3_PlayerUID.cpp
@@ -3,7 +3,7 @@
 
 #include "stdafx.h"
 #include "PS3_PlayerUID.h"
-#include "..\Minecraft.World\StringHelpers.h"
+#include "../Minecraft.World/StringHelpers.h"
 
 std::size_t PlayerUID::Hash::operator()(const PlayerUID& k) const
 {
diff --git a/Minecraft.Client/PS3/PS3_UIController.cpp b/Minecraft.Client/PS3/PS3_UIController.cpp
index 7b634e3b..9d2f6a93 100644
--- a/Minecraft.Client/PS3/PS3_UIController.cpp
+++ b/Minecraft.Client/PS3/PS3_UIController.cpp
@@ -4,8 +4,8 @@
 #include <cell/gcm.h>
 
 // Temp
-#include "..\Minecraft.h"
-#include "..\Textures.h"
+#include "../Minecraft.h"
+#include "../Textures.h"
 
 #define _ENABLEIGGY
 
diff --git a/Minecraft.Client/PS3/PS3_UIController.h b/Minecraft.Client/PS3/PS3_UIController.h
index 0077b8cf..f8308a44 100644
--- a/Minecraft.Client/PS3/PS3_UIController.h
+++ b/Minecraft.Client/PS3/PS3_UIController.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "..\Common\UI\UIController.h"
+#include "../Common/UI/UIController.h"
 
 class ConsoleUIController : public UIController
 {
diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.cpp b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.cpp
index 1cb5e2ee..2ae79628 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.cpp
+++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #ifdef __PS3__
 #ifndef SN_TARGET_PS3_SPU
-// 	#include "..\..\..\stdafx.h"
+// 	#include "../../../stdafx.h"
 #endif
 #endif 
 
@@ -10,24 +10,24 @@
 
 
 #ifndef SN_TARGET_PS3_SPU
-#include "..\..\..\..\Minecraft.World\Tile.h"
-#include "..\..\..\..\Minecraft.World\Level.h"
-#include "..\..\..\..\Minecraft.World\Dimension.h"
+#include "../../../../Minecraft.World/Tile.h"
+#include "../../../../Minecraft.World/Level.h"
+#include "../../../../Minecraft.World/Dimension.h"
 // 
-// #include "..\..\..\Chunk.h"
-// #include "..\..\..\TileRenderer.h"
-// #include "..\..\..\TileEntityRenderDispatcher.h"
-// #include "..\..\..\LevelRenderer.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\Icon.h"
-#include "..\..\..\..\Minecraft.World\BiomeSource.h"
+// #include "../../../Chunk.h"
+// #include "../../../TileRenderer.h"
+// #include "../../../TileEntityRenderDispatcher.h"
+// #include "../../../LevelRenderer.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/Icon.h"
+#include "../../../../Minecraft.World/BiomeSource.h"
 
 #else
  
-#include "..\Common\spu_assert.h"
+#include "../Common/spu_assert.h"
 
 #endif //SN_TARGET_PS3_SPU
 
diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.h b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.h
index c733a928..8262e41c 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.h
+++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.h
@@ -1,13 +1,13 @@
 
 #pragma once
 #ifndef SN_TARGET_PS3_SPU
-#include "..\..\..\stdafx.h"
-#include "..\..\..\..\Minecraft.World\Region.h"
-#include "..\..\..\Tesselator.h"
-#include "..\..\..\..\Minecraft.World\LightLayer.h"
+#include "../../../stdafx.h"
+#include "../../../../Minecraft.World/Region.h"
+#include "../../../Tesselator.h"
+#include "../../../../Minecraft.World/LightLayer.h"
 #endif // SN_TARGET_PS3_SPU
 
-#include "..\..\..\..\Minecraft.World\LightLayer.h"
+#include "../../../../Minecraft.World/LightLayer.h"
 #include "Tile_SPU.h"
 #include "Tesselator_SPU.h"
 
diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/LiquidTile_SPU.cpp b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/LiquidTile_SPU.cpp
index 7f13fd4f..41a6b076 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/LiquidTile_SPU.cpp
+++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/LiquidTile_SPU.cpp
@@ -4,7 +4,7 @@
 #include "ChunkRebuildData.h"
 
 #ifdef SN_TARGET_PS3_SPU
-#include "..\Common\spu_assert.h"
+#include "../Common/spu_assert.h"
 #endif
 
 // const wstring LiquidTile::TEXTURE_LAVA_STILL = L"lava";
diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tesselator_SPU.cpp b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tesselator_SPU.cpp
index 3d1007af..b5c1c3bd 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tesselator_SPU.cpp
+++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tesselator_SPU.cpp
@@ -9,16 +9,16 @@
 #include <cell/spurs.h>
 #include <cell/dma.h>
 #include <math.h>
-#include "..\Common\spu_assert.h"
+#include "../Common/spu_assert.h"
 #endif // SN_TARGET_PS3_SPU
 
 #include "Tesselator_SPU.h"
 
 static const bool sc_verbose = false;
-// #include "..\Minecraft.World\BasicTypeContainers.h"
-// #include "..\Minecraft.World\FloatBuffer.h"
-// #include "..\Minecraft.World\IntBuffer.h"
-// #include "..\Minecraft.World\ByteBuffer.h"
+// #include "../Minecraft.World/BasicTypeContainers.h"
+// #include "../Minecraft.World/FloatBuffer.h"
+// #include "../Minecraft.World/IntBuffer.h"
+// #include "../Minecraft.World/ByteBuffer.h"
 
 #ifdef SN_TARGET_PS3_SPU
 
diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tesselator_SPU.h b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tesselator_SPU.h
index 66e8424e..26acd43c 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tesselator_SPU.h
+++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tesselator_SPU.h
@@ -6,7 +6,7 @@ typedef unsigned int DWORD;
 typedef unsigned char byte;
 #include <float.h>
 #else 
-#include "..\..\..\stdafx.h"
+#include "../../../stdafx.h"
 class ChunkRebuildData;
 #endif
 #endif
diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/TileRenderer_SPU.cpp b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/TileRenderer_SPU.cpp
index ab9b2c94..7d59c4e9 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/TileRenderer_SPU.cpp
+++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/TileRenderer_SPU.cpp
@@ -25,7 +25,7 @@
 #include <assert.h>
 
 #ifdef SN_TARGET_PS3_SPU
-#include "..\Common\spu_assert.h"
+#include "../Common/spu_assert.h"
 #endif 
 
 static const float MATH_PI = 3.141592654f;
@@ -33,12 +33,12 @@ static const float MATH_PI = 3.141592654f;
 // #include "GameRenderer.h"
 // #include "Minecraft.h"
 // #include "Textures.h"
-// #include "..\Minecraft.World\net.minecraft.world.level.h"
-//  #include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
-// #include "..\Minecraft.World\net.minecraft.world.level.material.h"
-// #include "..\Minecraft.World\net.minecraft.h"
-// #include "..\Minecraft.World\net.minecraft.world.h"
-//  #include "..\..\..\Minecraft.World\net.minecraft.world.level.tile.h"
+// #include "../Minecraft.World/net.minecraft.world.level.h"
+//  #include "../../../Minecraft.World/net.minecraft.world.level.tile.h"
+// #include "../Minecraft.World/net.minecraft.world.level.material.h"
+// #include "../Minecraft.World/net.minecraft.h"
+// #include "../Minecraft.World/net.minecraft.world.h"
+//  #include "../../../Minecraft.World/net.minecraft.world.level.tile.h"
 
 #include "Tesselator_SPU.h"
 
@@ -46,7 +46,7 @@ static const float MATH_PI = 3.141592654f;
 #include "Stubs_SPU.h"
 #endif // SN_TARGET_PS3_SPU
 
-// #include "..\..\Minecraft.World\SharedConstants.h"
+// #include "../../Minecraft.World/SharedConstants.h"
 #include "Facing_SPU.h"
 
 // #include "EntityTileRenderer.h"
diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.cpp b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.cpp
index f2dfeaac..77886f91 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.cpp
+++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.cpp
@@ -85,7 +85,7 @@
 #include "WoolCarpetTile_SPU.h"
 
 #ifdef SN_TARGET_PS3_SPU
-#include "..\Common\spu_assert.h"
+#include "../Common/spu_assert.h"
 #endif
 
 #include <assert.h>
diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/task.cpp b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/task.cpp
index 24dd069a..1fc3e58f 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/task.cpp
+++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/task.cpp
@@ -13,7 +13,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001
 
 #include "ChunkRebuildData.h"
 #include "TileRenderer_SPU.h"
-#include "..\Common\DmaData.h"
+#include "../Common/DmaData.h"
 
 // #define SPU_HEAPSIZE (0*1024)
 // #define SPU_STACKSIZE (64*1024)
diff --git a/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTileStorage_SPU.cpp b/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTileStorage_SPU.cpp
index dc134eca..402fae88 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTileStorage_SPU.cpp
+++ b/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTileStorage_SPU.cpp
@@ -1,11 +1,11 @@
 #include "stdafx.h"
 #include "CompressedTileStorage_SPU.h"
 #ifdef SN_TARGET_PS3_SPU
-#include "..\Common\DmaData.h"
+#include "../Common/DmaData.h"
 #else
-#include "..\..\..\..\Minecraft.World\Tile.h"
-#include "..\..\..\..\Minecraft.World\TilePos.h"
-#include "..\..\..\..\Minecraft.World\LevelChunk.h"
+#include "../../../../Minecraft.World/Tile.h"
+#include "../../../../Minecraft.World/TilePos.h"
+#include "../../../../Minecraft.World/LevelChunk.h"
 #endif
 
 #include <stdlib.h>
diff --git a/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTileStorage_SPU.h b/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTileStorage_SPU.h
index 51937a87..2c8d8ec0 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTileStorage_SPU.h
+++ b/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTileStorage_SPU.h
@@ -6,8 +6,8 @@
 #include "SparseDataStorage_SPU.h"
 
 #ifndef SN_TARGET_PS3_SPU
-#include "..\..\..\stdafx.h"
-#include "..\..\..\..\Minecraft.World\Region.h"
+#include "../../../stdafx.h"
+#include "../../../../Minecraft.World/Region.h"
 #endif // SN_TARGET_PS3_SPU
 
 //#include "xmcore.h"
diff --git a/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTile_main.cpp b/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTile_main.cpp
index b25e04e0..a02dbe09 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTile_main.cpp
+++ b/Minecraft.Client/PS3/SPU_Tasks/CompressedTile/CompressedTile_main.cpp
@@ -13,7 +13,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001
 #include <cell/spurs/job_queue.h>
 
 #include "CompressedTileStorage_SPU.h"
-#include "..\Common\DmaData.h"
+#include "../Common/DmaData.h"
 
 // #define SPU_HEAPSIZE (128*1024)
 // #define SPU_STACKSIZE (16*1024)
diff --git a/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_compress/CompressedTileStorage_compress.cpp b/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_compress/CompressedTileStorage_compress.cpp
index 7a05169a..b699a022 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_compress/CompressedTileStorage_compress.cpp
+++ b/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_compress/CompressedTileStorage_compress.cpp
@@ -13,7 +13,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001
 #include <cell/dma.h>
 #include <cell/spurs/job_queue.h>
 
-#include "..\Common\DmaData.h"
+#include "../Common/DmaData.h"
 
 #include "CompressedTileStorage_compress.h"
 
diff --git a/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_getData/CompressedTileStorage_getData.cpp b/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_getData/CompressedTileStorage_getData.cpp
index fa52c3e1..a38f4e91 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_getData/CompressedTileStorage_getData.cpp
+++ b/Minecraft.Client/PS3/SPU_Tasks/CompressedTileStorage_getData/CompressedTileStorage_getData.cpp
@@ -14,7 +14,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001
 #include <cell/dma.h>
 #include <cell/spurs/job_queue.h>
 
-#include "..\Common\DmaData.h"
+#include "../Common/DmaData.h"
 
 #include "CompressedTileStorage_getData.h"
 
diff --git a/Minecraft.Client/PS3/SPU_Tasks/GameRenderer_updateLightTexture/GameRenderer_updateLightTexture.cpp b/Minecraft.Client/PS3/SPU_Tasks/GameRenderer_updateLightTexture/GameRenderer_updateLightTexture.cpp
index 7199b8fc..2e659949 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/GameRenderer_updateLightTexture/GameRenderer_updateLightTexture.cpp
+++ b/Minecraft.Client/PS3/SPU_Tasks/GameRenderer_updateLightTexture/GameRenderer_updateLightTexture.cpp
@@ -14,7 +14,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001
 #include <cell/dma.h>
 #include <cell/spurs/job_queue.h>
 
-#include "..\Common\DmaData.h"
+#include "../Common/DmaData.h"
 
 #include "GameRenderer_updateLightTexture.h"
 
diff --git a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderChunks/LevelRenderChunks_main.cpp b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderChunks/LevelRenderChunks_main.cpp
index 11c3604f..4ddb89a7 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderChunks/LevelRenderChunks_main.cpp
+++ b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderChunks/LevelRenderChunks_main.cpp
@@ -15,7 +15,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001
 #include <cell/gcm_spu.h>
 
 
-#include "..\Common\DmaData.h"
+#include "../Common/DmaData.h"
 #include "LevelRenderChunks.h"
 #include <cell/gcm_spu.h>
 
diff --git a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk/LevelRenderer_FindNearestChunk.cpp b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk/LevelRenderer_FindNearestChunk.cpp
index 0912e33a..093b1a0d 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk/LevelRenderer_FindNearestChunk.cpp
+++ b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_FindNearestChunk/LevelRenderer_FindNearestChunk.cpp
@@ -14,7 +14,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001
 #include <cell/spurs/job_queue.h>
 
 #include "LevelRenderer_FindNearestChunk.h"
-#include "..\Common\DmaData.h"
+#include "../Common/DmaData.h"
 #include <vectormath/c/vectormath_aos_v.h>
 
 
diff --git a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull/LevelRenderer_cull.cpp b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull/LevelRenderer_cull.cpp
index f2a7bca0..9cfde772 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull/LevelRenderer_cull.cpp
+++ b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_cull/LevelRenderer_cull.cpp
@@ -14,7 +14,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001
 #include <cell/spurs/job_queue.h>
 
 #include "LevelRenderer_cull.h"
-#include "..\Common\DmaData.h"
+#include "../Common/DmaData.h"
 #include <vectormath/c/vectormath_aos_v.h>
 
 
diff --git a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_zSort/LevelRenderer_zSort.cpp b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_zSort/LevelRenderer_zSort.cpp
index 0c56bd3e..65db49a6 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_zSort/LevelRenderer_zSort.cpp
+++ b/Minecraft.Client/PS3/SPU_Tasks/LevelRenderer_zSort/LevelRenderer_zSort.cpp
@@ -14,7 +14,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001
 #include <cell/spurs/job_queue.h>
 
 #include "LevelRenderer_zSort.h"
-#include "..\Common\DmaData.h"
+#include "../Common/DmaData.h"
 #include <vectormath/c/vectormath_aos_v.h>
 
 
diff --git a/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoiseJob.cpp b/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoiseJob.cpp
index 755c30d0..983d99d9 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoiseJob.cpp
+++ b/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoiseJob.cpp
@@ -14,7 +14,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001
 #include <cell/spurs/job_queue.h>
 
 #include "PerlinNoiseJob.h"
-#include "..\Common\DmaData.h"
+#include "../Common/DmaData.h"
 #include <vectormath/c/vectormath_aos_v.h>
 
 
diff --git a/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoise_SPU.cpp b/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoise_SPU.cpp
index fc5322b1..65efc923 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoise_SPU.cpp
+++ b/Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoise_SPU.cpp
@@ -2,7 +2,7 @@
 
 
 #include "PerlinNoise_SPU.h"
-#include "..\Common\DmaData.h"
+#include "../Common/DmaData.h"
 #include <alloca.h>
 
 int64_t lfloor(double v)
diff --git a/Minecraft.Client/PS3/SPU_Tasks/RLECompress/RLECompress.cpp b/Minecraft.Client/PS3/SPU_Tasks/RLECompress/RLECompress.cpp
index 63259d33..b6aa7467 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/RLECompress/RLECompress.cpp
+++ b/Minecraft.Client/PS3/SPU_Tasks/RLECompress/RLECompress.cpp
@@ -14,7 +14,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001
 #include <cell/dma.h>
 #include <cell/spurs/job_queue.h>
 
-#include "..\Common\DmaData.h"
+#include "../Common/DmaData.h"
 #include <vectormath/c/vectormath_aos_v.h>
 
 
diff --git a/Minecraft.Client/PS3/SPU_Tasks/RecalcHeightmapOnly/CompressedTileStorage_SPU.cpp b/Minecraft.Client/PS3/SPU_Tasks/RecalcHeightmapOnly/CompressedTileStorage_SPU.cpp
index be3ebf14..ff4ec5f5 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/RecalcHeightmapOnly/CompressedTileStorage_SPU.cpp
+++ b/Minecraft.Client/PS3/SPU_Tasks/RecalcHeightmapOnly/CompressedTileStorage_SPU.cpp
@@ -1,11 +1,11 @@
 include "stdafx.h"
 #include "CompressedTileStorage_SPU.h"
 #ifdef SN_TARGET_PS3_SPU
-#include "..\Common\DmaData.h"
+#include "../Common/DmaData.h"
 #else
-#include "..\..\..\..\Minecraft.World\Tile.h"
-#include "..\..\..\..\Minecraft.World\TilePos.h"
-#include "..\..\..\..\Minecraft.World\LevelChunk.h"
+#include "../../../../Minecraft.World/Tile.h"
+#include "../../../../Minecraft.World/TilePos.h"
+#include "../../../../Minecraft.World/LevelChunk.h"
 #endif
 
 #include <stdlib.h>
diff --git a/Minecraft.Client/PS3/SPU_Tasks/RecalcHeightmapOnly/CompressedTileStorage_SPU.h b/Minecraft.Client/PS3/SPU_Tasks/RecalcHeightmapOnly/CompressedTileStorage_SPU.h
index 46876c53..547504ba 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/RecalcHeightmapOnly/CompressedTileStorage_SPU.h
+++ b/Minecraft.Client/PS3/SPU_Tasks/RecalcHeightmapOnly/CompressedTileStorage_SPU.h
@@ -4,8 +4,8 @@
 
 
 #ifndef SN_TARGET_PS3_SPU
-#include "..\..\..\stdafx.h"
-#include "..\..\..\..\Minecraft.World\Region.h"
+#include "../../../stdafx.h"
+#include "../../../../Minecraft.World/Region.h"
 #endif // SN_TARGET_PS3_SPU
 
 //#include "xmcore.h"
diff --git a/Minecraft.Client/PS3/SPU_Tasks/Renderer_TextureUpdate/Renderer_TextureUpdate.cpp b/Minecraft.Client/PS3/SPU_Tasks/Renderer_TextureUpdate/Renderer_TextureUpdate.cpp
index 10a9b611..07814224 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/Renderer_TextureUpdate/Renderer_TextureUpdate.cpp
+++ b/Minecraft.Client/PS3/SPU_Tasks/Renderer_TextureUpdate/Renderer_TextureUpdate.cpp
@@ -14,7 +14,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001
 #include <cell/spurs/job_queue.h>
 
 #include "Renderer_TextureUpdate.h"
-#include "..\Common\DmaData.h"
+#include "../Common/DmaData.h"
 #include <vectormath/c/vectormath_aos_v.h>
 
 
diff --git a/Minecraft.Client/PS3/SPU_Tasks/Texture_blit/Texture_blit.cpp b/Minecraft.Client/PS3/SPU_Tasks/Texture_blit/Texture_blit.cpp
index 1430aa27..24b07254 100644
--- a/Minecraft.Client/PS3/SPU_Tasks/Texture_blit/Texture_blit.cpp
+++ b/Minecraft.Client/PS3/SPU_Tasks/Texture_blit/Texture_blit.cpp
@@ -14,7 +14,7 @@ PlayStation(R)3 Programmer Tool Runtime Library 430.001
 #include <cell/spurs/job_queue.h>
 
 #include "Texture_blit.h"
-#include "..\Common\DmaData.h"
+#include "../Common/DmaData.h"
 #include <vectormath/c/vectormath_aos_v.h>
 
 
diff --git a/Minecraft.Client/PS3/XboxGameMode.cpp b/Minecraft.Client/PS3/XboxGameMode.cpp
index 1b55fdd9..709a6589 100644
--- a/Minecraft.Client/PS3/XboxGameMode.cpp
+++ b/Minecraft.Client/PS3/XboxGameMode.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "XboxGameMode.h"
-#include "..\Common\Tutorial\Tutorial.h"
+#include "../Common/Tutorial/Tutorial.h"
 
 XboxGameMode::XboxGameMode(int iPad, Minecraft *minecraft, ClientConnection *connection)
 	: TutorialMode(iPad, minecraft, connection)
diff --git a/Minecraft.Client/PS3/XboxGameMode.h b/Minecraft.Client/PS3/XboxGameMode.h
index 347cdf30..a9f0d6cd 100644
--- a/Minecraft.Client/PS3/XboxGameMode.h
+++ b/Minecraft.Client/PS3/XboxGameMode.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "..\Common\Tutorial\TutorialMode.h"
+#include "../Common/Tutorial/TutorialMode.h"
 
 class XboxGameMode : public TutorialMode
 {
diff --git a/Minecraft.Client/PS3/Xbox_Minecraft.cpp b/Minecraft.Client/PS3/Xbox_Minecraft.cpp
index fa9a33c7..f4dbd704 100644
--- a/Minecraft.Client/PS3/Xbox_Minecraft.cpp
+++ b/Minecraft.Client/PS3/Xbox_Minecraft.cpp
@@ -8,35 +8,35 @@
 #include "4J_strings.h"
 #include "Minecraft_Controller_Actions.h"
 #include "Xbox_App.h"
-#include "GameConfig\Minecraft.spa.h"
-#include "..\MinecraftServer.h"
-#include "..\LocalPlayer.h"
-#include "..\..\Minecraft.World\ItemInstance.h"
-#include "..\..\Minecraft.World\MapItem.h"
-#include "..\..\Minecraft.World\Recipes.h"
-#include "..\..\Minecraft.World\Recipy.h"
-#include "..\..\Minecraft.World\Language.h"
-#include "..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\Minecraft.World\AABB.h"
-#include "..\..\Minecraft.World\Vec3.h"
-#include "..\..\Minecraft.World\Level.h"
+#include "GameConfig/Minecraft.spa.h"
+#include "../MinecraftServer.h"
+#include "../LocalPlayer.h"
+#include "../../Minecraft.World/ItemInstance.h"
+#include "../../Minecraft.World/MapItem.h"
+#include "../../Minecraft.World/Recipes.h"
+#include "../../Minecraft.World/Recipy.h"
+#include "../../Minecraft.World/Language.h"
+#include "../../Minecraft.World/StringHelpers.h"
+#include "../../Minecraft.World/AABB.h"
+#include "../../Minecraft.World/Vec3.h"
+#include "../../Minecraft.World/Level.h"
 
-#include "..\ClientConnection.h"
-#include "..\User.h"
-#include "..\..\Minecraft.World\Socket.h"
-#include "..\..\Minecraft.World\ThreadName.h"
-#include "..\..\Minecraft.Client\StatsCounter.h"
-#include "..\ConnectScreen.h"
-//#include "Social\SocialManager.h"
-//#include "Leaderboards\LeaderboardManager.h"
-//#include "XUI\XUI_Scene_Container.h"
+#include "../ClientConnection.h"
+#include "../User.h"
+#include "../../Minecraft.World/Socket.h"
+#include "../../Minecraft.World/ThreadName.h"
+#include "../../Minecraft.Client/StatsCounter.h"
+#include "../ConnectScreen.h"
+//#include "Social/SocialManager.h"
+//#include "Leaderboards/LeaderboardManager.h"
+//#include "XUI/XUI_Scene_Container.h"
 //#include "QNetManager.h"
-#include "..\..\Minecraft.Client\Tesselator.h"
+#include "../../Minecraft.Client/Tesselator.h"
 #include "Xbox_Awards_enum.h"
-#include "..\..\Minecraft.Client\Options.h"
-#include "Sentient\SentientManager.h"
-#include "..\..\Minecraft.World\IntCache.h"
-#include "..\Textures.h"
+#include "../../Minecraft.Client/Options.h"
+#include "Sentient/SentientManager.h"
+#include "../../Minecraft.World/IntCache.h"
+#include "../Textures.h"
 #include "Resource.h"
 
 
diff --git a/Minecraft.Client/PSVita/Leaderboards/PSVitaLeaderboardManager.cpp b/Minecraft.Client/PSVita/Leaderboards/PSVitaLeaderboardManager.cpp
index 981d1f40..e3c3eb4f 100644
--- a/Minecraft.Client/PSVita/Leaderboards/PSVitaLeaderboardManager.cpp
+++ b/Minecraft.Client/PSVita/Leaderboards/PSVitaLeaderboardManager.cpp
@@ -4,18 +4,18 @@
 
 #include "base64.h"
 
-#include "..\PSVita_App.h"
-#include "..\..\Common\Consoles_App.h"
+#include "../PSVita_App.h"
+#include "../../Common/Consoles_App.h"
 
-#include "Common\Network\Sony\SQRNetworkManager.h"
+#include "Common/Network/Sony/SQRNetworkManager.h"
 
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "../../../Minecraft.World/StringHelpers.h"
 
 #include <cstdlib>
 
 #include <np.h>
 
-#include "PSVita\PSVitaExtras\ShutdownManager.h"
+#include "PSVita/PSVitaExtras/ShutdownManager.h"
 
 
 LeaderboardManager *LeaderboardManager::m_instance = new PSVitaLeaderboardManager(); //Singleton instance of the LeaderboardManager
diff --git a/Minecraft.Client/PSVita/Leaderboards/PSVitaLeaderboardManager.h b/Minecraft.Client/PSVita/Leaderboards/PSVitaLeaderboardManager.h
index 9038b277..200f4c61 100644
--- a/Minecraft.Client/PSVita/Leaderboards/PSVitaLeaderboardManager.h
+++ b/Minecraft.Client/PSVita/Leaderboards/PSVitaLeaderboardManager.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Common\Leaderboards\LeaderboardManager.h"
+#include "Common/Leaderboards/LeaderboardManager.h"
 #include "Conf.h"
 
 class PSVitaLeaderboardManager : public LeaderboardManager
diff --git a/Minecraft.Client/PSVita/Network/SQRNetworkManager_AdHoc_Vita.cpp b/Minecraft.Client/PSVita/Network/SQRNetworkManager_AdHoc_Vita.cpp
index 2b2ccec8..0a720e84 100644
--- a/Minecraft.Client/PSVita/Network/SQRNetworkManager_AdHoc_Vita.cpp
+++ b/Minecraft.Client/PSVita/Network/SQRNetworkManager_AdHoc_Vita.cpp
@@ -11,9 +11,9 @@
 #include <pspnet_adhoc.h>
 #include <adhoc_matching.h>
 
-#include "PSVita\PSVitaExtras\Conf.h"
-#include "Common\Network\Sony\SonyHttp.h"
-#include "..\..\..\Minecraft.World\C4JThread.h"
+#include "PSVita/PSVitaExtras/Conf.h"
+#include "Common/Network/Sony/SonyHttp.h"
+#include "../../../Minecraft.World/C4JThread.h"
 
 
 #define MATCHING_PORT						(1)
diff --git a/Minecraft.Client/PSVita/Network/SQRNetworkManager_AdHoc_Vita.h b/Minecraft.Client/PSVita/Network/SQRNetworkManager_AdHoc_Vita.h
index 7d9948c9..4fa17dce 100644
--- a/Minecraft.Client/PSVita/Network/SQRNetworkManager_AdHoc_Vita.h
+++ b/Minecraft.Client/PSVita/Network/SQRNetworkManager_AdHoc_Vita.h
@@ -8,7 +8,7 @@
 
 #include <unordered_map>
 
-#include "..\..\Common\Network\Sony\SQRNetworkManager.h"
+#include "../../Common/Network/Sony/SQRNetworkManager.h"
 // 
 class SQRNetworkPlayer;
 class ISQRNetworkManagerListener;
diff --git a/Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.cpp b/Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.cpp
index 6a4e2c72..4fb530b4 100644
--- a/Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.cpp
+++ b/Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.cpp
@@ -9,9 +9,9 @@
 #include <libnetctl.h>
 #include <netcheck_dialog.h>
 
-#include "PSVita\PSVitaExtras\Conf.h"
-#include "Common\Network\Sony\SonyHttp.h"
-#include "..\..\..\Minecraft.World\C4JThread.h"
+#include "PSVita/PSVitaExtras/Conf.h"
+#include "Common/Network/Sony/SonyHttp.h"
+#include "../../../Minecraft.World/C4JThread.h"
 
 // image used for the invite gui, filesize must be smaller than SCE_NP_MESSAGE_DIALOG_MAX_INDEX_ICON_SIZE ( 64K )
 #define SESSION_IMAGE_PATH				"app0:PSVita/session_image.png"
diff --git a/Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.h b/Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.h
index 592919d4..9c7975f9 100644
--- a/Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.h
+++ b/Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.h
@@ -8,7 +8,7 @@
 
 #include <unordered_map>
 
-#include "..\..\Common\Network\Sony\SQRNetworkManager.h"
+#include "../../Common/Network/Sony/SQRNetworkManager.h"
 
 class SQRNetworkPlayer;
 class ISQRNetworkManagerListener;
diff --git a/Minecraft.Client/PSVita/Network/SonyCommerce_Vita.h b/Minecraft.Client/PSVita/Network/SonyCommerce_Vita.h
index ad114796..de3529b5 100644
--- a/Minecraft.Client/PSVita/Network/SonyCommerce_Vita.h
+++ b/Minecraft.Client/PSVita/Network/SonyCommerce_Vita.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Common\Network\Sony\SonyCommerce.h"
+#include "Common/Network/Sony/SonyCommerce.h"
 #include <np_toolkit.h>
 #include <libsysmodule.h>
 #include <netcheck_dialog.h>
diff --git a/Minecraft.Client/PSVita/Network/SonyRemoteStorage_Vita.h b/Minecraft.Client/PSVita/Network/SonyRemoteStorage_Vita.h
index 9c636e41..e2d9b6a1 100644
--- a/Minecraft.Client/PSVita/Network/SonyRemoteStorage_Vita.h
+++ b/Minecraft.Client/PSVita/Network/SonyRemoteStorage_Vita.h
@@ -1,7 +1,7 @@
 #pragma once 
 
 
-#include "Common\Network\Sony\SonyRemoteStorage.h"
+#include "Common/Network/Sony/SonyRemoteStorage.h"
 
 class SonyRemoteStorage_Vita : public SonyRemoteStorage
 {
diff --git a/Minecraft.Client/PSVita/PSVitaExtras/ShutdownManager.cpp b/Minecraft.Client/PSVita/PSVitaExtras/ShutdownManager.cpp
index e7eca53f..ce7365e3 100644
--- a/Minecraft.Client/PSVita/PSVitaExtras/ShutdownManager.cpp
+++ b/Minecraft.Client/PSVita/PSVitaExtras/ShutdownManager.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "ShutdownManager.h"
-#include "..\..\Common\Leaderboards\LeaderboardManager.h"
-#include "..\..\MinecraftServer.h"
+#include "../../Common/Leaderboards/LeaderboardManager.h"
+#include "../../MinecraftServer.h"
 #ifdef __PS3__
 #include "C4JSpursJob.h"
 
diff --git a/Minecraft.Client/PSVita/PSVita_App.cpp b/Minecraft.Client/PSVita/PSVita_App.cpp
index a21699c0..43cc08e3 100644
--- a/Minecraft.Client/PSVita/PSVita_App.cpp
+++ b/Minecraft.Client/PSVita/PSVita_App.cpp
@@ -1,24 +1,24 @@
 
 #include "stdafx.h"
-#include "..\Common\Consoles_App.h"
-#include "..\User.h"
-#include "..\..\Minecraft.Client\Minecraft.h"
-#include "..\..\Minecraft.Client\MinecraftServer.h"
-#include "..\..\Minecraft.Client\PlayerList.h"
-#include "..\..\Minecraft.Client\ServerPlayer.h"
-#include "..\..\Minecraft.World\Level.h"
-#include "..\..\Minecraft.World\LevelSettings.h"
-#include "..\..\Minecraft.World\BiomeSource.h"
-#include "..\..\Minecraft.World\LevelType.h"
-#include "..\..\Minecraft.World\StringHelpers.h"
-#include "PSVita\Network\SonyRemoteStorage_Vita.h"
-#include "PSVita\Network\SonyCommerce_Vita.h"
-#include "..\..\Common\Network\Sony\SonyRemoteStorage.h"
+#include "../Common/Consoles_App.h"
+#include "../User.h"
+#include "../../Minecraft.Client/Minecraft.h"
+#include "../../Minecraft.Client/MinecraftServer.h"
+#include "../../Minecraft.Client/PlayerList.h"
+#include "../../Minecraft.Client/ServerPlayer.h"
+#include "../../Minecraft.World/Level.h"
+#include "../../Minecraft.World/LevelSettings.h"
+#include "../../Minecraft.World/BiomeSource.h"
+#include "../../Minecraft.World/LevelType.h"
+#include "../../Minecraft.World/StringHelpers.h"
+#include "PSVita/Network/SonyRemoteStorage_Vita.h"
+#include "PSVita/Network/SonyCommerce_Vita.h"
+#include "../../Common/Network/Sony/SonyRemoteStorage.h"
 #include "PSVita/Network/PSVita_NPToolkit.h"
 #include <message_dialog.h>
 #include <savedata_dialog.h>
 
-#include "PSVita\PSVitaExtras\PSVitaStrings.h"
+#include "PSVita/PSVitaExtras/PSVitaStrings.h"
 
 #define VITA_COMMERCE_ENABLED
 CConsoleMinecraftApp app;
diff --git a/Minecraft.Client/PSVita/PSVita_App.h b/Minecraft.Client/PSVita/PSVita_App.h
index 9a01a610..21b26113 100644
--- a/Minecraft.Client/PSVita/PSVita_App.h
+++ b/Minecraft.Client/PSVita/PSVita_App.h
@@ -3,8 +3,8 @@
 class C4JStringTable;
 //#include <np_toolkit.h>
 
-#include "..\..\Common\Network\Sony\SonyCommerce.h"
-#include "..\..\Common\Network\Sony\SonyRemoteStorage.h"
+#include "../../Common/Network/Sony/SonyCommerce.h"
+#include "../../Common/Network/Sony/SonyRemoteStorage.h"
 
 #define PRODUCT_CODE_SIZE 9
 #define SAVEFOLDERPREFIX_SIZE 10
diff --git a/Minecraft.Client/PSVita/PSVita_Minecraft.cpp b/Minecraft.Client/PSVita/PSVita_Minecraft.cpp
index ee13a216..d3f03190 100644
--- a/Minecraft.Client/PSVita/PSVita_Minecraft.cpp
+++ b/Minecraft.Client/PSVita/PSVita_Minecraft.cpp
@@ -3,62 +3,62 @@
 
 #include "stdafx.h"
 
-#include "Leaderboards\PSVitaLeaderboardManager.h"
-#include "PSVita\PSVitaExtras\ShutdownManager.h"
+#include "Leaderboards/PSVitaLeaderboardManager.h"
+#include "PSVita/PSVitaExtras/ShutdownManager.h"
 
 //#define HEAPINSPECTOR_PS3	1
 // when defining HEAPINSPECTOR_PS3, add this line to the linker settings
 // --wrap malloc --wrap free --wrap memalign --wrap calloc --wrap realloc --wrap reallocalign  --wrap _malloc_init 
 
 #if HEAPINSPECTOR_PS3
-#include "HeapInspector\Server\HeapInspectorServer.h"
-#include "HeapInspector\Server\PS3\HeapHooks.hpp"
+#include "HeapInspector/Server/HeapInspectorServer.h"
+#include "HeapInspector/Server/PS3/HeapHooks.hpp"
 #endif
 
 //#define DISABLE_MILES_SOUND
 
 #include "PSVita_App.h"
-#include "PSVitaExtras\PSVitaStrings.h"
-#include "GameConfig\Minecraft.spa.h"
-#include "..\MinecraftServer.h"
-#include "..\LocalPlayer.h"
-#include "..\..\Minecraft.World\ItemInstance.h"
-#include "..\..\Minecraft.World\MapItem.h"
-#include "..\..\Minecraft.World\Recipes.h"
-#include "..\..\Minecraft.World\Recipy.h"
-#include "..\..\Minecraft.World\Language.h"
-#include "..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\Minecraft.World\AABB.h"
-#include "..\..\Minecraft.World\Vec3.h"
-#include "..\..\Minecraft.World\Level.h"
-#include "..\..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "PSVitaExtras/PSVitaStrings.h"
+#include "GameConfig/Minecraft.spa.h"
+#include "../MinecraftServer.h"
+#include "../LocalPlayer.h"
+#include "../../Minecraft.World/ItemInstance.h"
+#include "../../Minecraft.World/MapItem.h"
+#include "../../Minecraft.World/Recipes.h"
+#include "../../Minecraft.World/Recipy.h"
+#include "../../Minecraft.World/Language.h"
+#include "../../Minecraft.World/StringHelpers.h"
+#include "../../Minecraft.World/AABB.h"
+#include "../../Minecraft.World/Vec3.h"
+#include "../../Minecraft.World/Level.h"
+#include "../../Minecraft.World/net.minecraft.world.level.tile.h"
 
-#include "..\ClientConnection.h"
-#include "..\User.h"
-#include "..\..\Minecraft.World\Socket.h"
-#include "..\..\Minecraft.World\ThreadName.h"
-#include "..\..\Minecraft.Client\StatsCounter.h"
-#include "..\ConnectScreen.h"
-//#include "Social\SocialManager.h"
-//#include "Leaderboards\LeaderboardManager.h"
-//#include "XUI\XUI_Scene_Container.h"
+#include "../ClientConnection.h"
+#include "../User.h"
+#include "../../Minecraft.World/Socket.h"
+#include "../../Minecraft.World/ThreadName.h"
+#include "../../Minecraft.Client/StatsCounter.h"
+#include "../ConnectScreen.h"
+//#include "Social/SocialManager.h"
+//#include "Leaderboards/LeaderboardManager.h"
+//#include "XUI/XUI_Scene_Container.h"
 //#include "NetworkManager.h"
-#include "..\..\Minecraft.Client\Tesselator.h"
-#include "..\Common\Console_Awards_enum.h"
-#include "..\..\Minecraft.Client\Options.h"
-#include "Sentient\SentientManager.h"
-#include "..\..\Minecraft.World\IntCache.h"
-#include "..\Textures.h"
+#include "../../Minecraft.Client/Tesselator.h"
+#include "../Common/Console_Awards_enum.h"
+#include "../../Minecraft.Client/Options.h"
+#include "Sentient/SentientManager.h"
+#include "../../Minecraft.World/IntCache.h"
+#include "../Textures.h"
 //#include "Resource.h"
-#include "..\..\Minecraft.World\compression.h"
-#include "..\..\Minecraft.World\OldChunkStorage.h"
-//#include "PS3\PS3Extras\EdgeZLib.h"
-#include "..\..\Minecraft.World\C4JThread.h"
-#include "Common\Network\Sony\SQRNetworkManager.h"
-#include "Common\UI\IUIScene_PauseMenu.h"
+#include "../../Minecraft.World/compression.h"
+#include "../../Minecraft.World/OldChunkStorage.h"
+//#include "PS3/PS3Extras/EdgeZLib.h"
+#include "../../Minecraft.World/C4JThread.h"
+#include "Common/Network/Sony/SQRNetworkManager.h"
+#include "Common/UI/IUIScene_PauseMenu.h"
 #include "Conf.h"
 #include "PSVita/Network/PSVita_NPToolkit.h"
-#include "PSVita\Network\SonyVoiceChat_Vita.h"
+#include "PSVita/Network/SonyVoiceChat_Vita.h"
 
 #include <libsysmodule.h>
 #include <libperf.h>
diff --git a/Minecraft.Client/PSVita/PSVita_PlayerUID.cpp b/Minecraft.Client/PSVita/PSVita_PlayerUID.cpp
index a678d0a0..0d758583 100644
--- a/Minecraft.Client/PSVita/PSVita_PlayerUID.cpp
+++ b/Minecraft.Client/PSVita/PSVita_PlayerUID.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "PSVita_PlayerUID.h"
-#include "..\Minecraft.World\StringHelpers.h"
+#include "../Minecraft.World/StringHelpers.h"
 
 // taken from Boost, there is no TR1 equivalent
 template <class T>
diff --git a/Minecraft.Client/PSVita/PSVita_UIController.cpp b/Minecraft.Client/PSVita/PSVita_UIController.cpp
index c3a03ace..6a42f47f 100644
--- a/Minecraft.Client/PSVita/PSVita_UIController.cpp
+++ b/Minecraft.Client/PSVita/PSVita_UIController.cpp
@@ -2,8 +2,8 @@
 #include "PSVita_UIController.h"
 
 // Temp
-#include "..\Minecraft.h"
-#include "..\Textures.h"
+#include "../Minecraft.h"
+#include "../Textures.h"
 
 #define _ENABLEIGGY
 
diff --git a/Minecraft.Client/PSVita/PSVita_UIController.h b/Minecraft.Client/PSVita/PSVita_UIController.h
index 0d1e934f..6ddddb3c 100644
--- a/Minecraft.Client/PSVita/PSVita_UIController.h
+++ b/Minecraft.Client/PSVita/PSVita_UIController.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "..\Common\UI\UIController.h"
+#include "../Common/UI/UIController.h"
 
 class ConsoleUIController : public UIController
 {
diff --git a/Minecraft.Client/PaintingRenderer.cpp b/Minecraft.Client/PaintingRenderer.cpp
index 4238f759..7e6ad146 100644
--- a/Minecraft.Client/PaintingRenderer.cpp
+++ b/Minecraft.Client/PaintingRenderer.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "PaintingRenderer.h"
 #include "entityRenderDispatcher.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.h"
-#include "..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\Minecraft.World\Random.h"
-#include "..\Minecraft.World\Mth.h"
+#include "../Minecraft.World/net.minecraft.world.entity.h"
+#include "../Minecraft.World/net.minecraft.world.level.h"
+#include "../Minecraft.World/Random.h"
+#include "../Minecraft.World/Mth.h"
 
 PaintingRenderer::PaintingRenderer()
 {
diff --git a/Minecraft.Client/Particle.cpp b/Minecraft.Client/Particle.cpp
index 90ef93bc..200913a0 100644
--- a/Minecraft.Client/Particle.cpp
+++ b/Minecraft.Client/Particle.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "Particle.h"
 #include "Tesselator.h"
-#include "..\Minecraft.World\Random.h"
-#include "..\Minecraft.World\Mth.h"
-#include "..\Minecraft.World\JavaMath.h"
-#include "..\Minecraft.World\net.minecraft.world.h"
+#include "../Minecraft.World/Random.h"
+#include "../Minecraft.World/Mth.h"
+#include "../Minecraft.World/JavaMath.h"
+#include "../Minecraft.World/net.minecraft.world.h"
 
 /*
     protected int tex;
diff --git a/Minecraft.Client/Particle.h b/Minecraft.Client/Particle.h
index d9b0ba3a..2bfcf2a4 100644
--- a/Minecraft.Client/Particle.h
+++ b/Minecraft.Client/Particle.h
@@ -1,8 +1,8 @@
 #pragma once
 using namespace std;
 
-#include "..\Minecraft.World\Entity.h"
-#include "..\Minecraft.World\ParticleTypes.h"
+#include "../Minecraft.World/Entity.h"
+#include "../Minecraft.World/ParticleTypes.h"
 #include "ParticleEngine.h"
 class Tesselator;
 class CompoundTag;
diff --git a/Minecraft.Client/ParticleEngine.cpp b/Minecraft.Client/ParticleEngine.cpp
index 3a34253a..2e1b88fd 100644
--- a/Minecraft.Client/ParticleEngine.cpp
+++ b/Minecraft.Client/ParticleEngine.cpp
@@ -5,11 +5,11 @@
 #include "Tesselator.h"
 #include "TerrainParticle.h"
 #include "Camera.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.player.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
-#include "..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\Minecraft.World\StringHelpers.h"
-#include "..\Minecraft.World\net.minecraft.world.level.dimension.h"
+#include "../Minecraft.World/net.minecraft.world.entity.player.h"
+#include "../Minecraft.World/net.minecraft.world.level.tile.h"
+#include "../Minecraft.World/net.minecraft.world.level.h"
+#include "../Minecraft.World/StringHelpers.h"
+#include "../Minecraft.World/net.minecraft.world.level.dimension.h"
 
 ParticleEngine::ParticleEngine(Level *level, Textures *textures)
 {
diff --git a/Minecraft.Client/PauseScreen.cpp b/Minecraft.Client/PauseScreen.cpp
index 18d066b5..e76fe685 100644
--- a/Minecraft.Client/PauseScreen.cpp
+++ b/Minecraft.Client/PauseScreen.cpp
@@ -5,10 +5,10 @@
 #include "OptionsScreen.h"
 #include "TitleScreen.h"
 #include "MultiPlayerLevel.h"
-#include "..\Minecraft.World\net.minecraft.locale.h"
-#include "..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\Minecraft.World\net.minecraft.stats.h"
-#include "..\Minecraft.Client\LocalPlayer.h"
+#include "../Minecraft.World/net.minecraft.locale.h"
+#include "../Minecraft.World/net.minecraft.world.level.h"
+#include "../Minecraft.World/net.minecraft.stats.h"
+#include "../Minecraft.Client/LocalPlayer.h"
 
 PauseScreen::PauseScreen()
 {
diff --git a/Minecraft.Client/PendingConnection.cpp b/Minecraft.Client/PendingConnection.cpp
index 841863b6..add5bf5b 100644
--- a/Minecraft.Client/PendingConnection.cpp
+++ b/Minecraft.Client/PendingConnection.cpp
@@ -7,15 +7,15 @@
 #include "ServerLevel.h"
 #include "PlayerList.h"
 #include "MinecraftServer.h"
-#include "..\Minecraft.World\net.minecraft.network.h"
-#include "..\Minecraft.World\pos.h"
-#include "..\Minecraft.World\net.minecraft.world.level.dimension.h"
-#include "..\Minecraft.World\net.minecraft.world.level.storage.h"
-#include "..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\Minecraft.World\SharedConstants.h"
+#include "../Minecraft.World/net.minecraft.network.h"
+#include "../Minecraft.World/pos.h"
+#include "../Minecraft.World/net.minecraft.world.level.dimension.h"
+#include "../Minecraft.World/net.minecraft.world.level.storage.h"
+#include "../Minecraft.World/net.minecraft.world.item.h"
+#include "../Minecraft.World/SharedConstants.h"
 #include "Settings.h"
 // #ifdef __PS3__
-// #include "PS3\Network\NetworkPlayerSony.h"
+// #include "PS3/Network/NetworkPlayerSony.h"
 // #endif
 
 Random *PendingConnection::random = new Random();
@@ -230,7 +230,7 @@ void PendingConnection::onDisconnect(DisconnectPacket::eDisconnectReason reason,
 void PendingConnection::handleGetInfo(shared_ptr<GetInfoPacket> packet)
 {
 	//try {
-	//String message = server->motd + "§" + server->players->getPlayerCount() + "§" + server->players->getMaxPlayers();
+	//String message = server->motd + "§" + server->players->getPlayerCount() + "§" + server->players->getMaxPlayers();
 	//connection->send(new DisconnectPacket(message));
 	connection->send(shared_ptr<DisconnectPacket>(new DisconnectPacket(DisconnectPacket::eDisconnect_ServerFull) ) );
 	connection->sendAndQuit();
diff --git a/Minecraft.Client/PendingConnection.h b/Minecraft.Client/PendingConnection.h
index 02d706f9..cf23e421 100644
--- a/Minecraft.Client/PendingConnection.h
+++ b/Minecraft.Client/PendingConnection.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "..\Minecraft.World\PacketListener.h"
+#include "../Minecraft.World/PacketListener.h"
 class MinecraftServer;
 class Socket;
 class LoginPacket;
diff --git a/Minecraft.Client/PigRenderer.cpp b/Minecraft.Client/PigRenderer.cpp
index eb78cd20..a4db6165 100644
--- a/Minecraft.Client/PigRenderer.cpp
+++ b/Minecraft.Client/PigRenderer.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "PigRenderer.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
+#include "../Minecraft.World/net.minecraft.world.entity.animal.h"
 
 PigRenderer::PigRenderer(Model *model, Model *armor, float shadow) : MobRenderer(model,shadow)
 {
diff --git a/Minecraft.Client/PistonPieceRenderer.cpp b/Minecraft.Client/PistonPieceRenderer.cpp
index 1ce084cf..a7761bc8 100644
--- a/Minecraft.Client/PistonPieceRenderer.cpp
+++ b/Minecraft.Client/PistonPieceRenderer.cpp
@@ -3,9 +3,9 @@
 #include "Tesselator.h"
 #include "Lighting.h"
 #include "TileRenderer.h"
-#include "..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\Minecraft.World\PistonPieceEntity.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "../Minecraft.World/net.minecraft.world.level.h"
+#include "../Minecraft.World/PistonPieceEntity.h"
+#include "../Minecraft.World/net.minecraft.world.level.tile.h"
 
 PistonPieceRenderer::PistonPieceRenderer()
 {
diff --git a/Minecraft.Client/PlayerChunkMap.cpp b/Minecraft.Client/PlayerChunkMap.cpp
index aedd5a9d..c0fa317c 100644
--- a/Minecraft.Client/PlayerChunkMap.cpp
+++ b/Minecraft.Client/PlayerChunkMap.cpp
@@ -5,11 +5,11 @@
 #include "ServerChunkCache.h"
 #include "ServerPlayer.h"
 #include "MinecraftServer.h"
-#include "..\Minecraft.World\net.minecraft.network.packet.h"
-#include "..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
-#include "..\Minecraft.World\ArrayWithLength.h"
-#include "..\Minecraft.World\System.h"
+#include "../Minecraft.World/net.minecraft.network.packet.h"
+#include "../Minecraft.World/net.minecraft.world.level.h"
+#include "../Minecraft.World/net.minecraft.world.level.tile.h"
+#include "../Minecraft.World/ArrayWithLength.h"
+#include "../Minecraft.World/System.h"
 #include "PlayerList.h"
 
 PlayerChunkMap::PlayerChunk::PlayerChunk(int x, int z, PlayerChunkMap *pcm) : pos(x,z)
diff --git a/Minecraft.Client/PlayerChunkMap.h b/Minecraft.Client/PlayerChunkMap.h
index 61324272..7142349d 100644
--- a/Minecraft.Client/PlayerChunkMap.h
+++ b/Minecraft.Client/PlayerChunkMap.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "..\Minecraft.World\JavaIntHash.h"
-#include "..\Minecraft.World\ChunkPos.h"
+#include "../Minecraft.World/JavaIntHash.h"
+#include "../Minecraft.World/ChunkPos.h"
 class ServerPlayer;
 class ServerLevel;
 class MinecraftServer;
diff --git a/Minecraft.Client/PlayerCloudParticle.cpp b/Minecraft.Client/PlayerCloudParticle.cpp
index 6976fbab..2281cde6 100644
--- a/Minecraft.Client/PlayerCloudParticle.cpp
+++ b/Minecraft.Client/PlayerCloudParticle.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "PlayerCloudParticle.h"
-#include "..\Minecraft.World\JavaMath.h"
-#include "..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.player.h"
-#include "..\Minecraft.World\net.minecraft.world.phys.h"
+#include "../Minecraft.World/JavaMath.h"
+#include "../Minecraft.World/net.minecraft.world.level.h"
+#include "../Minecraft.World/net.minecraft.world.entity.player.h"
+#include "../Minecraft.World/net.minecraft.world.phys.h"
 
 PlayerCloudParticle::PlayerCloudParticle(Level *level, double x, double y, double z, double xa, double ya, double za) : Particle(level,x,y,z,0,0,0)
 {
diff --git a/Minecraft.Client/PlayerConnection.cpp b/Minecraft.Client/PlayerConnection.cpp
index f0e538a8..8a6d59bc 100644
--- a/Minecraft.Client/PlayerConnection.cpp
+++ b/Minecraft.Client/PlayerConnection.cpp
@@ -5,31 +5,31 @@
 #include "ServerPlayerGameMode.h"
 #include "PlayerList.h"
 #include "MinecraftServer.h"
-#include "..\Minecraft.World\net.minecraft.commands.h"
-#include "..\Minecraft.World\net.minecraft.network.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.item.h"
-#include "..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\Minecraft.World\net.minecraft.world.level.dimension.h"
-#include "..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\Minecraft.World\net.minecraft.world.item.trading.h"
-#include "..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
-#include "..\Minecraft.World\net.minecraft.world.level.saveddata.h"
-#include "..\Minecraft.World\net.minecraft.network.h"
-#include "..\Minecraft.World\net.minecraft.world.food.h"
-#include "..\Minecraft.World\AABB.h"
-#include "..\Minecraft.World\Pos.h"
-#include "..\Minecraft.World\SharedConstants.h"
-#include "..\Minecraft.World\Socket.h"
-#include "..\Minecraft.World\Achievements.h"
-#include "..\Minecraft.World\net.minecraft.h"
+#include "../Minecraft.World/net.minecraft.commands.h"
+#include "../Minecraft.World/net.minecraft.network.h"
+#include "../Minecraft.World/net.minecraft.world.entity.item.h"
+#include "../Minecraft.World/net.minecraft.world.level.h"
+#include "../Minecraft.World/net.minecraft.world.level.dimension.h"
+#include "../Minecraft.World/net.minecraft.world.item.h"
+#include "../Minecraft.World/net.minecraft.world.item.trading.h"
+#include "../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../Minecraft.World/net.minecraft.world.level.tile.entity.h"
+#include "../Minecraft.World/net.minecraft.world.level.saveddata.h"
+#include "../Minecraft.World/net.minecraft.network.h"
+#include "../Minecraft.World/net.minecraft.world.food.h"
+#include "../Minecraft.World/AABB.h"
+#include "../Minecraft.World/Pos.h"
+#include "../Minecraft.World/SharedConstants.h"
+#include "../Minecraft.World/Socket.h"
+#include "../Minecraft.World/Achievements.h"
+#include "../Minecraft.World/net.minecraft.h"
 #include "EntityTracker.h"
 #include "ServerConnection.h"
 #include "..\Minecraft.World\GenericStats.h"
 #include "..\Minecraft.World\JavaMath.h"
 
 // 4J Added
-#include "..\Minecraft.World\net.minecraft.world.item.crafting.h"
+#include "../Minecraft.World/net.minecraft.world.item.crafting.h"
 #include "Options.h"
 
 Random PlayerConnection::random;
@@ -126,7 +126,7 @@ void PlayerConnection::disconnect(DisconnectPacket::eDisconnectReason reason)
 	send( shared_ptr<DisconnectPacket>( new DisconnectPacket(reason) ));
 	connection->sendAndQuit();
 	// 4J-PB - removed, since it needs to be localised in the language the client is in
-	//server->players->broadcastAll( shared_ptr<ChatPacket>( new ChatPacket(L"§e" + player->name + L" left the game.") ) );
+	//server->players->broadcastAll( shared_ptr<ChatPacket>( new ChatPacket(L"§e" + player->name + L" left the game.") ) );
 	if(getWasKicked())
 	{
 		server->getPlayers()->broadcastAll( shared_ptr<ChatPacket>( new ChatPacket(player->name, ChatPacket::e_ChatPlayerKickedFromGame) ) );
@@ -569,7 +569,7 @@ void PlayerConnection::onDisconnect(DisconnectPacket::eDisconnectReason reason,
 	if( done ) return;
 //    logger.info(player.name + " lost connection: " + reason);
 	// 4J-PB - removed, since it needs to be localised in the language the client is in
-	//server->players->broadcastAll( shared_ptr<ChatPacket>( new ChatPacket(L"§e" + player->name + L" left the game.") ) );
+	//server->players->broadcastAll( shared_ptr<ChatPacket>( new ChatPacket(L"§e" + player->name + L" left the game.") ) );
 	if(getWasKicked())
 	{
 		server->getPlayers()->broadcastAll( shared_ptr<ChatPacket>( new ChatPacket(player->name, ChatPacket::e_ChatPlayerKickedFromGame) ) );
@@ -740,13 +740,13 @@ int PlayerConnection::countDelayedPackets()
 void PlayerConnection::info(const wstring& string)
 {
 	// 4J-PB - removed, since it needs to be localised in the language the client is in
-	//send( shared_ptr<ChatPacket>( new ChatPacket(L"§7" + string) ) );
+	//send( shared_ptr<ChatPacket>( new ChatPacket(L"§7" + string) ) );
 }
 
 void PlayerConnection::warn(const wstring& string)
 {
 	// 4J-PB - removed, since it needs to be localised in the language the client is in
-	//send( shared_ptr<ChatPacket>( new ChatPacket(L"§9" + string) ) );
+	//send( shared_ptr<ChatPacket>( new ChatPacket(L"§9" + string) ) );
 }
 
 wstring PlayerConnection::getConsoleName()
@@ -1714,4 +1714,4 @@ bool PlayerConnection::isGuest()
 		}
 		return isGuest;
 	}
-}
+}
\ No newline at end of file
diff --git a/Minecraft.Client/PlayerList.cpp b/Minecraft.Client/PlayerList.cpp
index 7921cbf8..51c26010 100644
--- a/Minecraft.Client/PlayerList.cpp
+++ b/Minecraft.Client/PlayerList.cpp
@@ -11,23 +11,23 @@
 #include "PendingConnection.h"
 #include "PlayerConnection.h"
 #include "EntityTracker.h"
-#include "..\Minecraft.World\net.minecraft.world.level.storage.h"
-#include "..\Minecraft.World\net.minecraft.world.level.dimension.h"
-#include "..\Minecraft.World\ArrayWithLength.h"
-#include "..\Minecraft.World\net.minecraft.network.packet.h"
-#include "..\Minecraft.World\net.minecraft.network.h"
-#include "..\Minecraft.World\Pos.h"
-#include "..\Minecraft.World\ProgressListener.h"
-#include "..\Minecraft.World\HellRandomLevelSource.h"
-#include "..\Minecraft.World\net.minecraft.world.phys.h"
-#include "..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\Minecraft.World\net.minecraft.world.level.storage.h"
-#include "..\Minecraft.World\net.minecraft.world.level.saveddata.h"
-#include "..\Minecraft.World\JavaMath.h"
+#include "../Minecraft.World/net.minecraft.world.level.storage.h"
+#include "../Minecraft.World/net.minecraft.world.level.dimension.h"
+#include "../Minecraft.World/ArrayWithLength.h"
+#include "../Minecraft.World/net.minecraft.network.packet.h"
+#include "../Minecraft.World/net.minecraft.network.h"
+#include "../Minecraft.World/Pos.h"
+#include "../Minecraft.World/ProgressListener.h"
+#include "../Minecraft.World/HellRandomLevelSource.h"
+#include "../Minecraft.World/net.minecraft.world.phys.h"
+#include "../Minecraft.World/net.minecraft.world.item.h"
+#include "../Minecraft.World/net.minecraft.world.level.storage.h"
+#include "../Minecraft.World/net.minecraft.world.level.saveddata.h"
+#include "../Minecraft.World/JavaMath.h"
 #ifdef _XBOX
-#include "Xbox\Network\NetworkPlayerXbox.h"
+#include "Xbox/Network/NetworkPlayerXbox.h"
 #elif defined(__PS3__) || defined(__ORBIS__)
-#include "Common\Network\Sony\NetworkPlayerSony.h"
+#include "Common/Network/Sony/NetworkPlayerSony.h"
 #endif
 
 // 4J - this class is fairly substantially altered as there didn't seem any point in porting code for banning, whitelisting, ops etc.
@@ -220,7 +220,7 @@ void PlayerList::placeNewPlayer(Connection *connection, shared_ptr<ServerPlayer>
         sendLevelInfo(player, level);
 
         // 4J-PB - removed, since it needs to be localised in the language the client is in
-		//server->players->broadcastAll( shared_ptr<ChatPacket>( new ChatPacket(L"§e" + playerEntity->name + L" joined the game.") ) );
+		//server->players->broadcastAll( shared_ptr<ChatPacket>( new ChatPacket(L"§e" + playerEntity->name + L" joined the game.") ) );
 		broadcastAll( shared_ptr<ChatPacket>( new ChatPacket(player->name, ChatPacket::e_ChatPlayerJoinedGame) ) );
 
 		MemSect(14);
@@ -380,7 +380,7 @@ void PlayerList::add(shared_ptr<ServerPlayer> player)
 	// Some code from here has been moved to the above validatePlayerSpawnPosition function
 
 	// 4J Stu - Swapped these lines about so that we get the chunk visiblity packet way ahead of all the add tracked entity packets
-	// Fix for #9169 - ART : Sign text is replaced with the words “Awaiting approval”.
+	// Fix for #9169 - ART : Sign text is replaced with the words “Awaiting approval”.
     changeDimension(player, NULL);
     level->addEntity(player);
 
diff --git a/Minecraft.Client/PlayerRenderer.cpp b/Minecraft.Client/PlayerRenderer.cpp
index c332b41c..15af95ab 100644
--- a/Minecraft.Client/PlayerRenderer.cpp
+++ b/Minecraft.Client/PlayerRenderer.cpp
@@ -6,12 +6,12 @@
 #include "LocalPlayer.h"
 #include "MultiPlayerLocalPlayer.h"
 #include "entityRenderDispatcher.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.player.h"
-#include "..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
-#include "..\Minecraft.World\net.minecraft.h"
-#include "..\Minecraft.World\StringHelpers.h"
+#include "../Minecraft.World/net.minecraft.world.entity.h"
+#include "../Minecraft.World/net.minecraft.world.entity.player.h"
+#include "../Minecraft.World/net.minecraft.world.item.h"
+#include "../Minecraft.World/net.minecraft.world.level.tile.h"
+#include "../Minecraft.World/net.minecraft.h"
+#include "../Minecraft.World/StringHelpers.h"
 
 const unsigned int PlayerRenderer::s_nametagColors[MINECRAFT_NET_MAX_PLAYERS] = 
 {
diff --git a/Minecraft.Client/PlayerRenderer.h b/Minecraft.Client/PlayerRenderer.h
index 10564104..3cd4337a 100644
--- a/Minecraft.Client/PlayerRenderer.h
+++ b/Minecraft.Client/PlayerRenderer.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "MobRenderer.h"
-#include "..\Minecraft.World\Player.h"
+#include "../Minecraft.World/Player.h"
 class HumanoidModel;
 using namespace std;
 
diff --git a/Minecraft.Client/Polygon.h b/Minecraft.Client/Polygon.h
index 24cb2218..c07e1f8e 100644
--- a/Minecraft.Client/Polygon.h
+++ b/Minecraft.Client/Polygon.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "Vertex.h"
 #include "Tesselator.h"
-#include "..\Minecraft.World\ArrayWithLength.h"
+#include "../Minecraft.World/ArrayWithLength.h"
 
 class _Polygon
 {
diff --git a/Minecraft.Client/PreStitchedTextureMap.cpp b/Minecraft.Client/PreStitchedTextureMap.cpp
index b6c22223..93c1ee51 100644
--- a/Minecraft.Client/PreStitchedTextureMap.cpp
+++ b/Minecraft.Client/PreStitchedTextureMap.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.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\ByteBuffer.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/ByteBuffer.h"
 #include "Minecraft.h"
 #include "LevelRenderer.h"
 #include "EntityRenderDispatcher.h"
diff --git a/Minecraft.Client/PreStitchedTextureMap.h b/Minecraft.Client/PreStitchedTextureMap.h
index 40a755f8..6d84263c 100644
--- a/Minecraft.Client/PreStitchedTextureMap.h
+++ b/Minecraft.Client/PreStitchedTextureMap.h
@@ -1,7 +1,7 @@
 #pragma once
 using namespace std;
 
-#include "..\Minecraft.World\IconRegister.h"
+#include "../Minecraft.World/IconRegister.h"
 
 class Icon;
 class StitchedTexture;
diff --git a/Minecraft.Client/ProgressRenderer.cpp b/Minecraft.Client/ProgressRenderer.cpp
index a7c3fd30..fa299509 100644
--- a/Minecraft.Client/ProgressRenderer.cpp
+++ b/Minecraft.Client/ProgressRenderer.cpp
@@ -2,7 +2,7 @@
 #include "Tesselator.h"
 #include "Textures.h"
 #include "ProgressRenderer.h"
-#include "..\Minecraft.World\System.h"
+#include "../Minecraft.World/System.h"
 
 CRITICAL_SECTION ProgressRenderer::s_progress;
 
diff --git a/Minecraft.Client/ProgressRenderer.h b/Minecraft.Client/ProgressRenderer.h
index 29c847d0..05654783 100644
--- a/Minecraft.Client/ProgressRenderer.h
+++ b/Minecraft.Client/ProgressRenderer.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "..\Minecraft.World\ProgressListener.h"
+#include "../Minecraft.World/ProgressListener.h"
 
 class ProgressRenderer : public ProgressListener
 {
diff --git a/Minecraft.Client/QuadrupedModel.cpp b/Minecraft.Client/QuadrupedModel.cpp
index fa7e3b4b..8b0ec985 100644
--- a/Minecraft.Client/QuadrupedModel.cpp
+++ b/Minecraft.Client/QuadrupedModel.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "QuadrupedModel.h"
-#include "..\Minecraft.World\Mth.h"
+#include "../Minecraft.World/Mth.h"
 #include "ModelPart.h"
 
 QuadrupedModel::QuadrupedModel(int legSize, float g) : Model()
diff --git a/Minecraft.Client/ReceivingLevelScreen.cpp b/Minecraft.Client/ReceivingLevelScreen.cpp
index 0e9fe3ec..74e9864e 100644
--- a/Minecraft.Client/ReceivingLevelScreen.cpp
+++ b/Minecraft.Client/ReceivingLevelScreen.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "ReceivingLevelScreen.h"
 #include "ClientConnection.h"
-#include "..\Minecraft.World\net.minecraft.locale.h"
+#include "../Minecraft.World/net.minecraft.locale.h"
 
 ReceivingLevelScreen::ReceivingLevelScreen(ClientConnection *connection)
 {
diff --git a/Minecraft.Client/RedDustParticle.cpp b/Minecraft.Client/RedDustParticle.cpp
index 6a6ad1e1..52df921f 100644
--- a/Minecraft.Client/RedDustParticle.cpp
+++ b/Minecraft.Client/RedDustParticle.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "..\Minecraft.World\JavaMath.h"
+#include "../Minecraft.World/JavaMath.h"
 #include "RedDustParticle.h"
 
 void RedDustParticle::init(Level *level, double x, double y, double z, float scale, float rCol, float gCol, float bCol)
diff --git a/Minecraft.Client/RemotePlayer.cpp b/Minecraft.Client/RemotePlayer.cpp
index c1b72864..005a681d 100644
--- a/Minecraft.Client/RemotePlayer.cpp
+++ b/Minecraft.Client/RemotePlayer.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "RemotePlayer.h"
-#include "..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\Minecraft.World\Mth.h"
+#include "../Minecraft.World/net.minecraft.world.item.h"
+#include "../Minecraft.World/Mth.h"
 
 RemotePlayer::RemotePlayer(Level *level, const wstring& name) : Player(level)
 {
diff --git a/Minecraft.Client/RemotePlayer.h b/Minecraft.Client/RemotePlayer.h
index b55fab16..42ee3af4 100644
--- a/Minecraft.Client/RemotePlayer.h
+++ b/Minecraft.Client/RemotePlayer.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "..\Minecraft.World\SmoothFloat.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.player.h"
+#include "../Minecraft.World/SmoothFloat.h"
+#include "../Minecraft.World/net.minecraft.world.entity.player.h"
 
 class Input;
 
diff --git a/Minecraft.Client/RenameWorldScreen.cpp b/Minecraft.Client/RenameWorldScreen.cpp
index ea05039a..c0d3c47b 100644
--- a/Minecraft.Client/RenameWorldScreen.cpp
+++ b/Minecraft.Client/RenameWorldScreen.cpp
@@ -2,9 +2,9 @@
 #include "RenameWorldScreen.h"
 #include "EditBox.h"
 #include "Button.h"
-#include "..\Minecraft.World\net.minecraft.locale.h"
-#include "..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\Minecraft.World\net.minecraft.world.level.storage.h"
+#include "../Minecraft.World/net.minecraft.locale.h"
+#include "../Minecraft.World/net.minecraft.world.level.h"
+#include "../Minecraft.World/net.minecraft.world.level.storage.h"
 
 RenameWorldScreen::RenameWorldScreen(Screen *lastScreen, const wstring& levelId)
 {
diff --git a/Minecraft.Client/Screen.cpp b/Minecraft.Client/Screen.cpp
index 0019b54d..a84a3abe 100644
--- a/Minecraft.Client/Screen.cpp
+++ b/Minecraft.Client/Screen.cpp
@@ -4,7 +4,7 @@
 #include "GuiParticles.h"
 #include "Tesselator.h"
 #include "Textures.h"
-#include "..\Minecraft.World\SoundTypes.h"
+#include "../Minecraft.World/SoundTypes.h"
 
 
 
diff --git a/Minecraft.Client/ScrolledSelectionList.cpp b/Minecraft.Client/ScrolledSelectionList.cpp
index 9b7367ce..246bc8f0 100644
--- a/Minecraft.Client/ScrolledSelectionList.cpp
+++ b/Minecraft.Client/ScrolledSelectionList.cpp
@@ -3,7 +3,7 @@
 #include "Button.h"
 #include "Tesselator.h"
 #include "Textures.h"
-#include "..\Minecraft.World\System.h"
+#include "../Minecraft.World/System.h"
 
 ScrolledSelectionList::ScrolledSelectionList(Minecraft *minecraft, int width, int height, int y0, int y1, int itemHeight)
 {
diff --git a/Minecraft.Client/SelectWorldScreen.cpp b/Minecraft.Client/SelectWorldScreen.cpp
index a07eb7b2..1655eee8 100644
--- a/Minecraft.Client/SelectWorldScreen.cpp
+++ b/Minecraft.Client/SelectWorldScreen.cpp
@@ -5,9 +5,9 @@
 #include "CreateWorldScreen.h"
 #include "RenameWorldScreen.h"
 #include "DemoMode.h"
-#include "..\Minecraft.World\net.minecraft.locale.h"
-#include "..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\Minecraft.World\net.minecraft.world.level.storage.h"
+#include "../Minecraft.World/net.minecraft.locale.h"
+#include "../Minecraft.World/net.minecraft.world.level.h"
+#include "../Minecraft.World/net.minecraft.world.level.storage.h"
 
 
 SelectWorldScreen::SelectWorldScreen(Screen *lastScreen)
diff --git a/Minecraft.Client/ServerChunkCache.cpp b/Minecraft.Client/ServerChunkCache.cpp
index 1fe1a86f..f4362856 100644
--- a/Minecraft.Client/ServerChunkCache.cpp
+++ b/Minecraft.Client/ServerChunkCache.cpp
@@ -2,15 +2,15 @@
 #include "ServerChunkCache.h"
 #include "ServerLevel.h"
 #include "MinecraftServer.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.storage.h"
-#include "..\Minecraft.World\net.minecraft.world.level.chunk.h"
-#include "..\Minecraft.World\Pos.h"
-#include "..\Minecraft.World\ProgressListener.h"
-#include "..\Minecraft.World\ThreadName.h"
-#include "..\Minecraft.World\compression.h"
-#include "..\Minecraft.World\OldChunkStorage.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.storage.h"
+#include "../Minecraft.World/net.minecraft.world.level.chunk.h"
+#include "../Minecraft.World/Pos.h"
+#include "../Minecraft.World/ProgressListener.h"
+#include "../Minecraft.World/ThreadName.h"
+#include "../Minecraft.World/compression.h"
+#include "../Minecraft.World/OldChunkStorage.h"
 
 ServerChunkCache::ServerChunkCache(ServerLevel *level, ChunkStorage *storage, ChunkSource *source)
 {
diff --git a/Minecraft.Client/ServerChunkCache.h b/Minecraft.Client/ServerChunkCache.h
index 058cecc4..f0694748 100644
--- a/Minecraft.Client/ServerChunkCache.h
+++ b/Minecraft.Client/ServerChunkCache.h
@@ -1,10 +1,10 @@
 #pragma once
-#include "..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\Minecraft.World\File.h"
-#include "..\Minecraft.World\net.minecraft.world.level.storage.h"
-#include "..\Minecraft.World\JavaIntHash.h"
-#include "..\Minecraft.World\RandomLevelSource.h"
-#include "..\Minecraft.World\C4JThread.h"
+#include "../Minecraft.World/net.minecraft.world.level.h"
+#include "../Minecraft.World/File.h"
+#include "../Minecraft.World/net.minecraft.world.level.storage.h"
+#include "../Minecraft.World/JavaIntHash.h"
+#include "../Minecraft.World/RandomLevelSource.h"
+#include "../Minecraft.World/C4JThread.h"
 using namespace std;
 class ServerLevel;
 
diff --git a/Minecraft.Client/ServerCommandDispatcher.cpp b/Minecraft.Client/ServerCommandDispatcher.cpp
index 51dd42fe..a254ea63 100644
--- a/Minecraft.Client/ServerCommandDispatcher.cpp
+++ b/Minecraft.Client/ServerCommandDispatcher.cpp
@@ -2,8 +2,8 @@
 #include "MinecraftServer.h"
 #include "PlayerList.h"
 #include "ServerPlayer.h"
-#include "..\Minecraft.World\net.minecraft.commands.h"
-#include "..\Minecraft.World\net.minecraft.commands.common.h"
+#include "../Minecraft.World/net.minecraft.commands.h"
+#include "../Minecraft.World/net.minecraft.commands.common.h"
 #include "TeleportCommand.h"
 #include "ServerCommandDispatcher.h"
 
diff --git a/Minecraft.Client/ServerCommandDispatcher.h b/Minecraft.Client/ServerCommandDispatcher.h
index 306d4384..d0e51ac6 100644
--- a/Minecraft.Client/ServerCommandDispatcher.h
+++ b/Minecraft.Client/ServerCommandDispatcher.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "..\Minecraft.World\CommandDispatcher.h"
-#include "..\Minecraft.World\AdminLogCommand.h"
+#include "../Minecraft.World/CommandDispatcher.h"
+#include "../Minecraft.World/AdminLogCommand.h"
 
 class ServerCommandDispatcher : public CommandDispatcher, public AdminLogCommand
 {
diff --git a/Minecraft.Client/ServerConnection.cpp b/Minecraft.Client/ServerConnection.cpp
index 9880a8c6..2b93e458 100644
--- a/Minecraft.Client/ServerConnection.cpp
+++ b/Minecraft.Client/ServerConnection.cpp
@@ -4,9 +4,9 @@
 #include "PendingConnection.h"
 #include "PlayerConnection.h"
 #include "ServerPlayer.h"
-#include "..\Minecraft.World\net.minecraft.network.h"
-#include "..\Minecraft.World\Socket.h"
-#include "..\Minecraft.World\net.minecraft.world.level.h"
+#include "../Minecraft.World/net.minecraft.network.h"
+#include "../Minecraft.World/Socket.h"
+#include "../Minecraft.World/net.minecraft.world.level.h"
 #include "MultiPlayerLevel.h"
 
 ServerConnection::ServerConnection(MinecraftServer *server)
diff --git a/Minecraft.Client/ServerLevel.cpp b/Minecraft.Client/ServerLevel.cpp
index de8c66cd..f27e19c0 100644
--- a/Minecraft.Client/ServerLevel.cpp
+++ b/Minecraft.Client/ServerLevel.cpp
@@ -6,33 +6,33 @@
 #include "ServerPlayer.h"
 #include "PlayerConnection.h"
 #include "EntityTracker.h"
-#include "..\Minecraft.World\net.minecraft.world.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.storage.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.level.biome.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.ai.village.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.player.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.npc.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.global.h"
-#include "..\Minecraft.World\ItemEntity.h"
-#include "..\Minecraft.World\Arrow.h"
-#include "..\Minecraft.World\PrimedTnt.h"
-#include "..\Minecraft.World\FallingTile.h"
-#include "..\Minecraft.World\net.minecraft.network.packet.h"
-#include "..\Minecraft.World\Mth.h"
-#include "..\Minecraft.World\net.minecraft.world.level.levelgen.feature.h"
-#include "..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\Minecraft.World\StructurePiece.h"
-#include "..\Minecraft.Client\ServerLevelListener.h"
-#include "..\Minecraft.World\WeighedTreasure.h"
+#include "../Minecraft.World/net.minecraft.world.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.storage.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.level.biome.h"
+#include "../Minecraft.World/net.minecraft.world.entity.h"
+#include "../Minecraft.World/net.minecraft.world.entity.ai.village.h"
+#include "../Minecraft.World/net.minecraft.world.entity.player.h"
+#include "../Minecraft.World/net.minecraft.world.entity.npc.h"
+#include "../Minecraft.World/net.minecraft.world.entity.global.h"
+#include "../Minecraft.World/ItemEntity.h"
+#include "../Minecraft.World/Arrow.h"
+#include "../Minecraft.World/PrimedTnt.h"
+#include "../Minecraft.World/FallingTile.h"
+#include "../Minecraft.World/net.minecraft.network.packet.h"
+#include "../Minecraft.World/Mth.h"
+#include "../Minecraft.World/net.minecraft.world.level.levelgen.feature.h"
+#include "../Minecraft.World/net.minecraft.world.item.h"
+#include "../Minecraft.World/StructurePiece.h"
+#include "../Minecraft.Client/ServerLevelListener.h"
+#include "../Minecraft.World/WeighedTreasure.h"
 #include "TexturePackRepository.h"
 #include "DLCTexturePack.h"
-#include "..\Minecraft.World\ProgressListener.h"
-#include "PS3\PS3Extras\ShutdownManager.h"
+#include "../Minecraft.World/ProgressListener.h"
+#include "PS3/PS3Extras/ShutdownManager.h"
 #include "PlayerChunkMap.h"
 
 WeighedTreasureArray ServerLevel::RANDOM_BONUS_ITEMS;
diff --git a/Minecraft.Client/ServerLevelListener.cpp b/Minecraft.Client/ServerLevelListener.cpp
index 3b12630f..33616244 100644
--- a/Minecraft.Client/ServerLevelListener.cpp
+++ b/Minecraft.Client/ServerLevelListener.cpp
@@ -7,9 +7,9 @@
 #include "PlayerList.h"
 #include "PlayerChunkMap.h"
 #include "PlayerConnection.h"
-#include "..\Minecraft.World\net.minecraft.world.level.dimension.h"
-#include "..\Minecraft.World\net.minecraft.network.packet.h"
-#include "..\Minecraft.World\LevelData.h"
+#include "../Minecraft.World/net.minecraft.world.level.dimension.h"
+#include "../Minecraft.World/net.minecraft.network.packet.h"
+#include "../Minecraft.World/LevelData.h"
 
 
 ServerLevelListener::ServerLevelListener(MinecraftServer *server, ServerLevel *level)
diff --git a/Minecraft.Client/ServerLevelListener.h b/Minecraft.Client/ServerLevelListener.h
index 1886a89d..49e08601 100644
--- a/Minecraft.Client/ServerLevelListener.h
+++ b/Minecraft.Client/ServerLevelListener.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "..\Minecraft.World\LevelListener.h"
+#include "../Minecraft.World/LevelListener.h"
 class Player;
 class TileEntity;
 class Entity;
diff --git a/Minecraft.Client/ServerPlayer.cpp b/Minecraft.Client/ServerPlayer.cpp
index 489e6f34..d898abbd 100644
--- a/Minecraft.Client/ServerPlayer.cpp
+++ b/Minecraft.Client/ServerPlayer.cpp
@@ -8,23 +8,23 @@
 #include "Settings.h"
 #include "PlayerList.h"
 #include "MultiPlayerLevel.h"
-#include "..\Minecraft.World\Pos.h"
-#include "..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\Minecraft.World\net.minecraft.world.level.storage.h"
-#include "..\Minecraft.World\net.minecraft.world.level.dimension.h"
-#include "..\Minecraft.World\Random.h"
-#include "..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\Minecraft.World\net.minecraft.network.packet.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.projectile.h"
-#include "..\Minecraft.World\net.minecraft.world.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.entity.item.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
-#include "..\Minecraft.World\net.minecraft.stats.h"
-#include "..\Minecraft.World\net.minecraft.locale.h"
-#include "..\Minecraft.World\net.minecraft.world.damagesource.h"
-#include "..\Minecraft.World\LevelChunk.h"
+#include "../Minecraft.World/Pos.h"
+#include "../Minecraft.World/net.minecraft.world.level.h"
+#include "../Minecraft.World/net.minecraft.world.level.storage.h"
+#include "../Minecraft.World/net.minecraft.world.level.dimension.h"
+#include "../Minecraft.World/Random.h"
+#include "../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../Minecraft.World/net.minecraft.network.packet.h"
+#include "../Minecraft.World/net.minecraft.world.entity.projectile.h"
+#include "../Minecraft.World/net.minecraft.world.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.entity.item.h"
+#include "../Minecraft.World/net.minecraft.world.level.tile.entity.h"
+#include "../Minecraft.World/net.minecraft.stats.h"
+#include "../Minecraft.World/net.minecraft.locale.h"
+#include "../Minecraft.World/net.minecraft.world.damagesource.h"
+#include "../Minecraft.World/LevelChunk.h"
 #include "LevelRenderer.h"
 
 ServerPlayer::ServerPlayer(MinecraftServer *server, Level *level, const wstring& name, ServerPlayerGameMode *gameMode) : Player(level)
@@ -445,7 +445,7 @@ void ServerPlayer::doChunkSendingTick(bool dontDelayChunks)
 					for (unsigned int i = 0; i < tes->size(); i++)
 					{
 						// 4J Stu - Added delay param to ensure that these arrive after the BRUPs from above
-						// Fix for #9169 - ART : Sign text is replaced with the words “Awaiting approval”.
+						// Fix for #9169 - ART : Sign text is replaced with the words “Awaiting approval”.
 						broadcast(tes->at(i), !connection->isLocal() && !dontDelayChunks);
 					}
 					delete tes;
diff --git a/Minecraft.Client/ServerPlayerGameMode.cpp b/Minecraft.Client/ServerPlayerGameMode.cpp
index 9b31df0d..6552dcf5 100644
--- a/Minecraft.Client/ServerPlayerGameMode.cpp
+++ b/Minecraft.Client/ServerPlayerGameMode.cpp
@@ -3,13 +3,13 @@
 #include "ServerLevel.h"
 #include "ServerPlayer.h"
 #include "PlayerConnection.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.player.h"
-#include "..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\Minecraft.World\net.minecraft.network.packet.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.dimension.h"
+#include "../Minecraft.World/net.minecraft.world.level.tile.h"
+#include "../Minecraft.World/net.minecraft.world.entity.player.h"
+#include "../Minecraft.World/net.minecraft.world.item.h"
+#include "../Minecraft.World/net.minecraft.network.packet.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.dimension.h"
 #include "MultiPlayerLevel.h"
 #include "LevelRenderer.h"
 
diff --git a/Minecraft.Client/Settings.cpp b/Minecraft.Client/Settings.cpp
index 89946773..315f8079 100644
--- a/Minecraft.Client/Settings.cpp
+++ b/Minecraft.Client/Settings.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "Settings.h"
-#include "..\Minecraft.World\StringHelpers.h"
+#include "../Minecraft.World/StringHelpers.h"
 
 // 4J - TODO - serialise/deserialise from file
 Settings::Settings(File *file)
diff --git a/Minecraft.Client/SheepFurModel.cpp b/Minecraft.Client/SheepFurModel.cpp
index bb84e80d..476496ce 100644
--- a/Minecraft.Client/SheepFurModel.cpp
+++ b/Minecraft.Client/SheepFurModel.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
+#include "../Minecraft.World/net.minecraft.world.entity.animal.h"
 #include "SheepFurModel.h"
 #include "ModelPart.h"
 
diff --git a/Minecraft.Client/SheepModel.cpp b/Minecraft.Client/SheepModel.cpp
index 7d093353..549267b9 100644
--- a/Minecraft.Client/SheepModel.cpp
+++ b/Minecraft.Client/SheepModel.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
+#include "../Minecraft.World/net.minecraft.world.entity.animal.h"
 #include "SheepModel.h"
 #include "ModelPart.h"
 
diff --git a/Minecraft.Client/SheepRenderer.cpp b/Minecraft.Client/SheepRenderer.cpp
index 4af155d3..fc9118d2 100644
--- a/Minecraft.Client/SheepRenderer.cpp
+++ b/Minecraft.Client/SheepRenderer.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "SheepRenderer.h"
 #include "MultiPlayerLocalPlayer.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
+#include "../Minecraft.World/net.minecraft.world.entity.animal.h"
 
 SheepRenderer::SheepRenderer(Model *model, Model *armor, float shadow) : MobRenderer(model, shadow)
 {
diff --git a/Minecraft.Client/SignRenderer.cpp b/Minecraft.Client/SignRenderer.cpp
index 97eff4bd..caa4c8e9 100644
--- a/Minecraft.Client/SignRenderer.cpp
+++ b/Minecraft.Client/SignRenderer.cpp
@@ -2,10 +2,10 @@
 #include "SignRenderer.h"
 #include "SignModel.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\Entity.h"
-#include "..\Minecraft.World\Level.h"
+#include "../Minecraft.World/net.minecraft.world.level.tile.entity.h"
+#include "../Minecraft.World/net.minecraft.world.level.tile.h"
+#include "../Minecraft.World/Entity.h"
+#include "../Minecraft.World/Level.h"
 
 
 SignRenderer::SignRenderer()
diff --git a/Minecraft.Client/SilverfishModel.cpp b/Minecraft.Client/SilverfishModel.cpp
index 128a7e79..dc768921 100644
--- a/Minecraft.Client/SilverfishModel.cpp
+++ b/Minecraft.Client/SilverfishModel.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "SilverfishModel.h"
 #include "Cube.h"
-#include "..\Minecraft.World\Mth.h"
+#include "../Minecraft.World/Mth.h"
 #include "ModelPart.h"
 
 const int SilverfishModel::BODY_SIZES[BODY_COUNT][3] = {
diff --git a/Minecraft.Client/SilverfishRenderer.cpp b/Minecraft.Client/SilverfishRenderer.cpp
index 9ed194ca..da522814 100644
--- a/Minecraft.Client/SilverfishRenderer.cpp
+++ b/Minecraft.Client/SilverfishRenderer.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "SilverfishRenderer.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.monster.h"
+#include "../Minecraft.World/net.minecraft.world.entity.monster.h"
 #include "SilverfishModel.h"
 
 SilverfishRenderer::SilverfishRenderer() : MobRenderer(new SilverfishModel(), 0.3f)
diff --git a/Minecraft.Client/SkeletonModel.cpp b/Minecraft.Client/SkeletonModel.cpp
index ab4778ee..4a9caf85 100644
--- a/Minecraft.Client/SkeletonModel.cpp
+++ b/Minecraft.Client/SkeletonModel.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "SkeletonModel.h"
-#include "..\Minecraft.World\Mth.h"
+#include "../Minecraft.World/Mth.h"
 #include "ModelPart.h"
 
 void SkeletonModel::_init(float g)
diff --git a/Minecraft.Client/SkullTileRenderer.cpp b/Minecraft.Client/SkullTileRenderer.cpp
index 641a7a02..6b5770ff 100644
--- a/Minecraft.Client/SkullTileRenderer.cpp
+++ b/Minecraft.Client/SkullTileRenderer.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
-#include "..\Minecraft.World\SkullTileEntity.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
-#include "..\Minecraft.World\net.minecraft.h"
+#include "../Minecraft.World/SkullTileEntity.h"
+#include "../Minecraft.World/net.minecraft.world.level.tile.h"
+#include "../Minecraft.World/net.minecraft.h"
 #include "SkeletonHeadModel.h"
 #include "SkullTileRenderer.h"
 
diff --git a/Minecraft.Client/SlimeRenderer.cpp b/Minecraft.Client/SlimeRenderer.cpp
index 23c9c16e..e1469f82 100644
--- a/Minecraft.Client/SlimeRenderer.cpp
+++ b/Minecraft.Client/SlimeRenderer.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "SlimeRenderer.h"	
-#include "..\Minecraft.World\net.minecraft.world.entity.monster.h"
+#include "../Minecraft.World/net.minecraft.world.entity.monster.h"
 
 SlimeRenderer::SlimeRenderer(Model *model, Model *armor, float shadow) : MobRenderer(model, shadow)
 {
diff --git a/Minecraft.Client/SmokeParticle.cpp b/Minecraft.Client/SmokeParticle.cpp
index a8855885..34fb96cd 100644
--- a/Minecraft.Client/SmokeParticle.cpp
+++ b/Minecraft.Client/SmokeParticle.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "..\Minecraft.World\JavaMath.h"
+#include "../Minecraft.World/JavaMath.h"
 #include "SmokeParticle.h"
 
 void SmokeParticle::init(Level *level, double x, double y, double z, double xa, double ya, double za, float scale)
diff --git a/Minecraft.Client/SnowManModel.cpp b/Minecraft.Client/SnowManModel.cpp
index 4344a17a..3888db85 100644
--- a/Minecraft.Client/SnowManModel.cpp
+++ b/Minecraft.Client/SnowManModel.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "SnowmanModel.h"
-#include "..\Minecraft.World\Mth.h"
+#include "../Minecraft.World/Mth.h"
 #include "ModelPart.h"
 
 SnowManModel::SnowManModel() : Model()
diff --git a/Minecraft.Client/SnowManRenderer.cpp b/Minecraft.Client/SnowManRenderer.cpp
index 83edb3f5..e3945e9e 100644
--- a/Minecraft.Client/SnowManRenderer.cpp
+++ b/Minecraft.Client/SnowManRenderer.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "SnowManModel.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.animal.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.animal.h"
+#include "../Minecraft.World/net.minecraft.world.level.tile.h"
+#include "../Minecraft.World/net.minecraft.world.item.h"
 #include "ModelPart.h"
 #include "EntityRenderDispatcher.h"
 #include "SnowManRenderer.h"
diff --git a/Minecraft.Client/SnowShovelParticle.cpp b/Minecraft.Client/SnowShovelParticle.cpp
index 4417cb5d..6473f6d5 100644
--- a/Minecraft.Client/SnowShovelParticle.cpp
+++ b/Minecraft.Client/SnowShovelParticle.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "..\Minecraft.World\JavaMath.h"
+#include "../Minecraft.World/JavaMath.h"
 #include "SnowShovelParticle.h"
 
 void SnowShovelParticle::init(Level *level, double x, double y, double z, double xa, double ya, double za, float scale)
diff --git a/Minecraft.Client/SpellParticle.cpp b/Minecraft.Client/SpellParticle.cpp
index ce8b975f..7a81419b 100644
--- a/Minecraft.Client/SpellParticle.cpp
+++ b/Minecraft.Client/SpellParticle.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "..\Minecraft.World\JavaMath.h"
+#include "../Minecraft.World/JavaMath.h"
 #include "SpellParticle.h"
 
 SpellParticle::SpellParticle(Level *level, double x, double y, double z, double xa, double ya, double za) : Particle(level, x, y, z, xa, ya, za)
diff --git a/Minecraft.Client/SpiderModel.cpp b/Minecraft.Client/SpiderModel.cpp
index 35c51d3e..e9de7c84 100644
--- a/Minecraft.Client/SpiderModel.cpp
+++ b/Minecraft.Client/SpiderModel.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "SpiderModel.h"
-#include "..\Minecraft.World\Mth.h"
+#include "../Minecraft.World/Mth.h"
 #include "ModelPart.h"
 
 SpiderModel::SpiderModel() : Model()
diff --git a/Minecraft.Client/SpiderRenderer.cpp b/Minecraft.Client/SpiderRenderer.cpp
index 9c31eb9e..3b325838 100644
--- a/Minecraft.Client/SpiderRenderer.cpp
+++ b/Minecraft.Client/SpiderRenderer.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "SpiderRenderer.h"
 #include "SpiderModel.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.monster.h"
+#include "../Minecraft.World/net.minecraft.world.entity.monster.h"
 
 SpiderRenderer::SpiderRenderer() : MobRenderer(new SpiderModel(), 1.0f)
 {
diff --git a/Minecraft.Client/SquidModel.cpp b/Minecraft.Client/SquidModel.cpp
index 8ad20f8e..e1b57c59 100644
--- a/Minecraft.Client/SquidModel.cpp
+++ b/Minecraft.Client/SquidModel.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "SquidModel.h"
-#include "..\Minecraft.World\Mth.h"
+#include "../Minecraft.World/Mth.h"
 #include "ModelPart.h"
 
 SquidModel::SquidModel() : Model()
diff --git a/Minecraft.Client/SquidRenderer.cpp b/Minecraft.Client/SquidRenderer.cpp
index 135f6d9b..c721ade2 100644
--- a/Minecraft.Client/SquidRenderer.cpp
+++ b/Minecraft.Client/SquidRenderer.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "SquidRenderer.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
+#include "../Minecraft.World/net.minecraft.world.entity.animal.h"
 
 SquidRenderer::SquidRenderer(Model *model, float shadow) : MobRenderer(model, shadow)
 {
diff --git a/Minecraft.Client/StatsCounter.cpp b/Minecraft.Client/StatsCounter.cpp
index 4568c7db..a4970b6f 100644
--- a/Minecraft.Client/StatsCounter.cpp
+++ b/Minecraft.Client/StatsCounter.cpp
@@ -1,15 +1,15 @@
 #include "stdafx.h"
 #include "StatsCounter.h"
-#include "..\Minecraft.World\Stat.h"
-#include "..\Minecraft.World\Stats.h"
-#include "..\Minecraft.World\Achievement.h"
-#include "..\Minecraft.World\Achievements.h"
-#include "..\Minecraft.Client\LocalPlayer.h"
+#include "../Minecraft.World/Stat.h"
+#include "../Minecraft.World/Stats.h"
+#include "../Minecraft.World/Achievement.h"
+#include "../Minecraft.World/Achievements.h"
+#include "../Minecraft.Client/LocalPlayer.h"
 
-#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
-#include "..\Minecraft.World\net.minecraft.world.item.h"
+#include "../Minecraft.World/net.minecraft.world.level.tile.h"
+#include "../Minecraft.World/net.minecraft.world.item.h"
 
-#include "..\Minecraft.Client\Common\Leaderboards\LeaderboardManager.h"
+#include "../Minecraft.Client/Common/Leaderboards/LeaderboardManager.h"
 
 Stat** StatsCounter::LARGE_STATS[] = {
 	&Stats::walkOneM,
diff --git a/Minecraft.Client/StatsScreen.cpp b/Minecraft.Client/StatsScreen.cpp
index 01d041f0..121fb25f 100644
--- a/Minecraft.Client/StatsScreen.cpp
+++ b/Minecraft.Client/StatsScreen.cpp
@@ -5,9 +5,9 @@
 #include "Button.h"
 #include "Font.h"
 #include "Lighting.h"
-#include "..\Minecraft.World\net.minecraft.locale.h"
-#include "..\Minecraft.World\net.minecraft.stats.h"
-#include "..\Minecraft.World\net.minecraft.world.item.h"
+#include "../Minecraft.World/net.minecraft.locale.h"
+#include "../Minecraft.World/net.minecraft.stats.h"
+#include "../Minecraft.World/net.minecraft.world.item.h"
 
 const float StatsScreen::SLOT_TEX_SIZE = 128.0f;
 ItemRenderer *StatsScreen::itemRenderer = NULL;
diff --git a/Minecraft.Client/StitchSlot.cpp b/Minecraft.Client/StitchSlot.cpp
index 5e9700b0..2ec1fe6b 100644
--- a/Minecraft.Client/StitchSlot.cpp
+++ b/Minecraft.Client/StitchSlot.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "TextureHolder.h"
-#include "..\Minecraft.World\StringHelpers.h"
+#include "../Minecraft.World/StringHelpers.h"
 #include "StitchSlot.h"
 
 StitchSlot::StitchSlot(int originX, int originY, int width, int height) : originX(originX), originY(originY), width(width), height(height)
diff --git a/Minecraft.Client/StitchedTexture.cpp b/Minecraft.Client/StitchedTexture.cpp
index d7e47b42..e9221ecd 100644
--- a/Minecraft.Client/StitchedTexture.cpp
+++ b/Minecraft.Client/StitchedTexture.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "Texture.h"
-#include "..\Minecraft.World\StringHelpers.h"
+#include "../Minecraft.World/StringHelpers.h"
 #include "ClockTexture.h"
 #include "CompassTexture.h"
 #include "StitchedTexture.h"
diff --git a/Minecraft.Client/StitchedTexture.h b/Minecraft.Client/StitchedTexture.h
index 99b1d447..656351c1 100644
--- a/Minecraft.Client/StitchedTexture.h
+++ b/Minecraft.Client/StitchedTexture.h
@@ -1,7 +1,7 @@
 #pragma once
 using namespace std;
 
-#include "..\Minecraft.World\Icon.h"
+#include "../Minecraft.World/Icon.h"
 class Texture;
 
 class StitchedTexture : public Icon
diff --git a/Minecraft.Client/SurvivalMode.cpp b/Minecraft.Client/SurvivalMode.cpp
index 27a992df..317af52d 100644
--- a/Minecraft.Client/SurvivalMode.cpp
+++ b/Minecraft.Client/SurvivalMode.cpp
@@ -3,10 +3,10 @@
 #include "DemoMode.h"
 #include "LevelRenderer.h"
 #include "LocalPlayer.h"
-#include "..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.player.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.entity.player.h"
+#include "../Minecraft.World/net.minecraft.world.item.h"
 #include "ClientConstants.h"
 
 SurvivalMode::SurvivalMode(Minecraft *minecraft) : GameMode(minecraft)
diff --git a/Minecraft.Client/SuspendedParticle.cpp b/Minecraft.Client/SuspendedParticle.cpp
index 70702de0..2b46456a 100644
--- a/Minecraft.Client/SuspendedParticle.cpp
+++ b/Minecraft.Client/SuspendedParticle.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "SuspendedParticle.h"
-#include "..\Minecraft.World\Random.h"
-#include "..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\Minecraft.World\JavaMath.h"
-#include "..\Minecraft.World\Mth.h"
-#include "..\Minecraft.World\net.minecraft.world.level.material.h"
+#include "../Minecraft.World/Random.h"
+#include "../Minecraft.World/net.minecraft.world.level.h"
+#include "../Minecraft.World/JavaMath.h"
+#include "../Minecraft.World/Mth.h"
+#include "../Minecraft.World/net.minecraft.world.level.material.h"
 
 SuspendedParticle::SuspendedParticle(Level *level, double x, double y, double z, double xa, double ya, double za) : Particle(level,x, y - 2 / 16.0f, z, xa, ya, za)
 {
diff --git a/Minecraft.Client/SuspendedTownParticle.cpp b/Minecraft.Client/SuspendedTownParticle.cpp
index a24bbc42..4be1d087 100644
--- a/Minecraft.Client/SuspendedTownParticle.cpp
+++ b/Minecraft.Client/SuspendedTownParticle.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "SuspendedTownParticle.h"
-#include "..\Minecraft.World\Random.h"
-#include "..\Minecraft.World\JavaMath.h"
+#include "../Minecraft.World/Random.h"
+#include "../Minecraft.World/JavaMath.h"
 
 SuspendedTownParticle::SuspendedTownParticle(Level *level, double x, double y, double z, double xa, double ya, double za) : Particle(level, x, y, z, xa, ya, za)
 {
diff --git a/Minecraft.Client/TakeAnimationParticle.cpp b/Minecraft.Client/TakeAnimationParticle.cpp
index c9530b0a..a95e415f 100644
--- a/Minecraft.Client/TakeAnimationParticle.cpp
+++ b/Minecraft.Client/TakeAnimationParticle.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "TakeAnimationParticle.h"
 #include "EntityRenderDispatcher.h"
-#include "..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\Minecraft.World\Mth.h"
+#include "../Minecraft.World/net.minecraft.world.item.h"
+#include "../Minecraft.World/net.minecraft.world.level.h"
+#include "../Minecraft.World/Mth.h"
 
 TakeAnimationParticle::TakeAnimationParticle(Level *level, shared_ptr<Entity> item, shared_ptr<Entity> target, float yOffs) : Particle(level, item->x, item->y, item->z, item->xd, item->yd, item->zd)
 {
diff --git a/Minecraft.Client/TeleportCommand.cpp b/Minecraft.Client/TeleportCommand.cpp
index 2132cfd4..e746dd7d 100644
--- a/Minecraft.Client/TeleportCommand.cpp
+++ b/Minecraft.Client/TeleportCommand.cpp
@@ -3,10 +3,10 @@
 #include "PlayerList.h"
 #include "ServerPlayer.h"
 #include "PlayerConnection.h"
-#include "..\Minecraft.World\net.minecraft.commands.h"
-#include "..\Minecraft.World\net.minecraft.network.packet.h"
-#include "..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\Minecraft.World\net.minecraft.world.level.dimension.h"
+#include "../Minecraft.World/net.minecraft.commands.h"
+#include "../Minecraft.World/net.minecraft.network.packet.h"
+#include "../Minecraft.World/net.minecraft.world.level.h"
+#include "../Minecraft.World/net.minecraft.world.level.dimension.h"
 #include "TeleportCommand.h"
 
 EGameCommand TeleportCommand::getId()
diff --git a/Minecraft.Client/TeleportCommand.h b/Minecraft.Client/TeleportCommand.h
index 9015a52d..0b37e6d1 100644
--- a/Minecraft.Client/TeleportCommand.h
+++ b/Minecraft.Client/TeleportCommand.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "..\Minecraft.World\Command.h"
+#include "../Minecraft.World/Command.h"
 
 class TeleportCommand : public Command
 {
diff --git a/Minecraft.Client/TerrainParticle.cpp b/Minecraft.Client/TerrainParticle.cpp
index 811ba840..59ce920e 100644
--- a/Minecraft.Client/TerrainParticle.cpp
+++ b/Minecraft.Client/TerrainParticle.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "TerrainParticle.h"
 #include "Tesselator.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
-#include "..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\Minecraft.World\net.minecraft.world.h"
+#include "../Minecraft.World/net.minecraft.world.level.tile.h"
+#include "../Minecraft.World/net.minecraft.world.level.h"
+#include "../Minecraft.World/net.minecraft.world.h"
 
 TerrainParticle::TerrainParticle(Level *level, double x, double y, double z, double xa, double ya, double za, Tile *tile, int face, int data, Textures *textures) : Particle(level, x, y, z, xa, ya, za)
 {
diff --git a/Minecraft.Client/Tesselator.cpp b/Minecraft.Client/Tesselator.cpp
index 366b09e3..cecdcad2 100644
--- a/Minecraft.Client/Tesselator.cpp
+++ b/Minecraft.Client/Tesselator.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "Tesselator.h"
-#include "..\Minecraft.World\BasicTypeContainers.h"
-#include "..\Minecraft.World\FloatBuffer.h"
-#include "..\Minecraft.World\IntBuffer.h"
-#include "..\Minecraft.World\ByteBuffer.h"
+#include "../Minecraft.World/BasicTypeContainers.h"
+#include "../Minecraft.World/FloatBuffer.h"
+#include "../Minecraft.World/IntBuffer.h"
+#include "../Minecraft.World/ByteBuffer.h"
 
 bool Tesselator::TRIANGLE_MODE = false;
 bool Tesselator::USE_VBO = false;
diff --git a/Minecraft.Client/TextEditScreen.cpp b/Minecraft.Client/TextEditScreen.cpp
index 9537b969..bae3cc21 100644
--- a/Minecraft.Client/TextEditScreen.cpp
+++ b/Minecraft.Client/TextEditScreen.cpp
@@ -4,11 +4,11 @@
 #include "TileEntityRenderDispatcher.h"
 #include "ClientConnection.h"
 #include "MultiPlayerLevel.h"
-#include "..\Minecraft.World\SignTileEntity.h"
-#include "..\Minecraft.World\SharedConstants.h"
-#include "..\Minecraft.World\net.minecraft.network.packet.h"
-#include "..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "../Minecraft.World/SignTileEntity.h"
+#include "../Minecraft.World/SharedConstants.h"
+#include "../Minecraft.World/net.minecraft.network.packet.h"
+#include "../Minecraft.World/net.minecraft.world.level.h"
+#include "../Minecraft.World/net.minecraft.world.level.tile.h"
 
 
 const wstring TextEditScreen::allowedChars = SharedConstants::acceptableLetters;;
diff --git a/Minecraft.Client/Texture.cpp b/Minecraft.Client/Texture.cpp
index e287c177..540c23f2 100644
--- a/Minecraft.Client/Texture.cpp
+++ b/Minecraft.Client/Texture.cpp
@@ -1,11 +1,11 @@
 #include "stdafx.h"
-#include "..\Minecraft.World\ByteBuffer.h"
+#include "../Minecraft.World/ByteBuffer.h"
 #include "Rect2i.h"
 #include "TextureManager.h"
 #include "Texture.h"
 
 #ifdef __PS3__
-#include "PS3\SPU_Tasks\Texture_blit\Texture_blit.h"
+#include "PS3/SPU_Tasks/Texture_blit/Texture_blit.h"
 #include "C4JSpursJob.h"
 static const int sc_maxTextureBlits = 256;
 static Texture_blit_DataIn g_textureBlitDataIn[sc_maxTextureBlits] __attribute__((__aligned__(16)));
diff --git a/Minecraft.Client/TextureHolder.cpp b/Minecraft.Client/TextureHolder.cpp
index 9cbf5c46..f1e59689 100644
--- a/Minecraft.Client/TextureHolder.cpp
+++ b/Minecraft.Client/TextureHolder.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "Stitcher.h"
 #include "Texture.h"
-#include "..\Minecraft.World\StringHelpers.h"
+#include "../Minecraft.World/StringHelpers.h"
 #include "TextureHolder.h"
 
 TextureHolder::TextureHolder(Texture *texture)
diff --git a/Minecraft.Client/TextureManager.cpp b/Minecraft.Client/TextureManager.cpp
index 84b164b4..f05e86ee 100644
--- a/Minecraft.Client/TextureManager.cpp
+++ b/Minecraft.Client/TextureManager.cpp
@@ -5,7 +5,7 @@
 #include "TexturePackRepository.h"
 #include "Minecraft.h"
 #include "TextureManager.h"
-#include "..\Minecraft.World\StringHelpers.h"
+#include "../Minecraft.World/StringHelpers.h"
 
 TextureManager *TextureManager::instance = NULL;
 
diff --git a/Minecraft.Client/TextureMap.cpp b/Minecraft.Client/TextureMap.cpp
index 836a853e..4830c3ca 100644
--- a/Minecraft.Client/TextureMap.cpp
+++ b/Minecraft.Client/TextureMap.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.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"
+#include "../Minecraft.World/net.minecraft.world.level.tile.h"
+#include "../Minecraft.World/net.minecraft.world.item.h"
 #include "Minecraft.h"
 #include "LevelRenderer.h"
 #include "EntityRenderDispatcher.h"
diff --git a/Minecraft.Client/TextureMap.h b/Minecraft.Client/TextureMap.h
index 2984e532..13827ff5 100644
--- a/Minecraft.Client/TextureMap.h
+++ b/Minecraft.Client/TextureMap.h
@@ -1,7 +1,7 @@
 #pragma once
 using namespace std;
 
-#include "..\Minecraft.World\IconRegister.h"
+#include "../Minecraft.World/IconRegister.h"
 
 class StitchedTexture;
 class Texture;
diff --git a/Minecraft.Client/TexturePackRepository.cpp b/Minecraft.Client/TexturePackRepository.cpp
index 163ec7ba..bc93735d 100644
--- a/Minecraft.Client/TexturePackRepository.cpp
+++ b/Minecraft.Client/TexturePackRepository.cpp
@@ -5,8 +5,8 @@
 #include "FolderTexturePack.h"
 #include "DLCTexturePack.h"
 #include "Options.h"
-#include "..\Minecraft.World\File.h"
-#include "..\Minecraft.World\StringHelpers.h"
+#include "../Minecraft.World/File.h"
+#include "../Minecraft.World/StringHelpers.h"
 #include "Minimap.h"
 
 TexturePack *TexturePackRepository::DEFAULT_TEXTURE_PACK = NULL;
diff --git a/Minecraft.Client/Textures.cpp b/Minecraft.Client/Textures.cpp
index ce7a9bfc..e0b05bfb 100644
--- a/Minecraft.Client/Textures.cpp
+++ b/Minecraft.Client/Textures.cpp
@@ -3,19 +3,19 @@
 #include "TexturePackRepository.h"
 #include "HttpTexture.h"
 #include "MemTexture.h"
-#include "..\Minecraft.World\InputStream.h"
-#include "..\Minecraft.World\IntBuffer.h"
-#include "..\Minecraft.World\ByteBuffer.h"
+#include "../Minecraft.World/InputStream.h"
+#include "../Minecraft.World/IntBuffer.h"
+#include "../Minecraft.World/ByteBuffer.h"
 #include "TexturePack.h"
 #include "Options.h"
-#include "..\Minecraft.Client\MemTextureProcessor.h"
+#include "../Minecraft.Client/MemTextureProcessor.h"
 #include "MobSkinMemTextureProcessor.h"
 #include "PreStitchedTextureMap.h"
 #include "StitchedTexture.h"
 #include "Texture.h"
-#include "..\Minecraft.World\net.minecraft.world.h"
-#include "..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\Minecraft.World\StringHelpers.h"
+#include "../Minecraft.World/net.minecraft.world.h"
+#include "../Minecraft.World/net.minecraft.world.level.h"
+#include "../Minecraft.World/StringHelpers.h"
 
 bool Textures::MIPMAP = true;
 C4JRender::eTextureFormat Textures::TEXTURE_FORMAT = C4JRender::TEXTURE_FORMAT_RxGyBzAw;
diff --git a/Minecraft.Client/TheEndPortalRenderer.cpp b/Minecraft.Client/TheEndPortalRenderer.cpp
index 52581579..5c692275 100644
--- a/Minecraft.Client/TheEndPortalRenderer.cpp
+++ b/Minecraft.Client/TheEndPortalRenderer.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
-#include "..\Minecraft.World\Random.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
+#include "../Minecraft.World/Random.h"
+#include "../Minecraft.World/net.minecraft.world.level.tile.entity.h"
 #include "Tesselator.h"
 #include "TileEntityRenderDispatcher.h"
 #include "Camera.h"
-#include "..\Minecraft.World\FloatBuffer.h"
+#include "../Minecraft.World/FloatBuffer.h"
 #include "TheEndPortalRenderer.h"
 
 void TheEndPortalRenderer::render(shared_ptr<TileEntity> _table, double x, double y, double z, float a, bool setColor, float alpha, bool useCompiled)
diff --git a/Minecraft.Client/TileEntityRenderDispatcher.cpp b/Minecraft.Client/TileEntityRenderDispatcher.cpp
index 1708d215..e687c459 100644
--- a/Minecraft.Client/TileEntityRenderDispatcher.cpp
+++ b/Minecraft.Client/TileEntityRenderDispatcher.cpp
@@ -1,10 +1,10 @@
 #include "stdafx.h"
 #include "TileEntityRenderDispatcher.h"
 #include "TileEntityRenderer.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.player.h"
-#include "..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\Minecraft.World\PistonPieceEntity.h"
+#include "../Minecraft.World/net.minecraft.world.level.tile.entity.h"
+#include "../Minecraft.World/net.minecraft.world.entity.player.h"
+#include "../Minecraft.World/net.minecraft.world.level.h"
+#include "../Minecraft.World/PistonPieceEntity.h"
 #include "SignRenderer.h"
 #include "MobSpawnerRenderer.h"
 #include "PistonPieceRenderer.h"
diff --git a/Minecraft.Client/TileEntityRenderDispatcher.h b/Minecraft.Client/TileEntityRenderDispatcher.h
index d86ddb01..64790a1b 100644
--- a/Minecraft.Client/TileEntityRenderDispatcher.h
+++ b/Minecraft.Client/TileEntityRenderDispatcher.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "Textures.h"
-#include "..\Minecraft.World\JavaIntHash.h"
+#include "../Minecraft.World/JavaIntHash.h"
 class Mob;
 class Level;
 class TileEntityRenderer;
diff --git a/Minecraft.Client/TileRenderer.cpp b/Minecraft.Client/TileRenderer.cpp
index 3b8d4c4e..d962ac78 100644
--- a/Minecraft.Client/TileRenderer.cpp
+++ b/Minecraft.Client/TileRenderer.cpp
@@ -4,11 +4,11 @@
 #include "GameRenderer.h"
 #include "Minecraft.h"
 #include "Textures.h"
-#include "..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
-#include "..\Minecraft.World\net.minecraft.world.level.material.h"
-#include "..\Minecraft.World\net.minecraft.h"
-#include "..\Minecraft.World\net.minecraft.world.h"
+#include "../Minecraft.World/net.minecraft.world.level.h"
+#include "../Minecraft.World/net.minecraft.world.level.tile.h"
+#include "../Minecraft.World/net.minecraft.world.level.material.h"
+#include "../Minecraft.World/net.minecraft.h"
+#include "../Minecraft.World/net.minecraft.world.h"
 #include "Tesselator.h"
 #include "EntityTileRenderer.h"
 #include "Options.h"
diff --git a/Minecraft.Client/Timer.cpp b/Minecraft.Client/Timer.cpp
index b451c034..861940db 100644
--- a/Minecraft.Client/Timer.cpp
+++ b/Minecraft.Client/Timer.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "Timer.h"
-#include "..\Minecraft.World\System.h"
+#include "../Minecraft.World/System.h"
 
 Timer::Timer(float ticksPerSecond)
 {
diff --git a/Minecraft.Client/TitleScreen.cpp b/Minecraft.Client/TitleScreen.cpp
index 7d426095..8bfd5d10 100644
--- a/Minecraft.Client/TitleScreen.cpp
+++ b/Minecraft.Client/TitleScreen.cpp
@@ -5,11 +5,11 @@
 #include "JoinMultiplayerScreen.h"
 #include "Tesselator.h"
 #include "Textures.h"
-#include "..\Minecraft.World\StringHelpers.h"
-#include "..\Minecraft.World\InputOutputStream.h"
-#include "..\Minecraft.World\net.minecraft.locale.h"
-#include "..\Minecraft.World\System.h"
-#include "..\Minecraft.World\Random.h"
+#include "../Minecraft.World/StringHelpers.h"
+#include "../Minecraft.World/InputOutputStream.h"
+#include "../Minecraft.World/net.minecraft.locale.h"
+#include "../Minecraft.World/System.h"
+#include "../Minecraft.World/Random.h"
 #include "TitleScreen.h"
 
 Random *TitleScreen::random = new Random();
diff --git a/Minecraft.Client/TntRenderer.cpp b/Minecraft.Client/TntRenderer.cpp
index 3bb7484f..1fc44c4e 100644
--- a/Minecraft.Client/TntRenderer.cpp
+++ b/Minecraft.Client/TntRenderer.cpp
@@ -1,8 +1,8 @@
 #include "stdafx.h"
 #include "TntRenderer.h"
 #include "TileRenderer.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.item.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "../Minecraft.World/net.minecraft.world.entity.item.h"
+#include "../Minecraft.World/net.minecraft.world.level.tile.h"
 
 TntRenderer::TntRenderer()
 {
diff --git a/Minecraft.Client/TrackedEntity.cpp b/Minecraft.Client/TrackedEntity.cpp
index 70f25c93..49a0d49d 100644
--- a/Minecraft.Client/TrackedEntity.cpp
+++ b/Minecraft.Client/TrackedEntity.cpp
@@ -2,17 +2,17 @@
 #include "TrackedEntity.h"
 #include "ServerPlayer.h"
 #include "PlayerConnection.h"
-#include "..\Minecraft.World\Mth.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.item.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.monster.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.global.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.projectile.h"
-#include "..\Minecraft.World\net.minecraft.network.packet.h"
-#include "..\Minecraft.World\net.minecraft.world.item.h"
-#include "..\Minecraft.World\net.minecraft.world.level.saveddata.h"
+#include "../Minecraft.World/Mth.h"
+#include "../Minecraft.World/net.minecraft.world.entity.h"
+#include "../Minecraft.World/net.minecraft.world.entity.item.h"
+#include "../Minecraft.World/net.minecraft.world.entity.monster.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.global.h"
+#include "../Minecraft.World/net.minecraft.world.entity.projectile.h"
+#include "../Minecraft.World/net.minecraft.network.packet.h"
+#include "../Minecraft.World/net.minecraft.world.item.h"
+#include "../Minecraft.World/net.minecraft.world.level.saveddata.h"
 #include "MinecraftServer.h"
 #include "ServerLevel.h"
 #include "PlayerList.h"
diff --git a/Minecraft.Client/TrapScreen.cpp b/Minecraft.Client/TrapScreen.cpp
index c7eb1472..f8fa084c 100644
--- a/Minecraft.Client/TrapScreen.cpp
+++ b/Minecraft.Client/TrapScreen.cpp
@@ -2,9 +2,9 @@
 #include "TrapScreen.h"
 #include "LocalPlayer.h"
 #include "Textures.h"
-#include "..\Minecraft.World\net.minecraft.world.inventory.h"
-#include "..\Minecraft.World\DispenserTileEntity.h"
-#include "..\Minecraft.World\net.minecraft.world.h"
+#include "../Minecraft.World/net.minecraft.world.inventory.h"
+#include "../Minecraft.World/DispenserTileEntity.h"
+#include "../Minecraft.World/net.minecraft.world.h"
 
 TrapScreen::TrapScreen(shared_ptr<Inventory> inventory, shared_ptr<DispenserTileEntity> trap) : AbstractContainerScreen(new TrapMenu(inventory, trap))
 {
diff --git a/Minecraft.Client/User.cpp b/Minecraft.Client/User.cpp
index a359bfd3..98ea3a81 100644
--- a/Minecraft.Client/User.cpp
+++ b/Minecraft.Client/User.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "User.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "../Minecraft.World/net.minecraft.world.level.tile.h"
 
 vector<Tile *> User::allowedTiles;
 
diff --git a/Minecraft.Client/Vertex.h b/Minecraft.Client/Vertex.h
index c52f499f..453f1c4e 100644
--- a/Minecraft.Client/Vertex.h
+++ b/Minecraft.Client/Vertex.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "..\Minecraft.World\Vec3.h"
+#include "../Minecraft.World/Vec3.h"
 
 class Vertex
 {
diff --git a/Minecraft.Client/VideoSettingsScreen.cpp b/Minecraft.Client/VideoSettingsScreen.cpp
index 5c948cdd..bde3518d 100644
--- a/Minecraft.Client/VideoSettingsScreen.cpp
+++ b/Minecraft.Client/VideoSettingsScreen.cpp
@@ -4,7 +4,7 @@
 #include "SlideButton.h"
 #include "Options.h"
 #include "ControlsScreen.h"
-#include "..\Minecraft.World\net.minecraft.locale.h"
+#include "../Minecraft.World/net.minecraft.locale.h"
 
 VideoSettingsScreen::VideoSettingsScreen(Screen *lastScreen, Options *options)
 {
diff --git a/Minecraft.Client/ViewportCuller.cpp b/Minecraft.Client/ViewportCuller.cpp
index bc22faa6..ed019345 100644
--- a/Minecraft.Client/ViewportCuller.cpp
+++ b/Minecraft.Client/ViewportCuller.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "ViewportCuller.h"
-#include "..\Minecraft.World\Mth.h"
+#include "../Minecraft.World/Mth.h"
 
 ViewportCuller::Face::Face(double x, double y, double z, float yRot, float xRot)
 {
diff --git a/Minecraft.Client/ViewportCuller.h b/Minecraft.Client/ViewportCuller.h
index 2a975de9..86498af0 100644
--- a/Minecraft.Client/ViewportCuller.h
+++ b/Minecraft.Client/ViewportCuller.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "Culler.h"
-#include "..\Minecraft.World\mob.h"
+#include "../Minecraft.World/mob.h"
 
 class Mob;
 class ViewportCuller : public Culler
diff --git a/Minecraft.Client/VillagerGolemModel.cpp b/Minecraft.Client/VillagerGolemModel.cpp
index aaeabd53..bd1ad785 100644
--- a/Minecraft.Client/VillagerGolemModel.cpp
+++ b/Minecraft.Client/VillagerGolemModel.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
+#include "../Minecraft.World/net.minecraft.world.entity.animal.h"
 #include "ModelPart.h"
 #include "VillagerGolemModel.h"
 
diff --git a/Minecraft.Client/VillagerGolemRenderer.cpp b/Minecraft.Client/VillagerGolemRenderer.cpp
index f03cea4c..760ae2ea 100644
--- a/Minecraft.Client/VillagerGolemRenderer.cpp
+++ b/Minecraft.Client/VillagerGolemRenderer.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
-#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "../Minecraft.World/net.minecraft.world.entity.animal.h"
+#include "../Minecraft.World/net.minecraft.world.level.tile.h"
 #include "VillagerGolemModel.h"
 #include "ModelPart.h"
 #include "VillagerGolemRenderer.h"
diff --git a/Minecraft.Client/VillagerModel.cpp b/Minecraft.Client/VillagerModel.cpp
index 8885484d..d3da30f8 100644
--- a/Minecraft.Client/VillagerModel.cpp
+++ b/Minecraft.Client/VillagerModel.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "VillagerModel.h"
-#include "..\Minecraft.World\Mth.h"
+#include "../Minecraft.World/Mth.h"
 #include "ModelPart.h"
 
 
diff --git a/Minecraft.Client/VillagerRenderer.cpp b/Minecraft.Client/VillagerRenderer.cpp
index b4c88173..355ebc69 100644
--- a/Minecraft.Client/VillagerRenderer.cpp
+++ b/Minecraft.Client/VillagerRenderer.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.npc.h"
+#include "../Minecraft.World/net.minecraft.world.entity.npc.h"
 #include "VillagerModel.h"
 #include "VillagerRenderer.h"
 
diff --git a/Minecraft.Client/VillagerZombieModel.cpp b/Minecraft.Client/VillagerZombieModel.cpp
index d8338c89..7a06d94a 100644
--- a/Minecraft.Client/VillagerZombieModel.cpp
+++ b/Minecraft.Client/VillagerZombieModel.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "ModelPart.h"
 #include "VillagerZombieModel.h"
-#include "..\Minecraft.World\Mth.h"
+#include "../Minecraft.World/Mth.h"
 
 void VillagerZombieModel::_init(float g, float yOffset, bool isArmor)
 {
diff --git a/Minecraft.Client/WaterDropParticle.cpp b/Minecraft.Client/WaterDropParticle.cpp
index 90035243..1c432e5e 100644
--- a/Minecraft.Client/WaterDropParticle.cpp
+++ b/Minecraft.Client/WaterDropParticle.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "WaterDropParticle.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\net.minecraft.world.level.tile.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/net.minecraft.world.level.tile.h"
 
 WaterDropParticle::WaterDropParticle(Level *level, double x, double y, double z) : Particle(level, x, y, z, 0, 0, 0)
 {
diff --git a/Minecraft.Client/Windows64/Leaderboards/WindowsLeaderboardManager.h b/Minecraft.Client/Windows64/Leaderboards/WindowsLeaderboardManager.h
index 4141e3f9..a66bc9cc 100644
--- a/Minecraft.Client/Windows64/Leaderboards/WindowsLeaderboardManager.h
+++ b/Minecraft.Client/Windows64/Leaderboards/WindowsLeaderboardManager.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Common\Leaderboards\LeaderboardManager.h"
+#include "Common/Leaderboards/LeaderboardManager.h"
 
 class WindowsLeaderboardManager : public LeaderboardManager
 {
diff --git a/Minecraft.Client/Windows64/Windows64_Minecraft.cpp b/Minecraft.Client/Windows64/Windows64_Minecraft.cpp
index d2251e4e..85d5321e 100644
--- a/Minecraft.Client/Windows64/Windows64_Minecraft.cpp
+++ b/Minecraft.Client/Windows64/Windows64_Minecraft.cpp
@@ -4,38 +4,38 @@
 #include "stdafx.h"
 
 #include <assert.h>
-#include "GameConfig\Minecraft.spa.h"
-#include "..\MinecraftServer.h"
-#include "..\LocalPlayer.h"
-#include "..\..\Minecraft.World\ItemInstance.h"
-#include "..\..\Minecraft.World\MapItem.h"
-#include "..\..\Minecraft.World\Recipes.h"
-#include "..\..\Minecraft.World\Recipy.h"
-#include "..\..\Minecraft.World\Language.h"
-#include "..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\Minecraft.World\AABB.h"
-#include "..\..\Minecraft.World\Vec3.h"
-#include "..\..\Minecraft.World\Level.h"
-#include "..\..\Minecraft.World\net.minecraft.world.level.tile.h"
+#include "GameConfig/Minecraft.spa.h"
+#include "../MinecraftServer.h"
+#include "../LocalPlayer.h"
+#include "../../Minecraft.World/ItemInstance.h"
+#include "../../Minecraft.World/MapItem.h"
+#include "../../Minecraft.World/Recipes.h"
+#include "../../Minecraft.World/Recipy.h"
+#include "../../Minecraft.World/Language.h"
+#include "../../Minecraft.World/StringHelpers.h"
+#include "../../Minecraft.World/AABB.h"
+#include "../../Minecraft.World/Vec3.h"
+#include "../../Minecraft.World/Level.h"
+#include "../../Minecraft.World/net.minecraft.world.level.tile.h"
 
-#include "..\ClientConnection.h"
-#include "..\User.h"
-#include "..\..\Minecraft.World\Socket.h"
-#include "..\..\Minecraft.World\ThreadName.h"
-#include "..\..\Minecraft.Client\StatsCounter.h"
-#include "..\ConnectScreen.h"
-//#include "Social\SocialManager.h"
-//#include "Leaderboards\LeaderboardManager.h"
-//#include "XUI\XUI_Scene_Container.h"
+#include "../ClientConnection.h"
+#include "../User.h"
+#include "../../Minecraft.World/Socket.h"
+#include "../../Minecraft.World/ThreadName.h"
+#include "../../Minecraft.Client/StatsCounter.h"
+#include "../ConnectScreen.h"
+//#include "Social/SocialManager.h"
+//#include "Leaderboards/LeaderboardManager.h"
+//#include "XUI/XUI_Scene_Container.h"
 //#include "NetworkManager.h"
-#include "..\..\Minecraft.Client\Tesselator.h"
-#include "..\..\Minecraft.Client\Options.h"
-#include "Sentient\SentientManager.h"
-#include "..\..\Minecraft.World\IntCache.h"
-#include "..\Textures.h"
+#include "../../Minecraft.Client/Tesselator.h"
+#include "../../Minecraft.Client/Options.h"
+#include "Sentient/SentientManager.h"
+#include "../../Minecraft.World/IntCache.h"
+#include "../Textures.h"
 #include "Resource.h"
-#include "..\..\Minecraft.World\compression.h"
-#include "..\..\Minecraft.World\OldChunkStorage.h"
+#include "../../Minecraft.World/compression.h"
+#include "../../Minecraft.World/OldChunkStorage.h"
 
 #include "Xbox/resource.h"
 
diff --git a/Minecraft.Client/Windows64/Windows64_UIController.cpp b/Minecraft.Client/Windows64/Windows64_UIController.cpp
index f4e9a9fc..86a5ac79 100644
--- a/Minecraft.Client/Windows64/Windows64_UIController.cpp
+++ b/Minecraft.Client/Windows64/Windows64_UIController.cpp
@@ -2,8 +2,8 @@
 #include "Windows64_UIController.h"
 
 // Temp
-#include "..\Minecraft.h"
-#include "..\Textures.h"
+#include "../Minecraft.h"
+#include "../Textures.h"
 
 #define _ENABLEIGGY
 
diff --git a/Minecraft.Client/Windows64/Windows64_UIController.h b/Minecraft.Client/Windows64/Windows64_UIController.h
index 2b2ccdba..cab14ce8 100644
--- a/Minecraft.Client/Windows64/Windows64_UIController.h
+++ b/Minecraft.Client/Windows64/Windows64_UIController.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "..\Common\UI\UIController.h"
+#include "../Common/UI/UIController.h"
 
 class ConsoleUIController : public UIController
 {
diff --git a/Minecraft.Client/WolfModel.cpp b/Minecraft.Client/WolfModel.cpp
index f4835ec3..d70ab66f 100644
--- a/Minecraft.Client/WolfModel.cpp
+++ b/Minecraft.Client/WolfModel.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "WolfModel.h"
-#include "..\Minecraft.World\Wolf.h"
-#include "..\Minecraft.World\Mth.h"
+#include "../Minecraft.World/Wolf.h"
+#include "../Minecraft.World/Mth.h"
 #include "ModelPart.h"
 
 WolfModel::WolfModel()
diff --git a/Minecraft.Client/WolfModel.h b/Minecraft.Client/WolfModel.h
index ab26a9e8..7375206c 100644
--- a/Minecraft.Client/WolfModel.h
+++ b/Minecraft.Client/WolfModel.h
@@ -1,6 +1,6 @@
 #pragma once
 #include "Model.h"
-#include "..\Minecraft.World\Mob.h"
+#include "../Minecraft.World/Mob.h"
 
 class WolfModel : public Model
 {
diff --git a/Minecraft.Client/WolfRenderer.cpp b/Minecraft.Client/WolfRenderer.cpp
index a21affa2..b77ee36a 100644
--- a/Minecraft.Client/WolfRenderer.cpp
+++ b/Minecraft.Client/WolfRenderer.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "WolfRenderer.h"
 #include "MultiPlayerLocalPlayer.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
+#include "../Minecraft.World/net.minecraft.world.entity.animal.h"
 
 WolfRenderer::WolfRenderer(Model *model, Model *armor, float shadow) : MobRenderer(model, shadow)
 {
diff --git a/Minecraft.Client/Xbox/Audio/SoundEngine.cpp b/Minecraft.Client/Xbox/Audio/SoundEngine.cpp
index b088150c..9d431fb5 100644
--- a/Minecraft.Client/Xbox/Audio/SoundEngine.cpp
+++ b/Minecraft.Client/Xbox/Audio/SoundEngine.cpp
@@ -1,15 +1,15 @@
 #include "stdafx.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.entity.h"
-#include "..\..\..\Minecraft.World\Mth.h"
-#include "..\..\..\Minecraft.World\Random.h"
-#include "..\..\..\Minecraft.World\LevelData.h"
-#include "..\..\Minecraft.h"
-#include "..\..\MultiplayerLocalPlayer.h"
+#include "../../../Minecraft.World/net.minecraft.world.entity.h"
+#include "../../../Minecraft.World/Mth.h"
+#include "../../../Minecraft.World/Random.h"
+#include "../../../Minecraft.World/LevelData.h"
+#include "../../Minecraft.h"
+#include "../../MultiplayerLocalPlayer.h"
 #include "SoundEngine.h"
-#include "..\..\TexturePackRepository.h"
-#include "..\..\TexturePack.h"
-#include "..\..\Common\DLC\DLCAudioFile.h"
-#include "..\..\DLCTexturePack.h"
+#include "../../TexturePackRepository.h"
+#include "../../TexturePack.h"
+#include "../../Common/DLC/DLCAudioFile.h"
+#include "../../DLCTexturePack.h"
 
 
 IXAudio2* g_pXAudio2 = NULL;       // pointer to XAudio2 instance used by QNet and XACT
diff --git a/Minecraft.Client/Xbox/Audio/SoundEngine.h b/Minecraft.Client/Xbox/Audio/SoundEngine.h
index e2f22869..b1c78274 100644
--- a/Minecraft.Client/Xbox/Audio/SoundEngine.h
+++ b/Minecraft.Client/Xbox/Audio/SoundEngine.h
@@ -2,7 +2,7 @@
 class Mob;
 class Options;
 using namespace std;
-#include "..\..\..\Minecraft.World\SoundTypes.h"
+#include "../../../Minecraft.World/SoundTypes.h"
 
 #ifdef _XBOX
 extern IXAudio2* g_pXAudio2;       // pointer to XAudio2 instance used by QNet and XACT
diff --git a/Minecraft.Client/Xbox/Font/XUI_Font.cpp b/Minecraft.Client/Xbox/Font/XUI_Font.cpp
index 8b1a624b..247b6d3e 100644
--- a/Minecraft.Client/Xbox/Font/XUI_Font.cpp
+++ b/Minecraft.Client/Xbox/Font/XUI_Font.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "..\..\Tesselator.h"
+#include "../../Tesselator.h"
 #include "XUI_FontData.h"
 #include "XUI_Font.h"
 
diff --git a/Minecraft.Client/Xbox/Font/XUI_FontData.cpp b/Minecraft.Client/Xbox/Font/XUI_FontData.cpp
index 7a70cdfb..975c0b6d 100644
--- a/Minecraft.Client/Xbox/Font/XUI_FontData.cpp
+++ b/Minecraft.Client/Xbox/Font/XUI_FontData.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
-#include "..\..\stubs.h"
-#include "..\..\Minecraft.h"
-#include "..\..\Textures.h"
+#include "../../stubs.h"
+#include "../../Minecraft.h"
+#include "../../Textures.h"
 #include "XUI_FontData.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "../../../Minecraft.World/StringHelpers.h"
 
 
 #define USE_NEW 0
diff --git a/Minecraft.Client/Xbox/Font/XUI_FontData.h b/Minecraft.Client/Xbox/Font/XUI_FontData.h
index af18c7a6..fc2ac6cc 100644
--- a/Minecraft.Client/Xbox/Font/XUI_FontData.h
+++ b/Minecraft.Client/Xbox/Font/XUI_FontData.h
@@ -2,7 +2,7 @@
 using namespace std;
 #include <xuirender.h>
 
-#include "..\..\Common\UI\UIFontData.h"
+#include "../../Common/UI/UIFontData.h"
 
 // 4J This class is partially based of the ATG font implementation
 //--------------------------------------------------------------------------------------
diff --git a/Minecraft.Client/Xbox/Font/XUI_FontRenderer.cpp b/Minecraft.Client/Xbox/Font/XUI_FontRenderer.cpp
index 48581905..269d2bd6 100644
--- a/Minecraft.Client/Xbox/Font/XUI_FontRenderer.cpp
+++ b/Minecraft.Client/Xbox/Font/XUI_FontRenderer.cpp
@@ -2,7 +2,7 @@
 #include "XUI_FontRenderer.h"
 #include "XUI_Font.h"
 #include "XUI_FontData.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "../../../Minecraft.World/StringHelpers.h"
 
 extern IDirect3DDevice9 *g_pD3DDevice;
 extern void GetRenderAndSamplerStates(IDirect3DDevice9 *pDevice,DWORD *RenderStateA,DWORD *SamplerStateA);
diff --git a/Minecraft.Client/Xbox/Leaderboards/XboxLeaderboardManager.cpp b/Minecraft.Client/Xbox/Leaderboards/XboxLeaderboardManager.cpp
index efa8a3da..1f139598 100644
--- a/Minecraft.Client/Xbox/Leaderboards/XboxLeaderboardManager.cpp
+++ b/Minecraft.Client/Xbox/Leaderboards/XboxLeaderboardManager.cpp
@@ -2,7 +2,7 @@
 
 #include "XboxLeaderboardManager.h"
 
-#include "..\Network\NetworkPlayerXbox.h"
+#include "../Network/NetworkPlayerXbox.h"
 
 #ifdef _XBOX
 LeaderboardManager *LeaderboardManager::m_instance = new XboxLeaderboardManager(); //Singleton instance of the LeaderboardManager
diff --git a/Minecraft.Client/Xbox/Leaderboards/XboxLeaderboardManager.h b/Minecraft.Client/Xbox/Leaderboards/XboxLeaderboardManager.h
index c9990901..32b1e847 100644
--- a/Minecraft.Client/Xbox/Leaderboards/XboxLeaderboardManager.h
+++ b/Minecraft.Client/Xbox/Leaderboards/XboxLeaderboardManager.h
@@ -3,7 +3,7 @@
 #include <xuiresource.h>
 #include <xuiapp.h>
 
-#include "..\..\Common\Leaderboards\LeaderboardManager.h"
+#include "../../Common/Leaderboards/LeaderboardManager.h"
 
 class XboxLeaderboardManager : public LeaderboardManager
 {
diff --git a/Minecraft.Client/Xbox/MinecraftWindows.rc b/Minecraft.Client/Xbox/MinecraftWindows.rc
index 69ce5334..774ea86c 100644
Binary files a/Minecraft.Client/Xbox/MinecraftWindows.rc and b/Minecraft.Client/Xbox/MinecraftWindows.rc differ
diff --git a/Minecraft.Client/Xbox/Network/NetworkPlayerXbox.h b/Minecraft.Client/Xbox/Network/NetworkPlayerXbox.h
index 1822717c..7614db6f 100644
--- a/Minecraft.Client/Xbox/Network/NetworkPlayerXbox.h
+++ b/Minecraft.Client/Xbox/Network/NetworkPlayerXbox.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "..\..\Common\Network\NetworkPlayerInterface.h"
+#include "../../Common/Network/NetworkPlayerInterface.h"
 
 // This is an implementation of the INetworkPlayer interface, for Xbox 360. It effectively wraps the IQNetPlayer class in a non-platform-specific way. It is
 // managed by PlatformNetworkManagerXbox.
diff --git a/Minecraft.Client/Xbox/Network/PlatformNetworkManagerXbox.cpp b/Minecraft.Client/Xbox/Network/PlatformNetworkManagerXbox.cpp
index a551725b..22db1853 100644
--- a/Minecraft.Client/Xbox/Network/PlatformNetworkManagerXbox.cpp
+++ b/Minecraft.Client/Xbox/Network/PlatformNetworkManagerXbox.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
-#include "..\..\..\Minecraft.World\Socket.h"
-#include "..\..\..\Minecraft.World\StringHelpers.h"
+#include "../../../Minecraft.World/Socket.h"
+#include "../../../Minecraft.World/StringHelpers.h"
 #include "PlatformNetworkManagerXbox.h"
 #include "NetworkPlayerXbox.h"
-#include "..\..\Common\Network\GameNetworkManager.h"
+#include "../../Common/Network/GameNetworkManager.h"
 
 CPlatformNetworkManagerXbox *g_pPlatformNetworkManager;
 
diff --git a/Minecraft.Client/Xbox/Network/PlatformNetworkManagerXbox.h b/Minecraft.Client/Xbox/Network/PlatformNetworkManagerXbox.h
index 7c6112b4..df632802 100644
--- a/Minecraft.Client/Xbox/Network/PlatformNetworkManagerXbox.h
+++ b/Minecraft.Client/Xbox/Network/PlatformNetworkManagerXbox.h
@@ -2,10 +2,10 @@
 using namespace std;
 #include <vector>
 #include <qnet.h>
-#include "..\..\..\Minecraft.World\C4JThread.h"
-#include "..\..\Common\Network\NetworkPlayerInterface.h"
-#include "..\..\Common\Network\PlatformNetworkManagerInterface.h"
-#include "..\..\Common\Network\SessionInfo.h"
+#include "../../../Minecraft.World/C4JThread.h"
+#include "../../Common/Network/NetworkPlayerInterface.h"
+#include "../../Common/Network/PlatformNetworkManagerInterface.h"
+#include "../../Common/Network/SessionInfo.h"
 
 // This is how often we allow a search for new games
 #define MINECRAFT_XSESSION_SEARCH_DELAY_MILLISECONDS 30000
diff --git a/Minecraft.Client/Xbox/Sentient/DynamicConfigurations.cpp b/Minecraft.Client/Xbox/Sentient/DynamicConfigurations.cpp
index 5d2b9763..b5c4a42e 100644
--- a/Minecraft.Client/Xbox/Sentient/DynamicConfigurations.cpp
+++ b/Minecraft.Client/Xbox/Sentient/DynamicConfigurations.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
-#include "Include\SenClientMain.h"
-#include "Include\SenClientDynamicConfig.h"
+#include "Include/SenClientMain.h"
+#include "Include/SenClientDynamicConfig.h"
 #include "DynamicConfigurations.h"
 
 
diff --git a/Minecraft.Client/Xbox/Sentient/SentientManager.cpp b/Minecraft.Client/Xbox/Sentient/SentientManager.cpp
index aade06bc..88a2f42c 100644
--- a/Minecraft.Client/Xbox/Sentient/SentientManager.cpp
+++ b/Minecraft.Client/Xbox/Sentient/SentientManager.cpp
@@ -1,14 +1,14 @@
 #include "stdafx.h"
-#include "Include\SenClientCore.h"
-#include "Include\SenClientMain.h"
-#include "Include\SenClientMain.h"
+#include "Include/SenClientCore.h"
+#include "Include/SenClientMain.h"
+#include "Include/SenClientMain.h"
 
-#include "..\GameConfig\Minecraft.spa.h"
-#include "..\..\Minecraft.h"
-#include "..\..\MultiplayerLocalPlayer.h"
-#include "..\..\..\Minecraft.World\Dimension.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\..\..\Minecraft.World\net.minecraft.world.level.storage.h"
+#include "../GameConfig/Minecraft.spa.h"
+#include "../../Minecraft.h"
+#include "../../MultiplayerLocalPlayer.h"
+#include "../../../Minecraft.World/Dimension.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.h"
+#include "../../../Minecraft.World/net.minecraft.world.level.storage.h"
 
 #include "SentientManager.h"
 #include "MinecraftTelemetry.h"
@@ -517,7 +517,7 @@ INT CSentientManager::GetAudioSettings(DWORD dwUserId)
 /*
 Refers to the highest level performance metric for your game.
 For example, a performance metric could points earned, race time, total kills, etc.
-This is entirely up to you and will help us understand how well the player performed, or how far the player progressed  in the level before exiting.
+This is entirely up to you and will help us understand how well the player performed, or how far the player progressed  in the level before exiting.
 How far did users progress before failing/exiting the level?
 */
 INT CSentientManager::GetLevelExitProgressStat1()
@@ -529,7 +529,7 @@ INT CSentientManager::GetLevelExitProgressStat1()
 /*
 Refers to the highest level performance metric for your game.
 For example, a performance metric could points earned, race time, total kills, etc.
-This is entirely up to you and will help us understand how well the player performed, or how far the player progressed  in the level before exiting.
+This is entirely up to you and will help us understand how well the player performed, or how far the player progressed  in the level before exiting.
 How far did users progress before failing/exiting the level?
 */
 INT CSentientManager::GetLevelExitProgressStat2()
diff --git a/Minecraft.Client/Xbox/Social/SocialManager.cpp b/Minecraft.Client/Xbox/Social/SocialManager.cpp
index b7a108bc..a070f8d4 100644
--- a/Minecraft.Client/Xbox/Social/SocialManager.cpp
+++ b/Minecraft.Client/Xbox/Social/SocialManager.cpp
@@ -9,7 +9,7 @@
 #include "SocialManager.h"
 #include <assert.h>
 #include <xgraphics.h>
-#include "..\Sentient\SentientManager.h"
+#include "../Sentient/SentientManager.h"
 
 ///////////////////////////////////////////////////////////////////////////
 // Constants.
diff --git a/Minecraft.Client/Xbox/Xbox_App.cpp b/Minecraft.Client/Xbox/Xbox_App.cpp
index b252035e..3f033046 100644
--- a/Minecraft.Client/Xbox/Xbox_App.cpp
+++ b/Minecraft.Client/Xbox/Xbox_App.cpp
@@ -1,175 +1,175 @@
 #include "stdafx.h"
 
-#include "..\Common\UI\UIStructs.h"
+#include "../Common/UI/UIStructs.h"
 
-#include "..\Common\XUI\XUI_Intro.h"
-#include "..\Common\XUI\XUI_MainMenu.h"
-#include "..\Common\XUI\XUI_NewUpdateMessage.h"
-#include "..\Common\XUI\XUI_HelpAndOptions.h"
-#include "..\Common\XUI\XUI_TextEntry.h"
-#include "..\Common\XUI\XUI_HelpHowToPlay.h"	
-#include "..\Common\XUI\XUI_HowToPlayMenu.h"
-#include "..\Common\XUI\XUI_HelpControls.h"
-#include "..\Common\XUI\XUI_TextEntry.h"
-#include "..\Common\XUI\XUI_LoadSettings.h"
-#include "..\Common\XUI\XUI_SettingsAll.h"
-#include "..\Common\XUI\XUI_SettingsOptions.h"
-#include "..\Common\XUI\XUI_SettingsAudio.h"
-#include "..\Common\XUI\XUI_SettingsControl.h"
-#include "..\Common\XUI\XUI_SettingsGraphics.h"
-#include "..\Common\XUI\XUI_SettingsUI.h"
-#include "..\Common\XUI\XUI_Leaderboards.h"
-#include "..\Common\XUI\XUI_Debug.h"
-#include "..\Common\XUI\XUI_DebugTips.h"
-#include "..\Common\XUI\XUI_Reinstall.h"
-#include "..\Common\XUI\XUI_Death.h"
-#include "..\Common\XUI\XUI_DebugOverlay.h"
-#include "..\Common\XUI\XUI_DLCOffers.h"
-#include "..\Common\XUI\XUI_SocialPost.h"
-#include "..\Common\XUI\XUI_Scene_Container.h"
-#include "..\Common\XUI\XUI_Scene_Furnace.h"
-#include "..\Common\XUI\XUI_Scene_Inventory.h"
-#include "..\Common\XUI\XUI_Scene_Trap.h"
-#include "..\Common\XUI\XUI_Control_ComboBox.h"
-#include "..\Common\XUI\XUI_MultiGameInfo.h"
-#include "..\Common\XUI\XUI_MultiGameJoinLoad.h"
-#include "..\Common\XUI\XUI_MultiGameCreate.h"
-#include "..\Common\XUI\XUI_MultiGameLaunchMoreOptions.h"
-#include "..\Common\XUI\XUI_SignEntry.h"
-#include "..\Common\XUI\XUI_InGameInfo.h"
-#include "..\Common\XUI\XUI_TrialExitUpsell.h"
-#include "..\Common\XUI\XUI_BasePlayer.h"
-#include "..\Common\XUI\XUI_PartnernetPassword.h"
-#include "..\Common\XUI\XUI_SaveMessage.h"
-#include "..\Common\XUI\XUI_Chat.h"
-#include "..\Common\XUI\XUI_SkinSelect.h"
-#include "..\Common\XUI\XUI_InGameHostOptions.h"
-#include "..\Common\XUI\XUI_InGamePlayerOptions.h"
-#include "..\Common\XUI\XUI_Scene_Enchant.h"
-#include "..\Common\XUI\XUI_Scene_BrewingStand.h"
-#include "..\Common\XUI\XUI_XZP_Icons.h"
-#include "..\Common\XUI\XUI_Controls.h"
-#include "..\Common\XUI\XUI_Scene_Win.h"
-#include "..\Common\XUI\XUI_HUD.h"
-#include "..\Common\XUI\XUI_DebugSetCamera.h"
-//#include "..\Common\XUI\XUI_TransferToXboxOne.h"
+#include "../Common/XUI/XUI_Intro.h"
+#include "../Common/XUI/XUI_MainMenu.h"
+#include "../Common/XUI/XUI_NewUpdateMessage.h"
+#include "../Common/XUI/XUI_HelpAndOptions.h"
+#include "../Common/XUI/XUI_TextEntry.h"
+#include "../Common/XUI/XUI_HelpHowToPlay.h"	
+#include "../Common/XUI/XUI_HowToPlayMenu.h"
+#include "../Common/XUI/XUI_HelpControls.h"
+#include "../Common/XUI/XUI_TextEntry.h"
+#include "../Common/XUI/XUI_LoadSettings.h"
+#include "../Common/XUI/XUI_SettingsAll.h"
+#include "../Common/XUI/XUI_SettingsOptions.h"
+#include "../Common/XUI/XUI_SettingsAudio.h"
+#include "../Common/XUI/XUI_SettingsControl.h"
+#include "../Common/XUI/XUI_SettingsGraphics.h"
+#include "../Common/XUI/XUI_SettingsUI.h"
+#include "../Common/XUI/XUI_Leaderboards.h"
+#include "../Common/XUI/XUI_Debug.h"
+#include "../Common/XUI/XUI_DebugTips.h"
+#include "../Common/XUI/XUI_Reinstall.h"
+#include "../Common/XUI/XUI_Death.h"
+#include "../Common/XUI/XUI_DebugOverlay.h"
+#include "../Common/XUI/XUI_DLCOffers.h"
+#include "../Common/XUI/XUI_SocialPost.h"
+#include "../Common/XUI/XUI_Scene_Container.h"
+#include "../Common/XUI/XUI_Scene_Furnace.h"
+#include "../Common/XUI/XUI_Scene_Inventory.h"
+#include "../Common/XUI/XUI_Scene_Trap.h"
+#include "../Common/XUI/XUI_Control_ComboBox.h"
+#include "../Common/XUI/XUI_MultiGameInfo.h"
+#include "../Common/XUI/XUI_MultiGameJoinLoad.h"
+#include "../Common/XUI/XUI_MultiGameCreate.h"
+#include "../Common/XUI/XUI_MultiGameLaunchMoreOptions.h"
+#include "../Common/XUI/XUI_SignEntry.h"
+#include "../Common/XUI/XUI_InGameInfo.h"
+#include "../Common/XUI/XUI_TrialExitUpsell.h"
+#include "../Common/XUI/XUI_BasePlayer.h"
+#include "../Common/XUI/XUI_PartnernetPassword.h"
+#include "../Common/XUI/XUI_SaveMessage.h"
+#include "../Common/XUI/XUI_Chat.h"
+#include "../Common/XUI/XUI_SkinSelect.h"
+#include "../Common/XUI/XUI_InGameHostOptions.h"
+#include "../Common/XUI/XUI_InGamePlayerOptions.h"
+#include "../Common/XUI/XUI_Scene_Enchant.h"
+#include "../Common/XUI/XUI_Scene_BrewingStand.h"
+#include "../Common/XUI/XUI_XZP_Icons.h"
+#include "../Common/XUI/XUI_Controls.h"
+#include "../Common/XUI/XUI_Scene_Win.h"
+#include "../Common/XUI/XUI_HUD.h"
+#include "../Common/XUI/XUI_DebugSetCamera.h"
+//#include "../Common/XUI/XUI_TransferToXboxOne.h"
 
 #ifdef _DEBUG_MENUS_ENABLED
-#include "..\Common\XUI\XUI_DebugItemEditor.h"
+#include "../Common/XUI/XUI_DebugItemEditor.h"
 #endif
 #ifndef _CONTENT_PACKAGE
-#include "..\Common\XUI\XUI_DebugSchematicCreator.h"
+#include "../Common/XUI/XUI_DebugSchematicCreator.h"
 #endif
 
-#include "..\..\Minecraft.World\Recipy.h"
-#include "GameConfig\Minecraft.spa.h"
-#include "..\..\Minecraft.Client\Options.h"
-#include "..\..\Minecraft.World\AABB.h"
-#include "..\..\Minecraft.World\Vec3.h"
-#include "..\MinecraftServer.h"
-#include "..\GameRenderer.h"
-#include "..\ProgressRenderer.h"
-#include "..\..\Minecraft.Client\LevelRenderer.h"
-#include "..\..\Minecraft.Client\MobSkinMemTextureProcessor.h"
+#include "../../Minecraft.World/Recipy.h"
+#include "GameConfig/Minecraft.spa.h"
+#include "../../Minecraft.Client/Options.h"
+#include "../../Minecraft.World/AABB.h"
+#include "../../Minecraft.World/Vec3.h"
+#include "../MinecraftServer.h"
+#include "../GameRenderer.h"
+#include "../ProgressRenderer.h"
+#include "../../Minecraft.Client/LevelRenderer.h"
+#include "../../Minecraft.Client/MobSkinMemTextureProcessor.h"
 
-#include "..\..\Minecraft.Client\Minecraft.h"
+#include "../../Minecraft.Client/Minecraft.h"
 
-#include "..\ClientConnection.h"
-#include "..\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 "..\GameMode.h"
-#include "Social\SocialManager.h"
+#include "../ClientConnection.h"
+#include "../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 "../GameMode.h"
+#include "Social/SocialManager.h"
 #include <xgraphics.h>
-#include "..\Common\Tutorial\TutorialMode.h"
-#include "..\..\Minecraft.Client\Xbox\XML\ATGXmlParser.h"
-#include "..\..\Minecraft.Client\Xbox\XML\xmlFilesCallback.h"
-#include "4JLibs\inc\4J_Input.h"
-#include "Font\XUI_FontRenderer.h"
-#include "..\Common\Minecraft_Macros.h"
-#include "..\..\Minecraft.Client\PlayerList.h"
-#include "..\..\Minecraft.Client\ServerPlayer.h"
-#include "..\Common\GameRules\ConsoleGameRules.h"
-#include "..\Common\GameRules\ConsoleSchematicFile.h"
-#include "..\..\Minecraft.World\InputOutputStream.h"
-#include "..\..\Minecraft.World\LevelSettings.h"
-#include "..\User.h"
+#include "../Common/Tutorial/TutorialMode.h"
+#include "../../Minecraft.Client/Xbox/XML/ATGXmlParser.h"
+#include "../../Minecraft.Client/Xbox/XML/xmlFilesCallback.h"
+#include "4JLibs/inc/4J_Input.h"
+#include "Font/XUI_FontRenderer.h"
+#include "../Common/Minecraft_Macros.h"
+#include "../../Minecraft.Client/PlayerList.h"
+#include "../../Minecraft.Client/ServerPlayer.h"
+#include "../Common/GameRules/ConsoleGameRules.h"
+#include "../Common/GameRules/ConsoleSchematicFile.h"
+#include "../../Minecraft.World/InputOutputStream.h"
+#include "../../Minecraft.World/LevelSettings.h"
+#include "../User.h"
 
-#include "Sentient\SentientManager.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 "..\TexturePackRepository.h"
-#include "..\TexturePack.h"
-#include "..\Common\DLC\DLCAudioFile.h"
-#include "..\DLCTexturePack.h"
+#include "Sentient/SentientManager.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 "../TexturePackRepository.h"
+#include "../TexturePack.h"
+#include "../Common/DLC/DLCAudioFile.h"
+#include "../DLCTexturePack.h"
 
-#include "..\Common\XUI\XUI_Intro.h"
-#include "..\Common\XUI\XUI_MainMenu.h"
-#include "..\Common\XUI\XUI_NewUpdateMessage.h"
-#include "..\Common\XUI\XUI_HelpAndOptions.h"
-#include "..\Common\XUI\XUI_TextEntry.h"
-#include "..\Common\XUI\XUI_HelpHowToPlay.h"	
-#include "..\Common\XUI\XUI_HowToPlayMenu.h"
-#include "..\Common\XUI\XUI_HelpControls.h"
-#include "..\Common\XUI\XUI_TextEntry.h"
-#include "..\Common\XUI\XUI_LoadSettings.h"
-#include "..\Common\XUI\XUI_SettingsAll.h"
-#include "..\Common\XUI\XUI_SettingsOptions.h"
-#include "..\Common\XUI\XUI_SettingsAudio.h"
-#include "..\Common\XUI\XUI_SettingsControl.h"
-#include "..\Common\XUI\XUI_SettingsGraphics.h"
-#include "..\Common\XUI\XUI_SettingsUI.h"
-#include "..\Common\XUI\XUI_Leaderboards.h"
-#include "..\Common\XUI\XUI_Debug.h"
-#include "..\Common\XUI\XUI_DebugTips.h"
-#include "..\Common\XUI\XUI_Reinstall.h"
-#include "..\Common\XUI\XUI_Death.h"
-#include "..\Common\XUI\XUI_DebugOverlay.h"
-#include "..\Common\XUI\XUI_DLCOffers.h"
-#include "..\Common\XUI\XUI_SocialPost.h"
-#include "..\Common\XUI\XUI_Scene_Container.h"
-#include "..\Common\XUI\XUI_Scene_Furnace.h"
-#include "..\Common\XUI\XUI_Scene_Inventory.h"
-#include "..\Common\XUI\XUI_Scene_Trap.h"
-#include "..\Common\XUI\XUI_Control_ComboBox.h"
-#include "..\Common\XUI\XUI_MultiGameInfo.h"
-#include "..\Common\XUI\XUI_MultiGameJoinLoad.h"
-#include "..\Common\XUI\XUI_MultiGameCreate.h"
-#include "..\Common\XUI\XUI_MultiGameLaunchMoreOptions.h"
-#include "..\Common\XUI\XUI_SignEntry.h"
-#include "..\Common\XUI\XUI_InGameInfo.h"
-#include "..\Common\XUI\XUI_TrialExitUpsell.h"
-#include "..\Common\XUI\XUI_BasePlayer.h"
-#include "..\Common\XUI\XUI_PartnernetPassword.h"
-#include "..\Common\XUI\XUI_SaveMessage.h"
-#include "..\Common\XUI\XUI_Chat.h"
-#include "..\Common\XUI\XUI_SkinSelect.h"
-#include "..\Common\XUI\XUI_InGameHostOptions.h"
-#include "..\Common\XUI\XUI_InGamePlayerOptions.h"
-#include "..\Common\XUI\XUI_Scene_Enchant.h"
-#include "..\Common\XUI\XUI_Scene_BrewingStand.h"
-#include "..\Common\XUI\XUI_XZP_Icons.h"
-#include "..\Common\XUI\XUI_Controls.h"
-#include "..\Common\XUI\XUI_Scene_Win.h"
-#include "..\Common\XUI\XUI_HUD.h"
-#include "..\Common\XUI\XUI_Scene_Anvil.h"
-#include "..\Common\XUI\XUI_Scene_Trading.h"
-#include "..\Common\XUI\XUI_Teleport.h"
+#include "../Common/XUI/XUI_Intro.h"
+#include "../Common/XUI/XUI_MainMenu.h"
+#include "../Common/XUI/XUI_NewUpdateMessage.h"
+#include "../Common/XUI/XUI_HelpAndOptions.h"
+#include "../Common/XUI/XUI_TextEntry.h"
+#include "../Common/XUI/XUI_HelpHowToPlay.h"	
+#include "../Common/XUI/XUI_HowToPlayMenu.h"
+#include "../Common/XUI/XUI_HelpControls.h"
+#include "../Common/XUI/XUI_TextEntry.h"
+#include "../Common/XUI/XUI_LoadSettings.h"
+#include "../Common/XUI/XUI_SettingsAll.h"
+#include "../Common/XUI/XUI_SettingsOptions.h"
+#include "../Common/XUI/XUI_SettingsAudio.h"
+#include "../Common/XUI/XUI_SettingsControl.h"
+#include "../Common/XUI/XUI_SettingsGraphics.h"
+#include "../Common/XUI/XUI_SettingsUI.h"
+#include "../Common/XUI/XUI_Leaderboards.h"
+#include "../Common/XUI/XUI_Debug.h"
+#include "../Common/XUI/XUI_DebugTips.h"
+#include "../Common/XUI/XUI_Reinstall.h"
+#include "../Common/XUI/XUI_Death.h"
+#include "../Common/XUI/XUI_DebugOverlay.h"
+#include "../Common/XUI/XUI_DLCOffers.h"
+#include "../Common/XUI/XUI_SocialPost.h"
+#include "../Common/XUI/XUI_Scene_Container.h"
+#include "../Common/XUI/XUI_Scene_Furnace.h"
+#include "../Common/XUI/XUI_Scene_Inventory.h"
+#include "../Common/XUI/XUI_Scene_Trap.h"
+#include "../Common/XUI/XUI_Control_ComboBox.h"
+#include "../Common/XUI/XUI_MultiGameInfo.h"
+#include "../Common/XUI/XUI_MultiGameJoinLoad.h"
+#include "../Common/XUI/XUI_MultiGameCreate.h"
+#include "../Common/XUI/XUI_MultiGameLaunchMoreOptions.h"
+#include "../Common/XUI/XUI_SignEntry.h"
+#include "../Common/XUI/XUI_InGameInfo.h"
+#include "../Common/XUI/XUI_TrialExitUpsell.h"
+#include "../Common/XUI/XUI_BasePlayer.h"
+#include "../Common/XUI/XUI_PartnernetPassword.h"
+#include "../Common/XUI/XUI_SaveMessage.h"
+#include "../Common/XUI/XUI_Chat.h"
+#include "../Common/XUI/XUI_SkinSelect.h"
+#include "../Common/XUI/XUI_InGameHostOptions.h"
+#include "../Common/XUI/XUI_InGamePlayerOptions.h"
+#include "../Common/XUI/XUI_Scene_Enchant.h"
+#include "../Common/XUI/XUI_Scene_BrewingStand.h"
+#include "../Common/XUI/XUI_XZP_Icons.h"
+#include "../Common/XUI/XUI_Controls.h"
+#include "../Common/XUI/XUI_Scene_Win.h"
+#include "../Common/XUI/XUI_HUD.h"
+#include "../Common/XUI/XUI_Scene_Anvil.h"
+#include "../Common/XUI/XUI_Scene_Trading.h"
+#include "../Common/XUI/XUI_Teleport.h"
 
 #ifdef _DEBUG_MENUS_ENABLED
-#include "..\Common\XUI\XUI_DebugItemEditor.h"
+#include "../Common/XUI/XUI_DebugItemEditor.h"
 #endif
 #ifndef _CONTENT_PACKAGE
-#include "..\Common\XUI\XUI_DebugSchematicCreator.h"
+#include "../Common/XUI/XUI_DebugSchematicCreator.h"
 #endif
 
 #include "Xbox_App.h"
diff --git a/Minecraft.Client/Xbox/Xbox_Minecraft.cpp b/Minecraft.Client/Xbox/Xbox_Minecraft.cpp
index 04e4a8d5..69868a94 100644
--- a/Minecraft.Client/Xbox/Xbox_Minecraft.cpp
+++ b/Minecraft.Client/Xbox/Xbox_Minecraft.cpp
@@ -4,36 +4,36 @@
 #include "stdafx.h"
 #include <xbdm.h>
 #include <assert.h>
-#include "GameConfig\Minecraft.spa.h"
-#include "..\MinecraftServer.h"
-#include "..\LocalPlayer.h"
-#include "..\..\Minecraft.World\ItemInstance.h"
-#include "..\..\Minecraft.World\MapItem.h"
-#include "..\..\Minecraft.World\Recipes.h"
-#include "..\..\Minecraft.World\Recipy.h"
-#include "..\..\Minecraft.World\Language.h"
-#include "..\..\Minecraft.World\StringHelpers.h"
-#include "..\..\Minecraft.World\AABB.h"
-#include "..\..\Minecraft.World\Vec3.h"
-#include "..\..\Minecraft.World\Level.h"
-#include "..\..\Minecraft.World\net.minecraft.world.level.tile.h"
-#include "..\ClientConnection.h"
-#include "..\User.h"
-#include "..\..\Minecraft.World\Socket.h"
-#include "..\..\Minecraft.World\ThreadName.h"
-#include "..\..\Minecraft.Client\StatsCounter.h"
-#include "..\ConnectScreen.h"
-#include "Social\SocialManager.h"
-#include "Leaderboards\XboxLeaderboardManager.h"
-#include "..\Common\XUI\XUI_Scene_Container.h"
-#include "..\..\Minecraft.Client\Tesselator.h"
-#include "..\..\Minecraft.Client\Options.h"
-#include "Sentient\SentientManager.h"
-#include "..\..\Minecraft.World\IntCache.h"
-#include "..\Textures.h"
-#include "..\..\Minecraft.World\compression.h"
-#include "..\..\Minecraft.World\OldChunkStorage.h"
-//#include "..\..\Minecraft.Client\SoundEngine.h"
+#include "GameConfig/Minecraft.spa.h"
+#include "../MinecraftServer.h"
+#include "../LocalPlayer.h"
+#include "../../Minecraft.World/ItemInstance.h"
+#include "../../Minecraft.World/MapItem.h"
+#include "../../Minecraft.World/Recipes.h"
+#include "../../Minecraft.World/Recipy.h"
+#include "../../Minecraft.World/Language.h"
+#include "../../Minecraft.World/StringHelpers.h"
+#include "../../Minecraft.World/AABB.h"
+#include "../../Minecraft.World/Vec3.h"
+#include "../../Minecraft.World/Level.h"
+#include "../../Minecraft.World/net.minecraft.world.level.tile.h"
+#include "../ClientConnection.h"
+#include "../User.h"
+#include "../../Minecraft.World/Socket.h"
+#include "../../Minecraft.World/ThreadName.h"
+#include "../../Minecraft.Client/StatsCounter.h"
+#include "../ConnectScreen.h"
+#include "Social/SocialManager.h"
+#include "Leaderboards/XboxLeaderboardManager.h"
+#include "../Common/XUI/XUI_Scene_Container.h"
+#include "../../Minecraft.Client/Tesselator.h"
+#include "../../Minecraft.Client/Options.h"
+#include "Sentient/SentientManager.h"
+#include "../../Minecraft.World/IntCache.h"
+#include "../Textures.h"
+#include "../../Minecraft.World/compression.h"
+#include "../../Minecraft.World/OldChunkStorage.h"
+//#include "../../Minecraft.Client/SoundEngine.h"
 
 #include <NuiApi.h>
 
diff --git a/Minecraft.Client/Xbox/Xbox_UIController.cpp b/Minecraft.Client/Xbox/Xbox_UIController.cpp
index 51d91ca4..7beb731c 100644
--- a/Minecraft.Client/Xbox/Xbox_UIController.cpp
+++ b/Minecraft.Client/Xbox/Xbox_UIController.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "Xbox_UIController.h"
-#include "..\Common\XUI\XUI_Scene_Base.h"
-#include "..\Common\XUI\XUI_Scene_Win.h"
+#include "../Common/XUI/XUI_Scene_Base.h"
+#include "../Common/XUI/XUI_Scene_Win.h"
 
 ConsoleUIController ui;
 
diff --git a/Minecraft.Client/Xbox/Xbox_UIController.h b/Minecraft.Client/Xbox/Xbox_UIController.h
index 2b273ee5..998239dc 100644
--- a/Minecraft.Client/Xbox/Xbox_UIController.h
+++ b/Minecraft.Client/Xbox/Xbox_UIController.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "..\Common\UI\IUIController.h"
+#include "../Common/UI/IUIController.h"
 
 class ConsoleUIController : public IUIController
 {
diff --git a/Minecraft.Client/ZombieModel.cpp b/Minecraft.Client/ZombieModel.cpp
index 2063b830..e59e716b 100644
--- a/Minecraft.Client/ZombieModel.cpp
+++ b/Minecraft.Client/ZombieModel.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "ZombieModel.h"
-#include "..\Minecraft.World\Mth.h"
+#include "../Minecraft.World/Mth.h"
 #include "ModelPart.h"
 
 ZombieModel::ZombieModel() : HumanoidModel(0, 0, 64, 32)
diff --git a/Minecraft.Client/ZombieRenderer.cpp b/Minecraft.Client/ZombieRenderer.cpp
index 5408736d..f041dc20 100644
--- a/Minecraft.Client/ZombieRenderer.cpp
+++ b/Minecraft.Client/ZombieRenderer.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "ZombieModel.h"
 #include "VillagerZombieModel.h"
-#include "..\Minecraft.World\net.minecraft.world.entity.monster.h"
+#include "../Minecraft.World/net.minecraft.world.entity.monster.h"
 #include "ZombieRenderer.h"
 
 ZombieRenderer::ZombieRenderer() : HumanoidMobRenderer(new ZombieModel(), .5f, 1.0f)
diff --git a/Minecraft.Client/glWrapper.cpp b/Minecraft.Client/glWrapper.cpp
index b120d30b..be24c02c 100644
--- a/Minecraft.Client/glWrapper.cpp
+++ b/Minecraft.Client/glWrapper.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
-#include "..\Minecraft.World\FloatBuffer.h"
-#include "..\Minecraft.World\IntBuffer.h"
-#include "..\Minecraft.World\ByteBuffer.h"
+#include "../Minecraft.World/FloatBuffer.h"
+#include "../Minecraft.World/IntBuffer.h"
+#include "../Minecraft.World/ByteBuffer.h"
 
 void glViewport(int x, int y, int w, int h)
 {
diff --git a/Minecraft.Client/stdafx.h b/Minecraft.Client/stdafx.h
index 4220f980..fa7ef036 100644
--- a/Minecraft.Client/stdafx.h
+++ b/Minecraft.Client/stdafx.h
@@ -107,7 +107,7 @@ typedef XNKID SessionID;
 typedef XUID GameSessionUID;
 #define HRESULT_SUCCEEDED(hr) (((HRESULT)(hr)) >= 0)
 
-#include "..\Minecraft.Client\xbox\network\extra.h"
+#include "../Minecraft.Client/xbox/network/extra.h"
 #else
 #include "extraX64.h"
 #endif
@@ -148,46 +148,46 @@ typedef XUID GameSessionUID;
 #include <xparty.h>
 #endif
 
-#include "..\Minecraft.World\Definitions.h"
-#include "..\Minecraft.World\class.h"
-#include "..\Minecraft.World\ArrayWithLength.h"
-#include "..\Minecraft.World\SharedConstants.h"
-#include "..\Minecraft.World\Random.h"
-#include "..\Minecraft.World\compression.h"
-#include "..\Minecraft.World\PerformanceTimer.h"
+#include "../Minecraft.World/Definitions.h"
+#include "../Minecraft.World/class.h"
+#include "../Minecraft.World/ArrayWithLength.h"
+#include "../Minecraft.World/SharedConstants.h"
+#include "../Minecraft.World/Random.h"
+#include "../Minecraft.World/compression.h"
+#include "../Minecraft.World/PerformanceTimer.h"
 
 #ifdef _XBOX
-	#include "xbox\4JLibs\inc\4J_Input.h"
-	#include "xbox\4JLibs\inc\4J_Profile.h"
-	#include "xbox\4JLibs\inc\4J_Render.h"
-	#include "xbox\4JLibs\inc\4J_XTMS.h"
-	#include "xbox\4JLibs\inc\4J_Storage.h"
+	#include "xbox/4JLibs/inc/4J_Input.h"
+	#include "xbox/4JLibs/inc/4J_Profile.h"
+	#include "xbox/4JLibs/inc/4J_Render.h"
+	#include "xbox/4JLibs/inc/4J_XTMS.h"
+	#include "xbox/4JLibs/inc/4J_Storage.h"
 #elif defined (__PS3__)
 
-	#include "PS3\4JLibs\inc\4J_Input.h"
-	#include "PS3\4JLibs\inc\4J_Profile.h"
-	#include "PS3\4JLibs\inc\4J_Render.h"
-	#include "PS3\4JLibs\inc\4J_Storage.h"
+	#include "PS3/4JLibs/inc/4J_Input.h"
+	#include "PS3/4JLibs/inc/4J_Profile.h"
+	#include "PS3/4JLibs/inc/4J_Render.h"
+	#include "PS3/4JLibs/inc/4J_Storage.h"
 #elif defined _DURANGO
-	#include "Durango\4JLibs\inc\4J_Input.h"
-	#include "Durango\4JLibs\inc\4J_Profile.h"
-	#include "Durango\4JLibs\inc\4J_Render.h"
-	#include "Durango\4JLibs\inc\4J_Storage.h"
+	#include "Durango/4JLibs/inc/4J_Input.h"
+	#include "Durango/4JLibs/inc/4J_Profile.h"
+	#include "Durango/4JLibs/inc/4J_Render.h"
+	#include "Durango/4JLibs/inc/4J_Storage.h"
 #elif defined _WINDOWS64
-	#include "Windows64\4JLibs\inc\4J_Input.h"	
-	#include "Windows64\4JLibs\inc\4J_Profile.h"
-	#include "Windows64\4JLibs\inc\4J_Render.h"
-	#include "Windows64\4JLibs\inc\4J_Storage.h"
+	#include "Windows64/4JLibs/inc/4J_Input.h"	
+	#include "Windows64/4JLibs/inc/4J_Profile.h"
+	#include "Windows64/4JLibs/inc/4J_Render.h"
+	#include "Windows64/4JLibs/inc/4J_Storage.h"
 #elif defined __PSVITA__
-	#include "PSVita\4JLibs\inc\4J_Input.h"	
-	#include "PSVita\4JLibs\inc\4J_Profile.h"
-	#include "PSVita\4JLibs\inc\4J_Render.h"
-	#include "PSVita\4JLibs\inc\4J_Storage.h"
+	#include "PSVita/4JLibs/inc/4J_Input.h"	
+	#include "PSVita/4JLibs/inc/4J_Profile.h"
+	#include "PSVita/4JLibs/inc/4J_Render.h"
+	#include "PSVita/4JLibs/inc/4J_Storage.h"
 #else
-	#include "Orbis\4JLibs\inc\4J_Input.h"	
-	#include "Orbis\4JLibs\inc\4J_Profile.h"
-	#include "Orbis\4JLibs\inc\4J_Render.h"
-	#include "Orbis\4JLibs\inc\4J_Storage.h"
+	#include "Orbis/4JLibs/inc/4J_Input.h"	
+	#include "Orbis/4JLibs/inc/4J_Profile.h"
+	#include "Orbis/4JLibs/inc/4J_Render.h"
+	#include "Orbis/4JLibs/inc/4J_Storage.h"
 #endif
 
 #include "Textures.h"
@@ -201,84 +201,84 @@ typedef XUID GameSessionUID;
 #include "stubs.h"
 #include "BufferedImage.h"
 
-#include "Common\Network\GameNetworkManager.h"
+#include "Common/Network/GameNetworkManager.h"
 
 #ifdef _XBOX
-#include "Common\XUI\XUI_Helper.h"
-#include "Common\XUI\XUI_Scene_Base.h"
+#include "Common/XUI/XUI_Helper.h"
+#include "Common/XUI/XUI_Scene_Base.h"
 #endif
 
-#include "Common\UI\UIEnums.h"
-#include "Common\UI\UIStructs.h"
+#include "Common/UI/UIEnums.h"
+#include "Common/UI/UIStructs.h"
 // #ifdef _XBOX
-#include "Common\App_defines.h"
-#include "Common\App_enums.h"
-#include "Common\Tutorial\TutorialEnum.h"
-#include "Common\App_structs.h"
+#include "Common/App_defines.h"
+#include "Common/App_enums.h"
+#include "Common/Tutorial/TutorialEnum.h"
+#include "Common/App_structs.h"
 //#endif
 
-#include "Common\Consoles_App.h"
-#include "Common\Minecraft_Macros.h"
-#include "Common\BuildVer.h"
+#include "Common/Consoles_App.h"
+#include "Common/Minecraft_Macros.h"
+#include "Common/BuildVer.h"
 
 #ifdef _XBOX
-	#include "Xbox\Xbox_App.h"
-	#include "Xbox\Sentient\MinecraftTelemetry.h"
-	#include "Xbox\Sentient\DynamicConfigurations.h"
-	#include "XboxMedia\strings.h"
-	#include "Xbox\Sentient\SentientTelemetryCommon.h"
-	#include "Xbox\Sentient\Include\SenClientStats.h"
-	#include "Xbox\GameConfig\Minecraft.spa.h"
-	#include "XboxMedia\4J_strings.h"
-	#include "Xbox\XML\ATGXmlParser.h"
-	#include "Xbox\Leaderboards\XboxLeaderboardManager.h"
-	#include "Xbox\Social\SocialManager.h"
-	#include "Xbox\Audio\SoundEngine.h"
-	#include "Xbox\Xbox_UIController.h"
+	#include "Xbox/Xbox_App.h"
+	#include "Xbox/Sentient/MinecraftTelemetry.h"
+	#include "Xbox/Sentient/DynamicConfigurations.h"
+	#include "XboxMedia/strings.h"
+	#include "Xbox/Sentient/SentientTelemetryCommon.h"
+	#include "Xbox/Sentient/Include/SenClientStats.h"
+	#include "Xbox/GameConfig/Minecraft.spa.h"
+	#include "XboxMedia/4J_strings.h"
+	#include "Xbox/XML/ATGXmlParser.h"
+	#include "Xbox/Leaderboards/XboxLeaderboardManager.h"
+	#include "Xbox/Social/SocialManager.h"
+	#include "Xbox/Audio/SoundEngine.h"
+	#include "Xbox/Xbox_UIController.h"
 
 #elif defined (__PS3__)
 	#include "extraX64client.h"
-	#include "PS3\Sentient\MinecraftTelemetry.h"
-	#include "PS3\Sentient\DynamicConfigurations.h"
-	#include "PS3\Sentient\SentientTelemetryCommon.h"
-	#include "PS3Media\strings.h"
-	#include "PS3\PS3_App.h"
-	#include "PS3\GameConfig\Minecraft.spa.h"
-	#include "PS3Media\4J_strings.h"
-	#include "PS3\XML\ATGXmlParser.h"
-	#include "PS3\Social\SocialManager.h"
-	#include "Common\Audio\SoundEngine.h"
-	#include "PS3\Iggy\include\iggy.h"
-	#include "PS3\Iggy\gdraw\gdraw_ps3gcm.h"
-	#include "PS3\PS3_UIController.h"
+	#include "PS3/Sentient/MinecraftTelemetry.h"
+	#include "PS3/Sentient/DynamicConfigurations.h"
+	#include "PS3/Sentient/SentientTelemetryCommon.h"
+	#include "PS3Media/strings.h"
+	#include "PS3/PS3_App.h"
+	#include "PS3/GameConfig/Minecraft.spa.h"
+	#include "PS3Media/4J_strings.h"
+	#include "PS3/XML/ATGXmlParser.h"
+	#include "PS3/Social/SocialManager.h"
+	#include "Common/Audio/SoundEngine.h"
+	#include "PS3/Iggy/include/iggy.h"
+	#include "PS3/Iggy/gdraw/gdraw_ps3gcm.h"
+	#include "PS3/PS3_UIController.h"
 #elif defined _DURANGO
-	#include "Durango\Sentient\MinecraftTelemetry.h"
-	#include "DurangoMedia\strings.h"
-	#include "Durango\Durango_App.h"
-	#include "Durango\Sentient\DynamicConfigurations.h"	
-	#include "Durango\Sentient\TelemetryEnum.h"
-	#include "Durango\Sentient\SentientTelemetryCommon.h"
-	#include "Durango\PresenceIds.h"
-	#include "DurangoMedia\4J_strings.h"
-	#include "Durango\XML\ATGXmlParser.h"
-	#include "Durango\Social\SocialManager.h"
-#include "Common\Audio\SoundEngine.h"
-	#include "Durango\Iggy\include\iggy.h"
-	#include "Durango\Iggy\gdraw\gdraw_d3d11.h"
-	#include "Durango\Durango_UIController.h"
+	#include "Durango/Sentient/MinecraftTelemetry.h"
+	#include "DurangoMedia/strings.h"
+	#include "Durango/Durango_App.h"
+	#include "Durango/Sentient/DynamicConfigurations.h"	
+	#include "Durango/Sentient/TelemetryEnum.h"
+	#include "Durango/Sentient/SentientTelemetryCommon.h"
+	#include "Durango/PresenceIds.h"
+	#include "DurangoMedia/4J_strings.h"
+	#include "Durango/XML/ATGXmlParser.h"
+	#include "Durango/Social/SocialManager.h"
+#include "Common/Audio/SoundEngine.h"
+	#include "Durango/Iggy/include/iggy.h"
+	#include "Durango/Iggy/gdraw/gdraw_d3d11.h"
+	#include "Durango/Durango_UIController.h"
 #elif defined _WINDOWS64
-	#include "Windows64\Sentient\MinecraftTelemetry.h"
-	#include "Windows64Media\strings.h"
-	#include "Windows64\Windows64_App.h"
-	#include "Windows64\Sentient\DynamicConfigurations.h"
-	#include "Windows64\Sentient\SentientTelemetryCommon.h"
-	#include "Windows64\GameConfig\Minecraft.spa.h"
-	#include "Windows64\XML\ATGXmlParser.h"	
-	#include "Windows64\Social\SocialManager.h"
-	#include "Common\Audio\SoundEngine.h"
-	#include "Windows64\Iggy\include\iggy.h"
-	#include "Windows64\Iggy\gdraw\gdraw_d3d11.h"
-	#include "Windows64\Windows64_UIController.h"
+	#include "Windows64/Sentient/MinecraftTelemetry.h"
+	#include "Windows64Media/strings.h"
+	#include "Windows64/Windows64_App.h"
+	#include "Windows64/Sentient/DynamicConfigurations.h"
+	#include "Windows64/Sentient/SentientTelemetryCommon.h"
+	#include "Windows64/GameConfig/Minecraft.spa.h"
+	#include "Windows64/XML/ATGXmlParser.h"	
+	#include "Windows64/Social/SocialManager.h"
+	#include "Common/Audio/SoundEngine.h"
+	#include "Windows64/Iggy/include/iggy.h"
+	#include "Windows64/Iggy/gdraw/gdraw_d3d11.h"
+	#include "Windows64/Windows64_UIController.h"
 #elif defined __linux__
 	// #include "Windows64/Sentient/MinecraftTelemetry.h"
 	#include "Windows64Media/strings.h"
@@ -293,60 +293,60 @@ typedef XUID GameSessionUID;
 	// #include "Windows64/Iggy/gdraw/gdraw_d3d11.h"
 	// #include "Windows64/Windows64_UIController.h"
 #elif defined __PSVITA__
-	#include "PSVita\PSVita_App.h"
-	#include "PSVitaMedia\strings.h"		// TODO - create PSVita-specific version of this
-	#include "PSVita\Sentient\SentientManager.h"
-	#include "PSVita\Sentient\MinecraftTelemetry.h"
-	#include "PSVita\Sentient\DynamicConfigurations.h"
-	#include "PSVita\GameConfig\Minecraft.spa.h"
-	#include "PSVita\XML\ATGXmlParser.h"
-	#include "PSVita\Social\SocialManager.h"
-	#include "Common\Audio\SoundEngine.h"
-	#include "PSVita\Iggy\include\iggy.h"
-	#include "PSVita\Iggy\gdraw\gdraw_psp2.h"
-	#include "PSVita\PSVita_UIController.h"
+	#include "PSVita/PSVita_App.h"
+	#include "PSVitaMedia/strings.h"		// TODO - create PSVita-specific version of this
+	#include "PSVita/Sentient/SentientManager.h"
+	#include "PSVita/Sentient/MinecraftTelemetry.h"
+	#include "PSVita/Sentient/DynamicConfigurations.h"
+	#include "PSVita/GameConfig/Minecraft.spa.h"
+	#include "PSVita/XML/ATGXmlParser.h"
+	#include "PSVita/Social/SocialManager.h"
+	#include "Common/Audio/SoundEngine.h"
+	#include "PSVita/Iggy/include/iggy.h"
+	#include "PSVita/Iggy/gdraw/gdraw_psp2.h"
+	#include "PSVita/PSVita_UIController.h"
 #else
-	#include "Orbis\Sentient\MinecraftTelemetry.h"
-	#include "OrbisMedia\strings.h"
-	#include "Orbis\Orbis_App.h"
-	#include "Orbis\Sentient\SentientTelemetryCommon.h"
-	#include "Orbis\Sentient\DynamicConfigurations.h"
-	#include "Orbis\GameConfig\Minecraft.spa.h"
-	#include "OrbisMedia\4J_strings.h"
-	#include "Orbis\XML\ATGXmlParser.h"	
-	#include "Windows64\Social\SocialManager.h"
-	#include "Common\Audio\SoundEngine.h"
-	#include "Orbis\Iggy\include\iggy.h"
-	#include "Orbis\Iggy\gdraw\gdraw_orbis.h"
-	#include "Orbis\Orbis_UIController.h"
+	#include "Orbis/Sentient/MinecraftTelemetry.h"
+	#include "OrbisMedia/strings.h"
+	#include "Orbis/Orbis_App.h"
+	#include "Orbis/Sentient/SentientTelemetryCommon.h"
+	#include "Orbis/Sentient/DynamicConfigurations.h"
+	#include "Orbis/GameConfig/Minecraft.spa.h"
+	#include "OrbisMedia/4J_strings.h"
+	#include "Orbis/XML/ATGXmlParser.h"	
+	#include "Windows64/Social/SocialManager.h"
+	#include "Common/Audio/SoundEngine.h"
+	#include "Orbis/Iggy/include/iggy.h"
+	#include "Orbis/Iggy/gdraw/gdraw_orbis.h"
+	#include "Orbis/Orbis_UIController.h"
 #endif
 
 #ifdef _XBOX
-#include "Common\XUI\XUI_CustomMessages.h"
-#include "Common\XUI\XUI_Scene_Inventory_Creative.h"
-#include "Common\XUI\XUI_FullscreenProgress.h"
-#include "Common\XUI\XUI_ConnectingProgress.h"
-#include "Common\XUI\XUI_Scene_CraftingPanel.h"
-#include "Common\XUI\XUI_TutorialPopup.h"
-#include "Common\XUI\XUI_PauseMenu.h"
+#include "Common/XUI/XUI_CustomMessages.h"
+#include "Common/XUI/XUI_Scene_Inventory_Creative.h"
+#include "Common/XUI/XUI_FullscreenProgress.h"
+#include "Common/XUI/XUI_ConnectingProgress.h"
+#include "Common/XUI/XUI_Scene_CraftingPanel.h"
+#include "Common/XUI/XUI_TutorialPopup.h"
+#include "Common/XUI/XUI_PauseMenu.h"
 #endif
-#include "Common\ConsoleGameMode.h"
-#include "Common\Console_Debug_enum.h"
-#include "Common\Console_Awards_enum.h"
-#include "Common\Tutorial\TutorialMode.h"
-#include "Common\Tutorial\Tutorial.h"
-#include "Common\Tutorial\FullTutorialMode.h"
-#include "Common\Trial\TrialMode.h"
-#include "Common\GameRules\ConsoleGameRules.h"
-#include "Common\GameRules\ConsoleSchematicFile.h"
-#include "Common\Colours\ColourTable.h"
-#include "Common\DLC\DLCSkinFile.h"
-#include "Common\DLC\DLCManager.h"
-#include "Common\DLC\DLCPack.h"
-#include "Common\Telemetry\TelemetryManager.h"
+#include "Common/ConsoleGameMode.h"
+#include "Common/Console_Debug_enum.h"
+#include "Common/Console_Awards_enum.h"
+#include "Common/Tutorial/TutorialMode.h"
+#include "Common/Tutorial/Tutorial.h"
+#include "Common/Tutorial/FullTutorialMode.h"
+#include "Common/Trial/TrialMode.h"
+#include "Common/GameRules/ConsoleGameRules.h"
+#include "Common/GameRules/ConsoleSchematicFile.h"
+#include "Common/Colours/ColourTable.h"
+#include "Common/DLC/DLCSkinFile.h"
+#include "Common/DLC/DLCManager.h"
+#include "Common/DLC/DLCPack.h"
+#include "Common/Telemetry/TelemetryManager.h"
 
 #ifdef _XBOX
-//#include "Xbox\Xbox_App.h"
+//#include "Xbox/Xbox_App.h"
 #elif !defined(__PS3__)
 #include "extraX64client.h"
 #endif
diff --git a/Minecraft.World/C4JThread.cpp b/Minecraft.World/C4JThread.cpp
index eb8f19cf..4d521dcd 100644
--- a/Minecraft.World/C4JThread.cpp
+++ b/Minecraft.World/C4JThread.cpp
@@ -3,8 +3,8 @@
 
 #include "C4JThread.h"
 #ifdef __PSVITA__
-#include "../Minecraft.Client/PSVita\PSVitaExtras\ShutdownManager.h"
-#include "../Minecraft.Client/PSVita\PSVitaExtras\PSVitaTLSStorage.h"
+#include "../Minecraft.Client/PSVita/PSVitaExtras/ShutdownManager.h"
+#include "../Minecraft.Client/PSVita/PSVitaExtras/PSVitaTLSStorage.h"
 
 // AP - this comes from the low level user_malloc.c file used to overide the default memory functions. These must be called when a thread is started/stopped
 extern "C" {
@@ -12,7 +12,7 @@ extern void user_registerthread();
 extern void user_removethread();
 }
 #else
-#include "../Minecraft.Client/PS3\PS3Extras\ShutdownManager.h"
+#include "../Minecraft.Client/PS3/PS3Extras/ShutdownManager.h"
 
 #endif
 
diff --git a/Minecraft.World/CompressedTileStorage.cpp b/Minecraft.World/CompressedTileStorage.cpp
index 896bd58d..265ee21f 100644
--- a/Minecraft.World/CompressedTileStorage.cpp
+++ b/Minecraft.World/CompressedTileStorage.cpp
@@ -6,7 +6,7 @@
 #endif
 
 #ifdef __PS3__
-#include "..\SPU_Tasks\CompressedTileStorage_compress\CompressedTileStorage_compress.h"
+#include "../SPU_Tasks/CompressedTileStorage_compress/CompressedTileStorage_compress.h"
 #include "C4JSpursJob.h"
 static const int sc_maxCompressTiles = 64;
 static CompressedTileStorage_compress_dataIn g_compressTileDataIn[sc_maxCompressTiles] __attribute__((__aligned__(16)));
diff --git a/Minecraft.World/ConsoleSaveFileSplit.cpp b/Minecraft.World/ConsoleSaveFileSplit.cpp
index 3077e2a3..8bc7180d 100644
--- a/Minecraft.World/ConsoleSaveFileSplit.cpp
+++ b/Minecraft.World/ConsoleSaveFileSplit.cpp
@@ -8,10 +8,10 @@
 #include "../Minecraft.Client/Minecraft.h"
 #include "../Minecraft.Client/MinecraftServer.h"
 #include "../Minecraft.Client/ServerLevel.h"
-#include "..\Minecraft.World\net.minecraft.world.level.h"
-#include "..\Minecraft.World\LevelData.h"
-#include "../Minecraft.Client/Common\GameRules\LevelGenerationOptions.h"
-#include "..\Minecraft.World\net.minecraft.world.level.chunk.storage.h"
+#include "../Minecraft.World/net.minecraft.world.level.h"
+#include "../Minecraft.World/LevelData.h"
+#include "../Minecraft.Client/Common/GameRules/LevelGenerationOptions.h"
+#include "../Minecraft.World/net.minecraft.world.level.chunk.storage.h"
 
 #define RESERVE_ALLOCATION  MEM_RESERVE
 #define COMMIT_ALLOCATION  MEM_COMMIT
diff --git a/Minecraft.World/Dimension.cpp b/Minecraft.World/Dimension.cpp
index ccc2fcc9..e3eba15d 100644
--- a/Minecraft.World/Dimension.cpp
+++ b/Minecraft.World/Dimension.cpp
@@ -11,7 +11,7 @@
 #include "TheEndDimension.h"
 #include "net.minecraft.world.level.tile.h"
 #include "../Minecraft.Client/Minecraft.h"
-#include "../Minecraft.Client/Common\Colours\ColourTable.h"
+#include "../Minecraft.Client/Common/Colours/ColourTable.h"
 
 void Dimension::init(Level *level)
 {
diff --git a/Minecraft.World/DurangoStats.cpp b/Minecraft.World/DurangoStats.cpp
index 97a5066f..c72c91cb 100644
--- a/Minecraft.World/DurangoStats.cpp
+++ b/Minecraft.World/DurangoStats.cpp
@@ -21,7 +21,7 @@
 
 #include "EntityIO.h"
 
-#include "../Minecraft.Client/Durango\ServiceConfig\Events-XBLA.8-149E11AEEvents.h"
+#include "../Minecraft.Client/Durango/ServiceConfig/Events-XBLA.8-149E11AEEvents.h"
 
 #include "DurangoStats.h"
 
diff --git a/Minecraft.World/GenericStats.h b/Minecraft.World/GenericStats.h
index 541424db..638b3283 100644
--- a/Minecraft.World/GenericStats.h
+++ b/Minecraft.World/GenericStats.h
@@ -5,7 +5,7 @@
 
 //#include "DamageSource.h"
 
-//#include "..\Minecraft.Client\Common\Console_Awards_enum.h"
+//#include "../Minecraft.Client/Common/Console_Awards_enum.h"
 
 /**
 	4J-JEV:
diff --git a/Minecraft.World/HellDimension.cpp b/Minecraft.World/HellDimension.cpp
index 7a033507..42bb1a24 100644
--- a/Minecraft.World/HellDimension.cpp
+++ b/Minecraft.World/HellDimension.cpp
@@ -6,7 +6,7 @@
 #include "net.minecraft.world.level.biome.h"
 #include "net.minecraft.world.level.tile.h"
 #include "../Minecraft.Client/Minecraft.h"
-#include "../Minecraft.Client/Common\Colours\ColourTable.h"
+#include "../Minecraft.Client/Common/Colours/ColourTable.h"
 
 void HellDimension::init()
 {
diff --git a/Minecraft.World/Layer.cpp b/Minecraft.World/Layer.cpp
index 827c1163..0b504645 100644
--- a/Minecraft.World/Layer.cpp
+++ b/Minecraft.World/Layer.cpp
@@ -5,7 +5,7 @@
 
 #ifdef __PSVITA__
 // AP - this is used to perform fast 64bit divides of known values
-#include "../Minecraft.Client/PSVita\PSVitaExtras\libdivide.h"
+#include "../Minecraft.Client/PSVita/PSVitaExtras/libdivide.h"
 
 libdivide::divider<long long> fast_d2(2);
 libdivide::divider<long long> fast_d3(3);
diff --git a/Minecraft.World/Level.h b/Minecraft.World/Level.h
index a6872350..47d778c9 100644
--- a/Minecraft.World/Level.h
+++ b/Minecraft.World/Level.h
@@ -11,7 +11,7 @@ using namespace std;
 #include "C4JThread.h"
 
 #ifdef __PSVITA__
-#include "..\Minecraft.Client\PSVita\PSVitaExtras\CustomSet.h"
+#include "../Minecraft.Client/PSVita/PSVitaExtras/CustomSet.h"
 #endif
 
 // 4J Stu - This value should be big enough that we don't get any crashes causes by memory overwrites,
diff --git a/Minecraft.World/MobSpawner.h b/Minecraft.World/MobSpawner.h
index b5022a77..9bfad88f 100644
--- a/Minecraft.World/MobSpawner.h
+++ b/Minecraft.World/MobSpawner.h
@@ -3,7 +3,7 @@
 #include "Mob.h"
 
 #ifdef __PSVITA__
-#include "..\Minecraft.Client\PSVita\PSVitaExtras\CustomMap.h"
+#include "../Minecraft.Client/PSVita/PSVitaExtras/CustomMap.h"
 #endif
 
 class Player;
diff --git a/Minecraft.World/RandomLevelSource.cpp b/Minecraft.World/RandomLevelSource.cpp
index 04869046..09a54e22 100644
--- a/Minecraft.World/RandomLevelSource.cpp
+++ b/Minecraft.World/RandomLevelSource.cpp
@@ -10,7 +10,7 @@
 #include "RandomLevelSource.h"
 
 #ifdef __PS3__
-#include "../Minecraft.Client/PS3\SPU_Tasks\PerlinNoise\PerlinNoiseJob.h"
+#include "../Minecraft.Client/PS3/SPU_Tasks/PerlinNoise/PerlinNoiseJob.h"
 #include "C4JSpursJob.h"
 static PerlinNoise_DataIn g_lperlinNoise1_SPU __attribute__((__aligned__(16)));
 static PerlinNoise_DataIn g_lperlinNoise2_SPU __attribute__((__aligned__(16)));
diff --git a/Minecraft.World/SignTileEntity.cpp b/Minecraft.World/SignTileEntity.cpp
index 076a181d..dc70b699 100644
--- a/Minecraft.World/SignTileEntity.cpp
+++ b/Minecraft.World/SignTileEntity.cpp
@@ -12,7 +12,7 @@
 #include "../Minecraft.Client/ClientConnection.h"
 #include "../Minecraft.Client/Minecraft.h"
 #include "../Minecraft.Client/ServerLevel.h"
-#include "..\Minecraft.World\Level.h"
+#include "../Minecraft.World/Level.h"
 
 
 
diff --git a/Minecraft.World/StemTile.cpp b/Minecraft.World/StemTile.cpp
index 0c73efbf..90f98daa 100644
--- a/Minecraft.World/StemTile.cpp
+++ b/Minecraft.World/StemTile.cpp
@@ -4,7 +4,7 @@
 #include "net.minecraft.world.level.h"
 #include "net.minecraft.world.h"
 #include "../Minecraft.Client/Minecraft.h"
-#include "../Minecraft.Client/Common\Colours\ColourTable.h"
+#include "../Minecraft.Client/Common/Colours/ColourTable.h"
 #include "StemTile.h"
 
 const wstring StemTile::TEXTURE_ANGLED = L"stem_bent";
diff --git a/Minecraft.World/TheEndDimension.cpp b/Minecraft.World/TheEndDimension.cpp
index 47b4d571..16c65b0a 100644
--- a/Minecraft.World/TheEndDimension.cpp
+++ b/Minecraft.World/TheEndDimension.cpp
@@ -5,7 +5,7 @@
 #include "net.minecraft.world.level.h"
 #include "net.minecraft.world.level.tile.h"
 #include "../Minecraft.Client/Minecraft.h"
-#include "../Minecraft.Client/Common\Colours\ColourTable.h"
+#include "../Minecraft.Client/Common/Colours/ColourTable.h"
 
 void TheEndDimension::init()
 {
diff --git a/Minecraft.World/compression.cpp b/Minecraft.World/compression.cpp
index 60a4ec70..eb581bd0 100644
--- a/Minecraft.World/compression.cpp
+++ b/Minecraft.World/compression.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "compression.h"
 #if defined __ORBIS__ || defined __PS3__ || defined _DURANGO || defined _WIN64
-#include "../Minecraft.Client/Common\zlib\zlib.h"
+#include "../Minecraft.Client/Common/zlib/zlib.h"
 #endif
 
 #if defined(__linux__)
@@ -10,9 +10,9 @@
 #endif // __linux__
 
 #if defined __PSVITA__
-#include "../Minecraft.Client/PSVita\PSVitaExtras\zlib.h"
+#include "../Minecraft.Client/PSVita/PSVitaExtras/zlib.h"
 #elif defined __PS3__
-#include "../Minecraft.Client/PS3\PS3Extras\EdgeZLib.h"
+#include "../Minecraft.Client/PS3/PS3Extras/EdgeZLib.h"
 #endif //__PS3__
 
 #if defined(__linux__)
diff --git a/Minecraft.World/compression.h b/Minecraft.World/compression.h
index bceac78c..0cf2d7c0 100644
--- a/Minecraft.World/compression.h
+++ b/Minecraft.World/compression.h
@@ -2,7 +2,7 @@
 #include "FileHeader.h"
 
 #ifdef _XBOX_ONE
-#include "..\Minecraft.Client\Durango\DurangoExtras\xcompress.h"
+#include "../Minecraft.Client/Durango/DurangoExtras/xcompress.h"
 #endif
 
 class Compression
diff --git a/Minecraft.World/stdafx.h b/Minecraft.World/stdafx.h
index 65b2f23a..6b8b90ff 100644
--- a/Minecraft.World/stdafx.h
+++ b/Minecraft.World/stdafx.h
@@ -34,7 +34,7 @@ typedef unsigned __uint64;
 #include <DirectXMath.h>
 using namespace DirectX;
 #include <pix.h>
-#include "..\Minecraft.Client\Durango\DurangoExtras\DurangoStubs.h"
+#include "../Minecraft.Client/Durango/DurangoExtras/DurangoStubs.h"
 #endif
 
 #if (defined __PS3__ || defined _XBOX )
@@ -157,41 +157,41 @@ typedef XUID GameSessionUID;
 void MemSect(int sect);
 
 #ifdef _XBOX
-#include "..\Minecraft.Client\xbox\4JLibs\inc\4J_Profile.h"
-#include "..\Minecraft.Client\xbox\4JLibs\inc\4J_Render.h"
-#include "..\Minecraft.Client\xbox\4JLibs\inc\4J_XTMS.h"
-#include "..\Minecraft.Client\xbox\4JLibs\inc\4J_Storage.h"
-#include "..\Minecraft.Client\xbox\4JLibs\inc\4J_Input.h"
+#include "../Minecraft.Client/xbox/4JLibs/inc/4J_Profile.h"
+#include "../Minecraft.Client/xbox/4JLibs/inc/4J_Render.h"
+#include "../Minecraft.Client/xbox/4JLibs/inc/4J_XTMS.h"
+#include "../Minecraft.Client/xbox/4JLibs/inc/4J_Storage.h"
+#include "../Minecraft.Client/xbox/4JLibs/inc/4J_Input.h"
 #elif defined (__PS3__)
-#include "..\Minecraft.Client\PS3\4JLibs\inc\4J_Profile.h"
-#include "..\Minecraft.Client\PS3\4JLibs\inc\4J_Render.h"
-#include "..\Minecraft.Client\PS3\4JLibs\inc\4J_Storage.h"
-#include "..\Minecraft.Client\PS3\4JLibs\inc\4J_Input.h"
+#include "../Minecraft.Client/PS3/4JLibs/inc/4J_Profile.h"
+#include "../Minecraft.Client/PS3/4JLibs/inc/4J_Render.h"
+#include "../Minecraft.Client/PS3/4JLibs/inc/4J_Storage.h"
+#include "../Minecraft.Client/PS3/4JLibs/inc/4J_Input.h"
 #elif defined _DURANGO
-#include "..\Minecraft.Client\Durango\4JLibs\inc\4J_Profile.h"
-#include "..\Minecraft.Client\Durango\4JLibs\inc\4J_Render.h"
-#include "..\Minecraft.Client\Durango\4JLibs\inc\4J_Storage.h"
-#include "..\Minecraft.Client\Durango\4JLibs\inc\4J_Input.h"
+#include "../Minecraft.Client/Durango/4JLibs/inc/4J_Profile.h"
+#include "../Minecraft.Client/Durango/4JLibs/inc/4J_Render.h"
+#include "../Minecraft.Client/Durango/4JLibs/inc/4J_Storage.h"
+#include "../Minecraft.Client/Durango/4JLibs/inc/4J_Input.h"
 #elif defined _WINDOWS64
-#include "..\Minecraft.Client\Windows64\4JLibs\inc\4J_Profile.h"
-#include "..\Minecraft.Client\Windows64\4JLibs\inc\4J_Render.h"
-#include "..\Minecraft.Client\Windows64\4JLibs\inc\4J_Storage.h"
-#include "..\Minecraft.Client\Windows64\4JLibs\inc\4J_Input.h"
+#include "../Minecraft.Client/Windows64/4JLibs/inc/4J_Profile.h"
+#include "../Minecraft.Client/Windows64/4JLibs/inc/4J_Render.h"
+#include "../Minecraft.Client/Windows64/4JLibs/inc/4J_Storage.h"
+#include "../Minecraft.Client/Windows64/4JLibs/inc/4J_Input.h"
 #elif defined __PSVITA__
-#include "..\Minecraft.Client\PSVita\4JLibs\inc\4J_Profile.h"
-#include "..\Minecraft.Client\PSVita\4JLibs\inc\4J_Render.h"
-#include "..\Minecraft.Client\PSVita\4JLibs\inc\4J_Storage.h"
-#include "..\Minecraft.Client\PSVita\4JLibs\inc\4J_Input.h"
+#include "../Minecraft.Client/PSVita/4JLibs/inc/4J_Profile.h"
+#include "../Minecraft.Client/PSVita/4JLibs/inc/4J_Render.h"
+#include "../Minecraft.Client/PSVita/4JLibs/inc/4J_Storage.h"
+#include "../Minecraft.Client/PSVita/4JLibs/inc/4J_Input.h"
 #elif defined __linux__
 #include "../Minecraft.Client/Windows64/4JLibs/inc/4J_Profile.h"
 #include "../Minecraft.Client/Windows64/4JLibs/inc/4J_Render.h"
 #include "../Minecraft.Client/Windows64/4JLibs/inc/4J_Storage.h"
 #include "../Minecraft.Client/Windows64/4JLibs/inc/4J_Input.h"
 #else
-#include "..\Minecraft.Client\Orbis\4JLibs\inc\4J_Profile.h"
-#include "..\Minecraft.Client\Orbis\4JLibs\inc\4J_Render.h"
-#include "..\Minecraft.Client\Orbis\4JLibs\inc\4J_Storage.h"
-#include "..\Minecraft.Client\Orbis\4JLibs\inc\4J_Input.h"
+#include "../Minecraft.Client/Orbis/4JLibs/inc/4J_Profile.h"
+#include "../Minecraft.Client/Orbis/4JLibs/inc/4J_Render.h"
+#include "../Minecraft.Client/Orbis/4JLibs/inc/4J_Storage.h"
+#include "../Minecraft.Client/Orbis/4JLibs/inc/4J_Input.h"
 #endif
 
 #include "../Minecraft.Client/Common/Network/GameNetworkManager.h"
@@ -205,8 +205,8 @@ void MemSect(int sect);
 //#endif
 
 #ifdef _XBOX
-#include "..\Minecraft.Client\Common\XUI\XUI_Helper.h"
-#include "..\Minecraft.Client\Common\XUI\XUI_Scene_Base.h"
+#include "../Minecraft.Client/Common/XUI/XUI_Helper.h"
+#include "../Minecraft.Client/Common/XUI/XUI_Scene_Base.h"
 #endif
 #include "../Minecraft.Client/Common/Consoles_App.h"
 #include "../Minecraft.Client/Common/Minecraft_Macros.h"
@@ -215,46 +215,46 @@ void MemSect(int sect);
 #include "../Minecraft.Client/Common/BuildVer.h"
 
 #ifdef _XBOX
-#include "..\Minecraft.Client\Xbox\Xbox_App.h"
-#include "..\Minecraft.Client\XboxMedia\strings.h"
-#include "..\Minecraft.Client\Xbox\Sentient\SentientTelemetryCommon.h"
-#include "..\Minecraft.Client\Xbox\Sentient\MinecraftTelemetry.h"
+#include "../Minecraft.Client/Xbox/Xbox_App.h"
+#include "../Minecraft.Client/XboxMedia/strings.h"
+#include "../Minecraft.Client/Xbox/Sentient/SentientTelemetryCommon.h"
+#include "../Minecraft.Client/Xbox/Sentient/MinecraftTelemetry.h"
 
 #elif defined (__PS3__)
-#include "..\Minecraft.Client\PS3\PS3_App.h"
-#include "..\Minecraft.Client\PS3Media\strings.h"
-#include "..\Minecraft.Client\PS3\Sentient\SentientTelemetryCommon.h"
-#include "..\Minecraft.Client\PS3\Sentient\MinecraftTelemetry.h"
+#include "../Minecraft.Client/PS3/PS3_App.h"
+#include "../Minecraft.Client/PS3Media/strings.h"
+#include "../Minecraft.Client/PS3/Sentient/SentientTelemetryCommon.h"
+#include "../Minecraft.Client/PS3/Sentient/MinecraftTelemetry.h"
 
 #elif defined _DURANGO
-#include "..\Minecraft.Client\Durango\Durango_App.h"
-#include "..\Minecraft.Client\DurangoMedia\strings.h"
-//#include "..\Minecraft.Client\Durango\Sentient\SentientManager.h"
-#include "..\Minecraft.Client\Durango\Sentient\SentientTelemetryCommon.h"
-#include "..\Minecraft.Client\Durango\Sentient\MinecraftTelemetry.h"
-#include "..\Minecraft.Client\Durango\Sentient\TelemetryEnum.h"
+#include "../Minecraft.Client/Durango/Durango_App.h"
+#include "../Minecraft.Client/DurangoMedia/strings.h"
+//#include "../Minecraft.Client/Durango/Sentient/SentientManager.h"
+#include "../Minecraft.Client/Durango/Sentient/SentientTelemetryCommon.h"
+#include "../Minecraft.Client/Durango/Sentient/MinecraftTelemetry.h"
+#include "../Minecraft.Client/Durango/Sentient/TelemetryEnum.h"
 
 #elif defined _WINDOWS64
-#include "..\Minecraft.Client\Windows64\Windows64_App.h"
-#include "..\Minecraft.Client\Windows64Media\strings.h"
-#include "..\Minecraft.Client\Windows64\Sentient\SentientTelemetryCommon.h"
-#include "..\Minecraft.Client\Windows64\Sentient\MinecraftTelemetry.h"
+#include "../Minecraft.Client/Windows64/Windows64_App.h"
+#include "../Minecraft.Client/Windows64Media/strings.h"
+#include "../Minecraft.Client/Windows64/Sentient/SentientTelemetryCommon.h"
+#include "../Minecraft.Client/Windows64/Sentient/MinecraftTelemetry.h"
 
 #elif defined __PSVITA__
-#include "..\Minecraft.Client\PSVita\PSVita_App.h"
-#include "..\Minecraft.Client\PSVitaMedia\strings.h"		// TODO - create PSVita-specific version of this
-#include "..\Minecraft.Client\PSVita\Sentient\SentientManager.h"
-#include "..\Minecraft.Client\PSVita\Sentient\MinecraftTelemetry.h"
+#include "../Minecraft.Client/PSVita/PSVita_App.h"
+#include "../Minecraft.Client/PSVitaMedia/strings.h"		// TODO - create PSVita-specific version of this
+#include "../Minecraft.Client/PSVita/Sentient/SentientManager.h"
+#include "../Minecraft.Client/PSVita/Sentient/MinecraftTelemetry.h"
 #elif defined(__linux__)
 #include "../Minecraft.Client/Windows64/Windows64_App.h"
 #include "../Minecraft.Client/Windows64Media/strings.h"
 #include "../Minecraft.Client/Windows64/Sentient/SentientTelemetryCommon.h"
 // #include "../Minecraft.Client/Windows64/Sentient/MinecraftTelemetry.h"
 #else
-#include "..\Minecraft.Client\Orbis\Orbis_App.h"
-#include "..\Minecraft.Client\OrbisMedia\strings.h"
-#include "..\Minecraft.Client\Orbis\Sentient\SentientTelemetryCommon.h"
-#include "..\Minecraft.Client\Orbis\Sentient\MinecraftTelemetry.h"
+#include "../Minecraft.Client/Orbis/Orbis_App.h"
+#include "../Minecraft.Client/OrbisMedia/strings.h"
+#include "../Minecraft.Client/Orbis/Sentient/SentientTelemetryCommon.h"
+#include "../Minecraft.Client/Orbis/Sentient/MinecraftTelemetry.h"
 #endif
 
 #include "../Minecraft.Client/Common/DLC/DLCSkinFile.h"
diff --git a/Minecraft.World/x64headers/extraX64.h b/Minecraft.World/x64headers/extraX64.h
index 4ee5a6cb..c5bf0aea 100644
--- a/Minecraft.World/x64headers/extraX64.h
+++ b/Minecraft.World/x64headers/extraX64.h
@@ -65,8 +65,8 @@ inline void LeaveCriticalSection( CRITICAL_SECTION* stubEnterCS)
 #include <net.h>
 #include <np/np_npid.h>
 #include <user_service.h>
-#include "..\..\Minecraft.Client\Orbis\Orbis_PlayerUID.h"
-#include "..\..\Minecraft.Client\Orbis\Network\SQRNetworkManager_Orbis.h"
+#include "../../Minecraft.Client/Orbis/Orbis_PlayerUID.h"
+#include "../../Minecraft.Client/Orbis/Network/SQRNetworkManager_Orbis.h"
 typedef SQRNetworkManager_Orbis::SessionID SessionID;
 typedef SQRNetworkManager_Orbis::PresenceSyncInfo INVITE_INFO;
 
@@ -76,8 +76,8 @@ typedef SQRNetworkManager_Orbis::PresenceSyncInfo INVITE_INFO;
 #include <netex/libnetctl.h>
 #include <assert.h>
 #include <stdlib.h>
-#include "..\..\Minecraft.Client\PS3\PS3_PlayerUID.h"
-#include "..\..\Minecraft.Client\PS3\Network\SQRNetworkManager_PS3.h"
+#include "../../Minecraft.Client/PS3/PS3_PlayerUID.h"
+#include "../../Minecraft.Client/PS3/Network/SQRNetworkManager_PS3.h"
 typedef SQRNetworkManager::SessionID SessionID;
 typedef SQRNetworkManager::PresenceSyncInfo INVITE_INFO;
 
@@ -85,15 +85,15 @@ typedef SQRNetworkManager::PresenceSyncInfo INVITE_INFO;
 #include <np.h>
 #include <assert.h>
 #include <stdlib.h>
-#include "..\..\Minecraft.Client\PSVita\PSVita_PlayerUID.h"
-#include "..\..\Minecraft.Client\PSVita\Network\SQRNetworkManager_Vita.h"
-#include "..\..\Minecraft.Client\PSVita\Network\SQRNetworkManager_AdHoc_Vita.h"
+#include "../../Minecraft.Client/PSVita/PSVita_PlayerUID.h"
+#include "../../Minecraft.Client/PSVita/Network/SQRNetworkManager_Vita.h"
+#include "../../Minecraft.Client/PSVita/Network/SQRNetworkManager_AdHoc_Vita.h"
 typedef SQRNetworkManager_Vita::SessionID SessionID;
 typedef SQRNetworkManager_Vita::PresenceSyncInfo INVITE_INFO;
 
 #elif defined _DURANGO
-#include "..\..\Minecraft.Client\Durango\4JLibs\inc\4J_Profile.h"
-#include "..\..\Minecraft.Client\Durango\Network\DQRNetworkManager.h"
+#include "../../Minecraft.Client/Durango/4JLibs/inc/4J_Profile.h"
+#include "../../Minecraft.Client/Durango/Network/DQRNetworkManager.h"
 typedef ULONGLONG SessionID;
 typedef ULONGLONG GameSessionUID;
 typedef DQRNetworkManager::SessionInfo INVITE_INFO;