diff --git a/MinecraftConsoles.sln b/MinecraftConsoles.sln
index 9b81943e..76d7cd4a 100644
--- a/MinecraftConsoles.sln
+++ b/MinecraftConsoles.sln
@@ -9,59 +9,41 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Minecraft.Client", "Minecra
 	EndProjectSection
 EndProject
 Global
-	GlobalSection(TeamFoundationVersionControl) = preSolution
-		SccNumberOfProjects = 3
-		SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
-		SccTeamFoundationServer = https://tfs4jstudios.visualstudio.com/defaultcollection
-		SccLocalPath0 = .
-		SccProjectUniqueName1 = Minecraft.World\\Minecraft.World.vcxproj
-		SccProjectName1 = Minecraft.World
-		SccLocalPath1 = Minecraft.World
-		SccProjectUniqueName2 = Minecraft.Client\\Minecraft.Client.vcxproj
-		SccProjectName2 = Minecraft.Client
-		SccLocalPath2 = Minecraft.Client
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		ContentPackage_NO_TU|Durango = ContentPackage_NO_TU|Durango
 		ContentPackage_NO_TU|ORBIS = ContentPackage_NO_TU|ORBIS
 		ContentPackage_NO_TU|PS3 = ContentPackage_NO_TU|PS3
 		ContentPackage_NO_TU|PSVita = ContentPackage_NO_TU|PSVita
-		ContentPackage_NO_TU|Win32 = ContentPackage_NO_TU|Win32
 		ContentPackage_NO_TU|Windows64 = ContentPackage_NO_TU|Windows64
 		ContentPackage_NO_TU|Xbox 360 = ContentPackage_NO_TU|Xbox 360
 		CONTENTPACKAGE_SYMBOLS|Durango = CONTENTPACKAGE_SYMBOLS|Durango
 		CONTENTPACKAGE_SYMBOLS|ORBIS = CONTENTPACKAGE_SYMBOLS|ORBIS
 		CONTENTPACKAGE_SYMBOLS|PS3 = CONTENTPACKAGE_SYMBOLS|PS3
 		CONTENTPACKAGE_SYMBOLS|PSVita = CONTENTPACKAGE_SYMBOLS|PSVita
-		CONTENTPACKAGE_SYMBOLS|Win32 = CONTENTPACKAGE_SYMBOLS|Win32
 		CONTENTPACKAGE_SYMBOLS|Windows64 = CONTENTPACKAGE_SYMBOLS|Windows64
 		CONTENTPACKAGE_SYMBOLS|Xbox 360 = CONTENTPACKAGE_SYMBOLS|Xbox 360
 		ContentPackage|Durango = ContentPackage|Durango
 		ContentPackage|ORBIS = ContentPackage|ORBIS
 		ContentPackage|PS3 = ContentPackage|PS3
 		ContentPackage|PSVita = ContentPackage|PSVita
-		ContentPackage|Win32 = ContentPackage|Win32
 		ContentPackage|Windows64 = ContentPackage|Windows64
 		ContentPackage|Xbox 360 = ContentPackage|Xbox 360
 		Debug|Durango = Debug|Durango
 		Debug|ORBIS = Debug|ORBIS
 		Debug|PS3 = Debug|PS3
 		Debug|PSVita = Debug|PSVita
-		Debug|Win32 = Debug|Win32
 		Debug|Windows64 = Debug|Windows64
 		Debug|Xbox 360 = Debug|Xbox 360
 		Release|Durango = Release|Durango
 		Release|ORBIS = Release|ORBIS
 		Release|PS3 = Release|PS3
 		Release|PSVita = Release|PSVita
-		Release|Win32 = Release|Win32
 		Release|Windows64 = Release|Windows64
 		Release|Xbox 360 = Release|Xbox 360
 		ReleaseForArt|Durango = ReleaseForArt|Durango
 		ReleaseForArt|ORBIS = ReleaseForArt|ORBIS
 		ReleaseForArt|PS3 = ReleaseForArt|PS3
 		ReleaseForArt|PSVita = ReleaseForArt|PSVita
-		ReleaseForArt|Win32 = ReleaseForArt|Win32
 		ReleaseForArt|Windows64 = ReleaseForArt|Windows64
 		ReleaseForArt|Xbox 360 = ReleaseForArt|Xbox 360
 	EndGlobalSection
