diff --git a/VC2010/MCServer.vcxproj b/VC2010/MCServer.vcxproj
index d09c31119..abf8276e9 100644
--- a/VC2010/MCServer.vcxproj
+++ b/VC2010/MCServer.vcxproj
@@ -440,54 +440,6 @@
     <ClCompile Include="..\source\cLog.cpp" />
     <ClCompile Include="..\source\Bindings.cpp" />
     <ClCompile Include="..\source\main.cpp" />
-    <ClCompile Include="..\source\packets\cPacket.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_13.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_AddToInventory.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_ArmAnim.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_BlockAction.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_BlockChange.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_BlockDig.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_BlockPlace.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_Chat.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_CollectItem.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_DestroyEntity.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_Disconnect.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_EntityEquipment.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_CreativeInventoryAction.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_Explosion.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_ItemData.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_NewInvalidState.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_Player.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_SoundEffect.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_Thunderbolt.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_EntityLook.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_EntityStatus.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_Flying.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_Handshake.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_InventoryProgressBar.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_InventorySlot.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_ItemSwitch.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_KeepAlive.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_Login.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_MapChunk.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_Metadata.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_MultiBlock.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_NamedEntitySpawn.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_PickupSpawn.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_PreChunk.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_RelativeEntityMove.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_RelativeEntityMoveLook.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_Respawn.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_SpawnMob.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_TeleportEntity.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_TimeUpdate.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_UpdateHealth.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_UpdateSign.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_UseEntity.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_WholeInventory.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_WindowClick.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_WindowClose.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_WindowOpen.cpp" />
     <ClCompile Include="..\source\Protocol125.cpp" />
     <ClCompile Include="..\source\Ravines.cpp" />
     <ClCompile Include="..\source\squirrelbindings\SquirrelBindings.cpp" />
@@ -640,7 +592,6 @@
     <ClInclude Include="..\source\cWolf.h" />
     <ClInclude Include="..\source\cZombie.h" />
     <ClInclude Include="..\source\cZombiepigman.h" />
-    <ClInclude Include="..\source\Endianness.h" />
     <ClInclude Include="..\source\FastNBT.h" />
     <ClInclude Include="..\Source\FileDefine.h" />
     <ClInclude Include="..\source\FinishGen.h" />
@@ -693,56 +644,6 @@
     <ClInclude Include="..\source\Bindings.h" />
     <ClInclude Include="..\source\Defines.h" />
     <ClInclude Include="..\source\MCSocket.h" />
-    <ClInclude Include="..\Source\PacketID.h" />
-    <ClInclude Include="..\source\packets\cPacket.h" />
-    <ClInclude Include="..\source\packets\cPacket_13.h" />
-    <ClInclude Include="..\source\packets\cPacket_AddToInventory.h" />
-    <ClInclude Include="..\source\packets\cPacket_ArmAnim.h" />
-    <ClInclude Include="..\source\packets\cPacket_BlockAction.h" />
-    <ClInclude Include="..\source\packets\cPacket_BlockChange.h" />
-    <ClInclude Include="..\source\packets\cPacket_BlockDig.h" />
-    <ClInclude Include="..\source\packets\cPacket_BlockPlace.h" />
-    <ClInclude Include="..\source\packets\cPacket_Chat.h" />
-    <ClInclude Include="..\source\packets\cPacket_CollectItem.h" />
-    <ClInclude Include="..\source\packets\cPacket_DestroyEntity.h" />
-    <ClInclude Include="..\source\packets\cPacket_Disconnect.h" />
-    <ClInclude Include="..\source\packets\cPacket_EntityEquipment.h" />
-    <ClInclude Include="..\source\packets\cPacket_CreativeInventoryAction.h" />
-    <ClInclude Include="..\source\packets\cPacket_Explosion.h" />
-    <ClInclude Include="..\source\packets\cPacket_ItemData.h" />
-    <ClInclude Include="..\source\packets\cPacket_NewInvalidState.h" />
-    <ClInclude Include="..\source\packets\cPacket_Player.h" />
-    <ClInclude Include="..\source\packets\cPacket_SoundEffect.h" />
-    <ClInclude Include="..\source\packets\cPacket_Thunderbolt.h" />
-    <ClInclude Include="..\source\packets\cPacket_EntityLook.h" />
-    <ClInclude Include="..\source\packets\cPacket_EntityStatus.h" />
-    <ClInclude Include="..\source\packets\cPacket_Flying.h" />
-    <ClInclude Include="..\source\packets\cPacket_Handshake.h" />
-    <ClInclude Include="..\source\packets\cPacket_InventoryProgressBar.h" />
-    <ClInclude Include="..\source\packets\cPacket_InventorySlot.h" />
-    <ClInclude Include="..\source\packets\cPacket_ItemSwitch.h" />
-    <ClInclude Include="..\source\packets\cPacket_KeepAlive.h" />
-    <ClInclude Include="..\source\packets\cPacket_Login.h" />
-    <ClInclude Include="..\source\packets\cPacket_MapChunk.h" />
-    <ClInclude Include="..\source\packets\cPacket_Metadata.h" />
-    <ClInclude Include="..\source\packets\cPacket_MultiBlock.h" />
-    <ClInclude Include="..\source\packets\cPacket_NamedEntitySpawn.h" />
-    <ClInclude Include="..\source\packets\cPacket_PickupSpawn.h" />
-    <ClInclude Include="..\source\packets\cPacket_Ping.h" />
-    <ClInclude Include="..\source\packets\cPacket_PreChunk.h" />
-    <ClInclude Include="..\source\packets\cPacket_RelativeEntityMove.h" />
-    <ClInclude Include="..\source\packets\cPacket_RelativeEntityMoveLook.h" />
-    <ClInclude Include="..\source\packets\cPacket_Respawn.h" />
-    <ClInclude Include="..\source\packets\cPacket_SpawnMob.h" />
-    <ClInclude Include="..\source\packets\cPacket_TeleportEntity.h" />
-    <ClInclude Include="..\source\packets\cPacket_TimeUpdate.h" />
-    <ClInclude Include="..\source\packets\cPacket_UpdateHealth.h" />
-    <ClInclude Include="..\source\packets\cPacket_UpdateSign.h" />
-    <ClInclude Include="..\source\packets\cPacket_UseEntity.h" />
-    <ClInclude Include="..\source\packets\cPacket_WholeInventory.h" />
-    <ClInclude Include="..\source\packets\cPacket_WindowClick.h" />
-    <ClInclude Include="..\source\packets\cPacket_WindowClose.h" />
-    <ClInclude Include="..\source\packets\cPacket_WindowOpen.h" />
     <ClInclude Include="..\source\Protocol.h" />
     <ClInclude Include="..\source\Protocol125.h" />
     <ClInclude Include="..\source\ProtocolRecognizer.h" />
diff --git a/VC2010/MCServer.vcxproj.filters b/VC2010/MCServer.vcxproj.filters
index 6c3f1286b..e8e135db2 100644
--- a/VC2010/MCServer.vcxproj.filters
+++ b/VC2010/MCServer.vcxproj.filters
@@ -4,9 +4,6 @@
     <Filter Include="cServer">
       <UniqueIdentifier>{dfd626b9-e4f3-4e75-8fc7-08f2f16e5a55}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Packets">
-      <UniqueIdentifier>{8dc617d0-d278-4929-ab5c-96e029e10fa8}</UniqueIdentifier>
-    </Filter>
     <Filter Include="cWorld">
       <UniqueIdentifier>{736bc295-d93a-480b-a463-3ca7524769f4}</UniqueIdentifier>
     </Filter>
@@ -118,36 +115,6 @@
     <Filter Include="Vector3f">
       <UniqueIdentifier>{41910410-2124-41dc-b6b4-93244a2f538f}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Packets\cPacket_SpawnMob">