@@ -74,8 +56,6 @@ Global
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ContentPackage_NO_TU|PS3.Build.0 = ContentPackage_NO_TU|PS3
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ContentPackage_NO_TU|PSVita.ActiveCfg = ContentPackage_NO_TU|PSVita
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ContentPackage_NO_TU|PSVita.Build.0 = ContentPackage_NO_TU|PSVita
-		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ContentPackage_NO_TU|Win32.ActiveCfg = ContentPackage_Vita|Win32
-		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ContentPackage_NO_TU|Win32.Build.0 = ContentPackage_NO_TU|Win32
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ContentPackage_NO_TU|Windows64.ActiveCfg = ContentPackage_NO_TU|x64
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ContentPackage_NO_TU|Xbox 360.ActiveCfg = ContentPackage_NO_TU|Xbox 360
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ContentPackage_NO_TU|Xbox 360.Build.0 = ContentPackage_NO_TU|Xbox 360
@@ -87,8 +67,6 @@ Global
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.CONTENTPACKAGE_SYMBOLS|PS3.ActiveCfg = CONTENTPACKAGE_SYMBOLS|PS3
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.CONTENTPACKAGE_SYMBOLS|PS3.Build.0 = CONTENTPACKAGE_SYMBOLS|PS3
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.CONTENTPACKAGE_SYMBOLS|PSVita.ActiveCfg = CONTENTPACKAGE_SYMBOLS|PSVita
-		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.CONTENTPACKAGE_SYMBOLS|Win32.ActiveCfg = CONTENTPACKAGE_SYMBOLS|Win32
-		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.CONTENTPACKAGE_SYMBOLS|Win32.Build.0 = CONTENTPACKAGE_SYMBOLS|Win32
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.CONTENTPACKAGE_SYMBOLS|Windows64.ActiveCfg = CONTENTPACKAGE_SYMBOLS|x64
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.CONTENTPACKAGE_SYMBOLS|Xbox 360.ActiveCfg = CONTENTPACKAGE_SYMBOLS|Xbox 360
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.CONTENTPACKAGE_SYMBOLS|Xbox 360.Build.0 = CONTENTPACKAGE_SYMBOLS|Xbox 360
@@ -100,8 +78,6 @@ Global
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ContentPackage|PS3.Build.0 = ContentPackage|PS3
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ContentPackage|PSVita.ActiveCfg = ContentPackage|PSVita
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ContentPackage|PSVita.Build.0 = ContentPackage|PSVita
-		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ContentPackage|Win32.ActiveCfg = ContentPackage|Win32
-		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ContentPackage|Win32.Build.0 = ContentPackage|Win32
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ContentPackage|Windows64.ActiveCfg = ContentPackage|x64
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ContentPackage|Windows64.Build.0 = ContentPackage|x64
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ContentPackage|Xbox 360.ActiveCfg = ContentPackage|Xbox 360
@@ -116,8 +92,6 @@ Global
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.Debug|PS3.Build.0 = Debug|PS3
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.Debug|PSVita.ActiveCfg = Debug|PSVita
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.Debug|PSVita.Build.0 = Debug|PSVita
-		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.Debug|Win32.Build.0 = Debug|Win32
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.Debug|Windows64.ActiveCfg = Debug|x64
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.Debug|Windows64.Build.0 = Debug|x64
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
@@ -131,8 +105,6 @@ Global
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.Release|PS3.Build.0 = Release|PS3
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.Release|PSVita.ActiveCfg = Release|PSVita
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.Release|PSVita.Build.0 = Release|PSVita
-		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.Release|Win32.ActiveCfg = Release|Win32
-		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.Release|Win32.Build.0 = Release|Win32
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.Release|Windows64.ActiveCfg = Release|x64
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.Release|Windows64.Build.0 = Release|x64
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
@@ -144,8 +116,6 @@ Global
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ReleaseForArt|PS3.Build.0 = ReleaseForArt|PS3
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ReleaseForArt|PSVita.ActiveCfg = ReleaseForArt|PSVita
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ReleaseForArt|PSVita.Build.0 = ReleaseForArt|PSVita
-		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ReleaseForArt|Win32.ActiveCfg = ReleaseForArt|Win32
-		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ReleaseForArt|Win32.Build.0 = ReleaseForArt|Win32
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ReleaseForArt|Windows64.ActiveCfg = ReleaseForArt|x64
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ReleaseForArt|Xbox 360.ActiveCfg = ReleaseForArt|Xbox 360
 		{F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ReleaseForArt|Xbox 360.Build.0 = ReleaseForArt|Xbox 360
@@ -157,8 +127,6 @@ Global
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ContentPackage_NO_TU|PS3.Build.0 = ContentPackage_NO_TU|PS3
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ContentPackage_NO_TU|PSVita.ActiveCfg = ContentPackage_NO_TU|PSVita
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ContentPackage_NO_TU|PSVita.Build.0 = ContentPackage_NO_TU|PSVita
-		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ContentPackage_NO_TU|Win32.ActiveCfg = ContentPackage_Vita|Win32
-		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ContentPackage_NO_TU|Win32.Build.0 = ContentPackage_NO_TU|Win32
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ContentPackage_NO_TU|Windows64.ActiveCfg = ContentPackage_NO_TU|x64
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ContentPackage_NO_TU|Xbox 360.ActiveCfg = ContentPackage_NO_TU|Xbox 360
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ContentPackage_NO_TU|Xbox 360.Build.0 = ContentPackage_NO_TU|Xbox 360
@@ -170,8 +138,6 @@ Global
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.CONTENTPACKAGE_SYMBOLS|PS3.ActiveCfg = CONTENTPACKAGE_SYMBOLS|PS3
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.CONTENTPACKAGE_SYMBOLS|PS3.Build.0 = CONTENTPACKAGE_SYMBOLS|PS3
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.CONTENTPACKAGE_SYMBOLS|PSVita.ActiveCfg = CONTENTPACKAGE_SYMBOLS|PSVita
-		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.CONTENTPACKAGE_SYMBOLS|Win32.ActiveCfg = CONTENTPACKAGE_SYMBOLS|Win32
-		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.CONTENTPACKAGE_SYMBOLS|Win32.Build.0 = CONTENTPACKAGE_SYMBOLS|Win32
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.CONTENTPACKAGE_SYMBOLS|Windows64.ActiveCfg = CONTENTPACKAGE_SYMBOLS|x64
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.CONTENTPACKAGE_SYMBOLS|Xbox 360.ActiveCfg = CONTENTPACKAGE_SYMBOLS|Xbox 360
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.CONTENTPACKAGE_SYMBOLS|Xbox 360.Build.0 = CONTENTPACKAGE_SYMBOLS|Xbox 360
@@ -184,8 +150,6 @@ Global
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ContentPackage|PS3.Build.0 = ContentPackage|PS3
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ContentPackage|PSVita.ActiveCfg = ContentPackage|PSVita
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ContentPackage|PSVita.Build.0 = ContentPackage|PSVita
-		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ContentPackage|Win32.ActiveCfg = ContentPackage|Win32
-		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ContentPackage|Win32.Build.0 = ContentPackage|Win32
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ContentPackage|Windows64.ActiveCfg = ContentPackage|Xbox 360
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ContentPackage|Xbox 360.ActiveCfg = ContentPackage|Xbox 360
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ContentPackage|Xbox 360.Build.0 = ContentPackage|Xbox 360
@@ -200,8 +164,6 @@ Global
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.Debug|PS3.Build.0 = Debug|PS3
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.Debug|PSVita.ActiveCfg = Debug|PSVita
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.Debug|PSVita.Build.0 = Debug|PSVita
-		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.Debug|Win32.Build.0 = Debug|Win32
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.Debug|Windows64.ActiveCfg = Debug|x64
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.Debug|Windows64.Build.0 = Debug|x64
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
@@ -216,8 +178,6 @@ Global
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.Release|PS3.Build.0 = Release|PS3
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.Release|PSVita.ActiveCfg = Release|PSVita
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.Release|PSVita.Build.0 = Release|PSVita
-		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.Release|Win32.ActiveCfg = Release|Win32
-		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.Release|Win32.Build.0 = Release|Win32
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.Release|Windows64.ActiveCfg = Release|x64
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.Release|Windows64.Build.0 = Release|x64
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.Release|Windows64.Deploy.0 = Release|x64
@@ -230,8 +190,6 @@ Global
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ReleaseForArt|PS3.Build.0 = ReleaseForArt|PS3
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ReleaseForArt|PSVita.ActiveCfg = ReleaseForArt|PSVita
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ReleaseForArt|PSVita.Build.0 = ReleaseForArt|PSVita
-		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ReleaseForArt|Win32.ActiveCfg = ReleaseForArt|Win32
-		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ReleaseForArt|Win32.Build.0 = ReleaseForArt|Win32
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ReleaseForArt|Windows64.ActiveCfg = ReleaseForArt|x64
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ReleaseForArt|Xbox 360.ActiveCfg = Release|Xbox 360
 		{1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ReleaseForArt|Xbox 360.Build.0 = Release|Xbox 360