-      <UniqueIdentifier>{d1977549-4376-4007-89d6-d086b3201db8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Packets\cPacket">
-      <UniqueIdentifier>{52c6d73d-4f3e-4a89-9085-a01ce9a98618}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Packets\cPacket_EntityLook">
-      <UniqueIdentifier>{fac98dd5-a5b0-436e-97c0-0f330b4f615a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Packets\cPacket_TeleportEntity">
-      <UniqueIdentifier>{ee80ffce-b3c0-4076-98f3-18864f1dd64c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Packets\cPacket_RelativeEntityMoveLook">
-      <UniqueIdentifier>{96b4d545-5de5-41ae-8f26-482e31884b80}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Packets\cPacket_RelativeEntityMove">
-      <UniqueIdentifier>{46203afd-ae39-4ebd-8bee-2eec9eeeae85}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Packets\cPacket_NamedEntitySpawn">
-      <UniqueIdentifier>{4273090c-2912-4c24-b524-50fd93398cf2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Packets\cPacket_UpdateHealth">
-      <UniqueIdentifier>{9748a97a-a019-45b9-b198-8c28abe51067}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Packets\cPacket_Respawn">
-      <UniqueIdentifier>{b2903385-bb48-4240-8c5b-bd8896f2c5ab}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Packets\cPacket_DestroyEntity">
-      <UniqueIdentifier>{c06db7ec-cdd8-4ad3-8f9b-9848bf706c30}</UniqueIdentifier>
-    </Filter>
     <Filter Include="cChunkMap">
       <UniqueIdentifier>{2f9bd49e-938d-4893-941e-67d4ce831673}</UniqueIdentifier>
     </Filter>
@@ -193,120 +160,21 @@
     <Filter Include="cMonsterConfig">
       <UniqueIdentifier>{2fa74dea-5267-4b30-9e29-04d283e2ef41}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Packets\cPacket_MetaData">
-      <UniqueIdentifier>{736a1704-2bdb-464e-8496-145df303bd16}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Threading\cSleep">
       <UniqueIdentifier>{8a688c48-a815-4927-a05e-f9dfea019960}</UniqueIdentifier>
     </Filter>
     <Filter Include="cTimer">
       <UniqueIdentifier>{66ee6654-6760-4100-86cc-9ad8a836366b}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Packets\cPacket_Chat">
-      <UniqueIdentifier>{b11fee8b-5a4c-45a0-b02d-6e0d00ddb23a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Packets\cPacket_Login">
-      <UniqueIdentifier>{5511c694-97c4-4842-8298-888db30d87f9}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Packets\cPacket_WindowClick">
-      <UniqueIdentifier>{378afb88-8909-455c-aaf9-4d41387b2bea}</UniqueIdentifier>
-    </Filter>
     <Filter Include="cNoise">
       <UniqueIdentifier>{58d6aa00-beab-4654-bbbd-c3b0397a9549}</UniqueIdentifier>
     </Filter>
     <Filter Include="cMakeDir">
       <UniqueIdentifier>{102fff22-0eb3-4977-9de3-307534954fbc}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Packets\cPacket_TimeUpdate">
-      <UniqueIdentifier>{3328f163-6be9-4115-aa18-a67419a40b61}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Packets\cPacket_WholeInventory">
-      <UniqueIdentifier>{cd2e819d-4dda-486a-baf4-53f6388e85bf}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Packets\cPacket_BlockDig">
-      <UniqueIdentifier>{20ed226a-712f-4994-bbbe-0bfffab344ce}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Packets\cPacket_KeepAlive">
-      <UniqueIdentifier>{00c90150-d52a-47c8-be5a-29bacf5ac41c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Packets\cPacket_Handshake">
-      <UniqueIdentifier>{dad042ce-6d1a-4a77-8bdd-a2d364e8fcf2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Packets\cPacket_ArmAnim">
-      <UniqueIdentifier>{8d8b006e-6529-4519-a479-84fb9ecfe6f6}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Packets\cPacket_PreChunk">
-      <UniqueIdentifier>{d9788dbc-116a-486a-8548-01e5cdd64610}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Packets\cPacket_BlockPlace">
-      <UniqueIdentifier>{a3d369a6-73f3-4f5c-a49f-eed532a1ab36}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Packets\cPacket_Flying">
-      <UniqueIdentifier>{b0206351-425d-4d6f-aedd-f7211648d276}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Packets\cPacket_BlockChange">
-      <UniqueIdentifier>{3a312916-5878-403d-81ba-0477a78170af}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Packets\cPacket_Disconnect">
-      <UniqueIdentifier>{f2a3c185-38de-4e72-a3aa-3cf65745f0e1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Packets\cPacket_PickupSpawn">
-      <UniqueIdentifier>{dc354068-6958-4e5f-a0ad-0c26f7bfd7ad}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Packets\cPacket_CollectItem">
-      <UniqueIdentifier>{8c01b7ec-3343-4e01-a74b-9303cdbfab4d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Packets\cPacket_AddToInventory">
-      <UniqueIdentifier>{bcc7495f-ebb5-4603-9afb-007120d6c4d9}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Packets\cPacket_ItemSwitch">
-      <UniqueIdentifier>{e4a49287-7305-4e78-8574-2707e3c6c355}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Packets\cPacket_EntityEquipment">
-      <UniqueIdentifier>{0f48e5f8-ea4d-41dc-ab9e-750c5912c778}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Packets\cPacket_NewInvalidState">
-      <UniqueIdentifier>{0c12e5f5-ea4d-10dc-ac7e-540c5562c767}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Packets\cPacket_Thunderbolt">
-      <UniqueIdentifier>{0c32e5f8-ea4d-30dc-ac8e-140c4512c668}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Packets\cPacket_UseEntity">
-      <UniqueIdentifier>{bff5658b-0806-430c-9929-062f4bd4760b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Packets\cPacket_MapChunk">
-      <UniqueIdentifier>{8380c807-fcac-4126-8624-6b09ce27f8b7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Packets\cPacket_MultiBlock">
-      <UniqueIdentifier>{234a9644-66cb-4aef-a662-e823e7d6b7b3}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Packets\cPacket_WindowOpen">
-      <UniqueIdentifier>{f547aa35-ad02-4062-8aee-2527a1e3d6d3}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Packets\cPacket_WindowClose">
-      <UniqueIdentifier>{603d6faf-af75-490b-98ef-5ae50fd351a2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Packets\cPacket_InventorySlot">
-      <UniqueIdentifier>{2ec87aff-ab1b-4b07-a010-8e0dff47308a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Packets\cPacket_InventoryProgressBar">
-      <UniqueIdentifier>{88a9df03-789c-4ac3-a977-15fdd50bd9d4}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Packets\cPacket_13">
-      <UniqueIdentifier>{6431370c-20d2-4fcc-a6ef-3c6d6953d2a6}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Packets\cPacket_UpdateSign">
-      <UniqueIdentifier>{b24372d2-16fb-4a9f-b01d-6841ecb78029}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Packets\cPacket_EntityStatus">
-      <UniqueIdentifier>{dee92edf-fe18-479a-9108-b11353e14913}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Threading\cSocket">
       <UniqueIdentifier>{82fda897-4c61-4ada-9160-8ae3982a72f8}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Packets\cPacket_Ping">
-      <UniqueIdentifier>{b5725a7d-f912-47c7-b6f0-8efca7c0279c}</UniqueIdentifier>
-    </Filter>
     <Filter Include="cEntity\cPawn\cMonster\cCavespider">
       <UniqueIdentifier>{e40e3231-e432-48fc-9958-d00f7486ee73}</UniqueIdentifier>
     </Filter>
@@ -361,18 +229,6 @@
     <Filter Include="LuaBindings\SquirrelBindings">
       <UniqueIdentifier>{a71ee043-df55-4d42-a9aa-1643b40e1c22}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Packets\cPacket_Explosion">
-      <UniqueIdentifier>{0a6d025d-4fb8-4557-a348-004b819ea477}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Packets\cPacket_BlockAction">
-      <UniqueIdentifier>{e7503f74-0963-428a-a0fc-0b3bc1c81f99}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Packets\cPacket_SoundEffect">
-      <UniqueIdentifier>{faf55c04-f56e-4f41-a948-54232627c3a9}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Packets\cPacket_ItemData">
-      <UniqueIdentifier>{fcc08e08-8dba-47b4-89b0-5dc255bb9b8a}</UniqueIdentifier>
-    </Filter>
     <Filter Include="cEntity\cPawn\cMonster\Personalities">
       <UniqueIdentifier>{b0f7c883-e2ca-4bba-89e3-c36656c3de39}</UniqueIdentifier>
     </Filter>
@@ -409,9 +265,6 @@
     <Filter Include="Simulator\cSimulator\cSandSimulator">
       <UniqueIdentifier>{c5389fa9-20dd-4c52-ac16-2ef0a1115cf1}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Packets\cPacket_CreativeInventoryAction">
-      <UniqueIdentifier>{0c47e5f8-ea4d-40dc-ac8e-740c5512c768}</UniqueIdentifier>
-    </Filter>
     <Filter Include="cInventory\cSurvivalInventory">
       <UniqueIdentifier>{a471def4-c86d-4cc1-bcbb-1004731690bb}</UniqueIdentifier>
     </Filter>
@@ -565,36 +418,6 @@
     <ClCompile Include="..\source\Vector3i.cpp">
       <Filter>Vector3f</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket_SpawnMob.cpp">
-      <Filter>Packets\cPacket_SpawnMob</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket.cpp">
-      <Filter>Packets\cPacket</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket_EntityLook.cpp">
-      <Filter>Packets\cPacket_EntityLook</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket_TeleportEntity.cpp">
-      <Filter>Packets\cPacket_TeleportEntity</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket_RelativeEntityMoveLook.cpp">
-      <Filter>Packets\cPacket_RelativeEntityMoveLook</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket_RelativeEntityMove.cpp">
-      <Filter>Packets\cPacket_RelativeEntityMove</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket_NamedEntitySpawn.cpp">
-      <Filter>Packets\cPacket_NamedEntitySpawn</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket_UpdateHealth.cpp">
-      <Filter>Packets\cPacket_UpdateHealth</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket_Respawn.cpp">
-      <Filter>Packets\cPacket_Respawn</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket_DestroyEntity.cpp">
-      <Filter>Packets\cPacket_DestroyEntity</Filter>
-    </ClCompile>
     <ClCompile Include="..\Source\cChunkMap.cpp">
       <Filter>cChunkMap</Filter>
     </ClCompile>
@@ -637,24 +460,12 @@
     <ClCompile Include="..\source\cMonsterConfig.cpp">
       <Filter>cMonsterConfig</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket_Metadata.cpp">
-      <Filter>Packets\cPacket_MetaData</Filter>
-    </ClCompile>
     <ClCompile Include="..\source\cSleep.cpp">
       <Filter>Threading\cSleep</Filter>
     </ClCompile>
     <ClCompile Include="..\source\cTimer.cpp">
       <Filter>cTimer</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket_Chat.cpp">
-      <Filter>Packets\cPacket_Chat</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket_Login.cpp">
-      <Filter>Packets\cPacket_Login</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket_WindowClick.cpp">
-      <Filter>Packets\cPacket_WindowClick</Filter>
-    </ClCompile>
     <ClCompile Include="..\source\cCuboid.cpp">
       <Filter>Vector3f</Filter>
     </ClCompile>
@@ -664,90 +475,6 @@
     <ClCompile Include="..\source\cMakeDir.cpp">
       <Filter>cMakeDir</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket_TimeUpdate.cpp">
-      <Filter>Packets\cPacket_TimeUpdate</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket_WholeInventory.cpp">
-      <Filter>Packets\cPacket_WholeInventory</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket_BlockDig.cpp">
-      <Filter>Packets\cPacket_BlockDig</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket_KeepAlive.cpp">
-      <Filter>Packets\cPacket_KeepAlive</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket_Handshake.cpp">
-      <Filter>Packets\cPacket_Handshake</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket_ArmAnim.cpp">
-      <Filter>Packets\cPacket_ArmAnim</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket_PreChunk.cpp">
-      <Filter>Packets\cPacket_PreChunk</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket_BlockPlace.cpp">
-      <Filter>Packets\cPacket_BlockPlace</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket_Flying.cpp">
-      <Filter>Packets\cPacket_Flying</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket_BlockChange.cpp">
-      <Filter>Packets\cPacket_BlockChange</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket_Disconnect.cpp">
-      <Filter>Packets\cPacket_Disconnect</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket_PickupSpawn.cpp">
-      <Filter>Packets\cPacket_PickupSpawn</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket_CollectItem.cpp">
-      <Filter>Packets\cPacket_CollectItem</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket_AddToInventory.cpp">
-      <Filter>Packets\cPacket_AddToInventory</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket_ItemSwitch.cpp">
-      <Filter>Packets\cPacket_ItemSwitch</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket_EntityEquipment.cpp">
-      <Filter>Packets\cPacket_EntityEquipment</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket_NewInvalidState.cpp">
-      <Filter>Packets\cPacket_NewInvalidState</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket_Thunderbolt.cpp">
-      <Filter>Packets\cPacket_Thunderbolt</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket_UseEntity.cpp">
-      <Filter>Packets\cPacket_UseEntity</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket_MapChunk.cpp">
-      <Filter>Packets\cPacket_MapChunk</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket_MultiBlock.cpp">
-      <Filter>Packets\cPacket_MultiBlock</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket_WindowOpen.cpp">
-      <Filter>Packets\cPacket_WindowOpen</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket_WindowClose.cpp">
-      <Filter>Packets\cPacket_WindowClose</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket_InventorySlot.cpp">
-      <Filter>Packets\cPacket_InventorySlot</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket_InventoryProgressBar.cpp">
-      <Filter>Packets\cPacket_InventoryProgressBar</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket_13.cpp">
-      <Filter>Packets\cPacket_13</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket_UpdateSign.cpp">
-      <Filter>Packets\cPacket_UpdateSign</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket_EntityStatus.cpp">
-      <Filter>Packets\cPacket_EntityStatus</Filter>
-    </ClCompile>
     <ClCompile Include="..\source\cWaterSimulator.cpp">
       <Filter>Simulator\cSimulator\cFluidSimulator\cWaterSimulator</Filter>
     </ClCompile>
@@ -814,18 +541,6 @@
     <ClCompile Include="..\source\cLavaSimulator.cpp">
       <Filter>Simulator\cSimulator\cFluidSimulator\cLavaSimulator</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket_Explosion.cpp">
-      <Filter>Packets\cPacket_Explosion</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket_BlockAction.cpp">
-      <Filter>Packets\cPacket_BlockAction</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket_SoundEffect.cpp">
-      <Filter>Packets\cPacket_SoundEffect</Filter>
-    </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket_ItemData.cpp">
-      <Filter>Packets\cPacket_ItemData</Filter>
-    </ClCompile>
     <ClCompile Include="..\source\cFluidSimulator.cpp">
       <Filter>Simulator\cSimulator\cFluidSimulator</Filter>
     </ClCompile>
@@ -850,9 +565,6 @@
     <ClCompile Include="..\source\cFireSimulator.cpp">
       <Filter>Simulator\cSimulator\cFireSimulator</Filter>
     </ClCompile>
-    <ClCompile Include="..\source\packets\cPacket_CreativeInventoryAction.cpp">
-      <Filter>Packets\cPacket_CreativeInventoryAction</Filter>
-    </ClCompile>
     <ClCompile Include="..\source\cCreativeInventory.cpp">
       <Filter>cInventory\cCreativeInventory</Filter>
     </ClCompile>
@@ -875,9 +587,6 @@
       <Filter>Simulator\cSimulator\cRedstoneSimulator</Filter>
     </ClCompile>
     <ClCompile Include="..\source\ChunkSender.cpp" />
-    <ClCompile Include="..\source\packets\cPacket_Player.cpp">
-      <Filter>Packets</Filter>
-    </ClCompile>
     <ClCompile Include="..\source\cChunkGenerator.cpp">
       <Filter>Generating</Filter>
     </ClCompile>
@@ -1069,9 +778,6 @@
     <ClInclude Include="..\Source\ManualBindings.h">
       <Filter>LuaBindings</Filter>
     </ClInclude>
-    <ClInclude Include="..\Source\PacketID.h">
-      <Filter>Packets</Filter>
-    </ClInclude>
     <ClInclude Include="..\Source\BlockID.h" />
     <ClInclude Include="..\Source\FileDefine.h" />
     <ClInclude Include="..\source\cStringMap.h">
@@ -1110,36 +816,6 @@
     <ClInclude Include="..\source\Vector3i.h">
       <Filter>Vector3f</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_SpawnMob.h">
-      <Filter>Packets\cPacket_SpawnMob</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket.h">
-      <Filter>Packets\cPacket</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_EntityLook.h">
-      <Filter>Packets\cPacket_EntityLook</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_TeleportEntity.h">
-      <Filter>Packets\cPacket_TeleportEntity</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_RelativeEntityMoveLook.h">
-      <Filter>Packets\cPacket_RelativeEntityMoveLook</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_RelativeEntityMove.h">
-      <Filter>Packets\cPacket_RelativeEntityMove</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_NamedEntitySpawn.h">
-      <Filter>Packets\cPacket_NamedEntitySpawn</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_UpdateHealth.h">
-      <Filter>Packets\cPacket_UpdateHealth</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_Respawn.h">
-      <Filter>Packets\cPacket_Respawn</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_DestroyEntity.h">
-      <Filter>Packets\cPacket_DestroyEntity</Filter>
-    </ClInclude>
     <ClInclude Include="..\Source\cChunkMap.h">
       <Filter>cChunkMap</Filter>
     </ClInclude>
@@ -1182,24 +858,12 @@
     <ClInclude Include="..\source\cMonsterConfig.h">
       <Filter>cMonsterConfig</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_Metadata.h">
-      <Filter>Packets\cPacket_MetaData</Filter>
-    </ClInclude>
     <ClInclude Include="..\source\cSleep.h">
       <Filter>Threading\cSleep</Filter>
     </ClInclude>
     <ClInclude Include="..\source\cTimer.h">
       <Filter>cTimer</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_Chat.h">
-      <Filter>Packets\cPacket_Chat</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_Login.h">
-      <Filter>Packets\cPacket_Login</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_WindowClick.h">
-      <Filter>Packets\cPacket_WindowClick</Filter>
-    </ClInclude>
     <ClInclude Include="..\source\cCuboid.h">
       <Filter>Vector3f</Filter>
     </ClInclude>
@@ -1209,102 +873,12 @@
     <ClInclude Include="..\source\cMakeDir.h">
       <Filter>cMakeDir</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_TimeUpdate.h">
-      <Filter>Packets\cPacket_TimeUpdate</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_WholeInventory.h">
-      <Filter>Packets\cPacket_WholeInventory</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_BlockDig.h">
-      <Filter>Packets\cPacket_BlockDig</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_KeepAlive.h">
-      <Filter>Packets\cPacket_KeepAlive</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_Handshake.h">
-      <Filter>Packets\cPacket_Handshake</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_ArmAnim.h">
-      <Filter>Packets\cPacket_ArmAnim</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_PreChunk.h">
-      <Filter>Packets\cPacket_PreChunk</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_BlockPlace.h">
-      <Filter>Packets\cPacket_BlockPlace</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_Flying.h">
-      <Filter>Packets\cPacket_Flying</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_BlockChange.h">
-      <Filter>Packets\cPacket_BlockChange</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_Disconnect.h">
-      <Filter>Packets\cPacket_Disconnect</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_PickupSpawn.h">
-      <Filter>Packets\cPacket_PickupSpawn</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_CollectItem.h">
-      <Filter>Packets\cPacket_CollectItem</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_AddToInventory.h">
-      <Filter>Packets\cPacket_AddToInventory</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_ItemSwitch.h">
-      <Filter>Packets\cPacket_ItemSwitch</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_EntityEquipment.h">
-      <Filter>Packets\cPacket_EntityEquipment</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_NewInvalidState.h">
-      <Filter>Packets\cPacket_NewInvalidState</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_Thunderbolt.h">
-      <Filter>Packets\cPacket_Thunderbolt</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_UseEntity.h">
-      <Filter>Packets\cPacket_UseEntity</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_MapChunk.h">
-      <Filter>Packets\cPacket_MapChunk</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_MultiBlock.h">
-      <Filter>Packets\cPacket_MultiBlock</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_WindowOpen.h">
-      <Filter>Packets\cPacket_WindowOpen</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_WindowClose.h">
-      <Filter>Packets\cPacket_WindowClose</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_InventorySlot.h">
-      <Filter>Packets\cPacket_InventorySlot</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_InventoryProgressBar.h">
-      <Filter>Packets\cPacket_InventoryProgressBar</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_13.h">
-      <Filter>Packets\cPacket_13</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_UpdateSign.h">
-      <Filter>Packets\cPacket_UpdateSign</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_EntityStatus.h">
-      <Filter>Packets\cPacket_EntityStatus</Filter>
-    </ClInclude>
     <ClInclude Include="..\source\cWaterSimulator.h">
       <Filter>Simulator\cSimulator\cFluidSimulator\cWaterSimulator</Filter>
     </ClInclude>
     <ClInclude Include="..\source\cSocket.h">
       <Filter>Threading\cSocket</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\Endianness.h">
-      <Filter>Packets</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_Ping.h">
-      <Filter>Packets\cPacket_Ping</Filter>
-    </ClInclude>
     <ClInclude Include="..\source\cCavespider.h">
       <Filter>cEntity\cPawn\cMonster\cCavespider</Filter>
     </ClInclude>
@@ -1362,18 +936,6 @@
     <ClInclude Include="..\source\cLavaSimulator.h">
       <Filter>Simulator\cSimulator\cFluidSimulator\cLavaSimulator</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_Explosion.h">
-      <Filter>Packets\cPacket_Explosion</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_BlockAction.h">
-      <Filter>Packets\cPacket_BlockAction</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_SoundEffect.h">
-      <Filter>Packets\cPacket_SoundEffect</Filter>
-    </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_ItemData.h">
-      <Filter>Packets\cPacket_ItemData</Filter>
-    </ClInclude>
     <ClInclude Include="..\source\cFluidSimulator.h">
       <Filter>Simulator\cSimulator\cFluidSimulator</Filter>
     </ClInclude>
@@ -1398,9 +960,6 @@
     <ClInclude Include="..\source\cFireSimulator.h">
       <Filter>Simulator\cSimulator\cFireSimulator</Filter>
     </ClInclude>
-    <ClInclude Include="..\source\packets\cPacket_CreativeInventoryAction.h">
-      <Filter>Packets\cPacket_CreativeInventoryAction</Filter>
-    </ClInclude>
     <ClInclude Include="..\source\cCreativeInventory.h">
       <Filter>cInventory\cCreativeInventory</Filter>
     </ClInclude>
@@ -1424,9 +983,6 @@
     </ClInclude>
     <ClInclude Include="..\source\ChunkSender.h" />
     <ClInclude Include="..\source\ChunkDef.h" />
-    <ClInclude Include="..\source\packets\cPacket_Player.h">
-      <Filter>Packets</Filter>
-    </ClInclude>
     <ClInclude Include="..\source\cChunkGenerator.h">
       <Filter>Generating</Filter>
     </ClInclude>