47 files changed, 132 insertions, 129 deletions
diff --git a/VC2008/MCServer.vcproj b/VC2008/MCServer.vcproj
index c294a13a1..18a9378d0 100644
--- a/VC2008/MCServer.vcproj
+++ b/VC2008/MCServer.vcproj
@@ -768,163 +768,163 @@
 				Name="Mobs"
 				>
 				<File
-					RelativePath="..\source\cAggressiveMonster.cpp"
+					RelativePath="..\source\Mobs\AggressiveMonster.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cAggressiveMonster.h"
+					RelativePath="..\source\Mobs\AggressiveMonster.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cCavespider.cpp"
+					RelativePath="..\source\Mobs\Cavespider.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cCavespider.h"
+					RelativePath="..\source\Mobs\Cavespider.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cChicken.cpp"
+					RelativePath="..\source\Mobs\Chicken.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cChicken.h"
+					RelativePath="..\source\Mobs\Chicken.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cCow.cpp"
+					RelativePath="..\source\Mobs\Cow.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cCow.h"
+					RelativePath="..\source\Mobs\Cow.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cCreeper.cpp"
+					RelativePath="..\source\Mobs\Creeper.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cCreeper.h"
+					RelativePath="..\source\Mobs\Creeper.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cEnderman.cpp"
+					RelativePath="..\source\Mobs\Enderman.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cEnderman.h"
+					RelativePath="..\source\Mobs\Enderman.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cGhast.cpp"
+					RelativePath="..\source\Mobs\Ghast.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cGhast.h"
+					RelativePath="..\source\Mobs\Ghast.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cMonster.cpp"
+					RelativePath="..\source\Mobs\Monster.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cMonster.h"
+					RelativePath="..\source\Mobs\Monster.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cPassiveAggressiveMonster.cpp"
+					RelativePath="..\source\Mobs\PassiveAggressiveMonster.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cPassiveAggressiveMonster.h"
+					RelativePath="..\source\Mobs\PassiveAggressiveMonster.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cPassiveMonster.cpp"
+					RelativePath="..\source\Mobs\PassiveMonster.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cPassiveMonster.h"
+					RelativePath="..\source\Mobs\PassiveMonster.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cPig.cpp"
+					RelativePath="..\source\Mobs\Pig.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cPig.h"
+					RelativePath="..\source\Mobs\Pig.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cSheep.cpp"
+					RelativePath="..\source\Mobs\Sheep.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cSheep.h"
+					RelativePath="..\source\Mobs\Sheep.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cSilverfish.cpp"
+					RelativePath="..\source\Mobs\Silverfish.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cSilverfish.h"
+					RelativePath="..\source\Mobs\Silverfish.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cSkeleton.cpp"
+					RelativePath="..\source\Mobs\Skeleton.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cSkeleton.h"
+					RelativePath="..\source\Mobs\Skeleton.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cSlime.cpp"
+					RelativePath="..\source\Mobs\Slime.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cSlime.h"
+					RelativePath="..\source\Mobs\Slime.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cSpider.cpp"
+					RelativePath="..\source\Mobs\Spider.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cSpider.h"
+					RelativePath="..\source\Mobs\Spider.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cSquid.cpp"
+					RelativePath="..\source\Mobs\Squid.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cSquid.h"
+					RelativePath="..\source\Mobs\Squid.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cWolf.cpp"
+					RelativePath="..\source\Mobs\Wolf.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cWolf.h"
+					RelativePath="..\source\Mobs\Wolf.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cZombie.cpp"
+					RelativePath="..\source\Mobs\Zombie.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cZombie.h"
+					RelativePath="..\source\Mobs\Zombie.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cZombiepigman.cpp"
+					RelativePath="..\source\Mobs\Zombiepigman.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\cZombiepigman.h"
+					RelativePath="..\source\Mobs\Zombiepigman.h"
 					>
 				</File>
 			</Filter>
diff --git a/source/cAggressiveMonster.cpp b/source/Mobs/AggressiveMonster.cpp
index 3fa61bb33..2a5370968 100644
--- a/source/cAggressiveMonster.cpp
+++ b/source/Mobs/AggressiveMonster.cpp
@@ -1,11 +1,11 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cAggressiveMonster.h"
+#include "AggressiveMonster.h"
 
-#include "Vector3f.h"
-#include "cPlayer.h"
-#include "MersenneTwister.h"
+#include "../Vector3f.h"
+#include "../cPlayer.h"
+#include "../MersenneTwister.h"
 
 
 cAggressiveMonster::cAggressiveMonster()
diff --git a/source/cAggressiveMonster.h b/source/Mobs/AggressiveMonster.h
index 579e712ae..7d741dc9a 100644
--- a/source/cAggressiveMonster.h
+++ b/source/Mobs/AggressiveMonster.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cMonster.h"
+#include "Monster.h"
 
 class cAggressiveMonster : public cMonster
 {
diff --git a/source/cCavespider.cpp b/source/Mobs/Cavespider.cpp
index 8d0285674..b2188da3d 100644
--- a/source/cCavespider.cpp
+++ b/source/Mobs/Cavespider.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cCavespider.h"
+#include "Cavespider.h"
 
 
 
diff --git a/source/cCavespider.h b/source/Mobs/Cavespider.h
index 0630351f0..163bb1f92 100644
--- a/source/cCavespider.h
+++ b/source/Mobs/Cavespider.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cAggressiveMonster.h"
+#include "AggressiveMonster.h"
 
 class cCavespider : public cAggressiveMonster
 {
diff --git a/source/cChicken.cpp b/source/Mobs/Chicken.cpp
index ddc6400e4..940491ad4 100644
--- a/source/cChicken.cpp
+++ b/source/Mobs/Chicken.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cChicken.h"
+#include "Chicken.h"
 
 
 
diff --git a/source/cChicken.h b/source/Mobs/Chicken.h
index b04197414..acfb202e3 100644
--- a/source/cChicken.h
+++ b/source/Mobs/Chicken.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cPassiveMonster.h"
+#include "PassiveMonster.h"
 
 class cChicken : public cPassiveMonster
 {
diff --git a/source/cCow.cpp b/source/Mobs/Cow.cpp
index c4f4ed523..0d107e1b5 100644
--- a/source/cCow.cpp
+++ b/source/Mobs/Cow.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cCow.h"
+#include "Cow.h"
 
 
 
diff --git a/source/cCow.h b/source/Mobs/Cow.h
index 83d67e1ad..bb604bad4 100644
--- a/source/cCow.h
+++ b/source/Mobs/Cow.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cPassiveMonster.h"
+#include "PassiveMonster.h"
 
 class cCow : public cPassiveMonster
 {
diff --git a/source/cCreeper.cpp b/source/Mobs/Creeper.cpp
index 208d51845..b42d5690b 100644
--- a/source/cCreeper.cpp
+++ b/source/Mobs/Creeper.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cCreeper.h"
+#include "Creeper.h"
 
 
 
diff --git a/source/cCreeper.h b/source/Mobs/Creeper.h
index 4e8b4142e..e5c755103 100644
--- a/source/cCreeper.h
+++ b/source/Mobs/Creeper.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cAggressiveMonster.h"
+#include "AggressiveMonster.h"
 
 class cCreeper : public cAggressiveMonster
 {
diff --git a/source/cEnderman.cpp b/source/Mobs/Enderman.cpp
index 61bdfe06b..36ee975b1 100644
--- a/source/cEnderman.cpp
+++ b/source/Mobs/Enderman.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cEnderman.h"
+#include "Enderman.h"
 
 
 
diff --git a/source/cEnderman.h b/source/Mobs/Enderman.h
index d147cc4e7..788cc1314 100644
--- a/source/cEnderman.h
+++ b/source/Mobs/Enderman.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cPassiveAggressiveMonster.h"
+#include "PassiveAggressiveMonster.h"
 
 class cEnderman : public cPassiveAggressiveMonster
 {
diff --git a/source/cGhast.cpp b/source/Mobs/Ghast.cpp
index 857c1c6fb..4993f25c0 100644
--- a/source/cGhast.cpp
+++ b/source/Mobs/Ghast.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cGhast.h"
+#include "Ghast.h"
 
 
 
diff --git a/source/cGhast.h b/source/Mobs/Ghast.h
index e65a45ba0..6991419e7 100644
--- a/source/cGhast.h
+++ b/source/Mobs/Ghast.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cAggressiveMonster.h"
+#include "AggressiveMonster.h"
 
 class cGhast : public cAggressiveMonster
 {
diff --git a/source/cMonster.cpp b/source/Mobs/Monster.cpp
index 8b1a22bb7..9142bd6a8 100644
--- a/source/cMonster.cpp
+++ b/source/Mobs/Monster.cpp
@@ -1,27 +1,28 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cMonster.h"
-#include "cRoot.h"
-#include "cServer.h"
-#include "cClientHandle.h"
-#include "cWorld.h"
-#include "cPlayer.h"
-#include "Defines.h"
-#include "cMonsterConfig.h"
-#include "MersenneTwister.h"
-
-#include "Vector3f.h"
-#include "Vector3i.h"
-#include "Vector3d.h"
-
-#include "cTracer.h"
-#include "../iniFile/iniFile.h"
-
+#include "Monster.h"
+#include "../cRoot.h"
+#include "../cServer.h"
+#include "../cClientHandle.h"
+#include "../cWorld.h"
+#include "../cPlayer.h"
+#include "../Defines.h"
+#include "../cMonsterConfig.h"
+#include "../MersenneTwister.h"
+
+#include "../Vector3f.h"
+#include "../Vector3i.h"
+#include "../Vector3d.h"
+
+#include "../cTracer.h"
+#include "../../iniFile/iniFile.h"
+
+/*
 #ifndef _WIN32
-	#include <cstdlib> // rand
 	#include <unistd.h>
 #endif
+*/
 
 
 
diff --git a/source/cMonster.h b/source/Mobs/Monster.h
index f16b7aa56..0958d182c 100644
--- a/source/cMonster.h
+++ b/source/Mobs/Monster.h
@@ -1,12 +1,11 @@
 
 #pragma once
 
-#include "cPawn.h"
-#include "Defines.h"
-#include "cWorld.h"
-#include "BlockID.h"
-#include "cItem.h"
-#include "BlockID.h"
+#include "../cPawn.h"
+#include "../Defines.h"
+#include "../cWorld.h"
+#include "../BlockID.h"
+#include "../cItem.h"
 
 
 
diff --git a/source/cPassiveAggressiveMonster.cpp b/source/Mobs/PassiveAggressiveMonster.cpp
index 946ef86e0..abf37ee59 100644
--- a/source/cPassiveAggressiveMonster.cpp
+++ b/source/Mobs/PassiveAggressiveMonster.cpp
@@ -1,9 +1,9 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cPassiveAggressiveMonster.h"
+#include "PassiveAggressiveMonster.h"
 
-#include "cPlayer.h"
+#include "../cPlayer.h"
 
 
 
diff --git a/source/cPassiveAggressiveMonster.h b/source/Mobs/PassiveAggressiveMonster.h
index 0d1de9fd0..972d2a11d 100644
--- a/source/cPassiveAggressiveMonster.h
+++ b/source/Mobs/PassiveAggressiveMonster.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cAggressiveMonster.h"
+#include "AggressiveMonster.h"
 
 class cPassiveAggressiveMonster : public cAggressiveMonster
 {
diff --git a/source/cPassiveMonster.cpp b/source/Mobs/PassiveMonster.cpp
index 7a4bc6979..bc3f70b4b 100644
--- a/source/cPassiveMonster.cpp
+++ b/source/Mobs/PassiveMonster.cpp
@@ -1,8 +1,8 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cPassiveMonster.h"
-#include "MersenneTwister.h"
+#include "PassiveMonster.h"
+#include "../MersenneTwister.h"
 
 
 
diff --git a/source/cPassiveMonster.h b/source/Mobs/PassiveMonster.h
index ba784b242..1265dc737 100644
--- a/source/cPassiveMonster.h
+++ b/source/Mobs/PassiveMonster.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cMonster.h"
+#include "Monster.h"
 
 class cPassiveMonster : public cMonster
 {
diff --git a/source/cPig.cpp b/source/Mobs/Pig.cpp
index 14a713954..48954dc73 100644
--- a/source/cPig.cpp
+++ b/source/Mobs/Pig.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cPig.h"
+#include "Pig.h"
 
 
 
diff --git a/source/cPig.h b/source/Mobs/Pig.h
index 481aa2969..e701535ba 100644
--- a/source/cPig.h
+++ b/source/Mobs/Pig.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cPassiveMonster.h"
+#include "PassiveMonster.h"
 
 class cPig : public cPassiveMonster
 {
diff --git a/source/cSheep.cpp b/source/Mobs/Sheep.cpp
index c9fed280a..1f5f1815f 100644
--- a/source/cSheep.cpp
+++ b/source/Mobs/Sheep.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cSheep.h"
+#include "Sheep.h"
 
 
 
diff --git a/source/cSheep.h b/source/Mobs/Sheep.h
index 98faa266c..28c2b97dc 100644
--- a/source/cSheep.h
+++ b/source/Mobs/Sheep.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cPassiveMonster.h"
+#include "PassiveMonster.h"
 
 class cSheep : public cPassiveMonster
 {
diff --git a/source/cSilverfish.cpp b/source/Mobs/Silverfish.cpp
index 7302934b6..1525966c4 100644
--- a/source/cSilverfish.cpp
+++ b/source/Mobs/Silverfish.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cSilverfish.h"
+#include "Silverfish.h"
 
 
 
diff --git a/source/cSilverfish.h b/source/Mobs/Silverfish.h
index 1cdc89e62..fe23a4ba1 100644
--- a/source/cSilverfish.h
+++ b/source/Mobs/Silverfish.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cAggressiveMonster.h"
+#include "AggressiveMonster.h"
 
 class cSilverfish : public cAggressiveMonster
 {
diff --git a/source/cSkeleton.cpp b/source/Mobs/Skeleton.cpp
index 69ee55d23..56bbb9310 100644
--- a/source/cSkeleton.cpp
+++ b/source/Mobs/Skeleton.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cSkeleton.h"
+#include "Skeleton.h"
 
 
 
diff --git a/source/cSkeleton.h b/source/Mobs/Skeleton.h
index 78eeb731f..84a434905 100644
--- a/source/cSkeleton.h
+++ b/source/Mobs/Skeleton.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cAggressiveMonster.h"
+#include "AggressiveMonster.h"
 
 class cSkeleton : public cAggressiveMonster
 {
diff --git a/source/cSlime.cpp b/source/Mobs/Slime.cpp
index c314caae3..b8dc52d7c 100644
--- a/source/cSlime.cpp
+++ b/source/Mobs/Slime.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cSlime.h"
+#include "Slime.h"
 
 //TODO Implement sized slimes
 
diff --git a/source/cSlime.h b/source/Mobs/Slime.h
index e2e108516..cceac617d 100644
--- a/source/cSlime.h
+++ b/source/Mobs/Slime.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cAggressiveMonster.h"
+#include "AggressiveMonster.h"
 
 class cSlime : public cAggressiveMonster
 {
diff --git a/source/cSpider.cpp b/source/Mobs/Spider.cpp
index 516a941d4..dfa7a8a6a 100644
--- a/source/cSpider.cpp
+++ b/source/Mobs/Spider.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cSpider.h"
+#include "Spider.h"
 
 
 
diff --git a/source/cSpider.h b/source/Mobs/Spider.h
index ea7d4ba4f..12133bdb8 100644
--- a/source/cSpider.h
+++ b/source/Mobs/Spider.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cAggressiveMonster.h"
+#include "AggressiveMonster.h"
 
 class cSpider : public cAggressiveMonster
 {
diff --git a/source/cSquid.cpp b/source/Mobs/Squid.cpp
index 735df1be0..f88c295a4 100644
--- a/source/cSquid.cpp
+++ b/source/Mobs/Squid.cpp
@@ -1,8 +1,8 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cSquid.h"
-#include "Vector3d.h"
+#include "Squid.h"
+#include "../Vector3d.h"
 
 
 
diff --git a/source/cSquid.h b/source/Mobs/Squid.h
index 93b82d0eb..eaf13b5c7 100644
--- a/source/cSquid.h
+++ b/source/Mobs/Squid.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cPassiveMonster.h"
+#include "PassiveMonster.h"
 
 class cSquid : public cPassiveMonster
 {
diff --git a/source/cWolf.cpp b/source/Mobs/Wolf.cpp
index fa693bcbd..bd7fa213b 100644
--- a/source/cWolf.cpp
+++ b/source/Mobs/Wolf.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cWolf.h"
+#include "Wolf.h"
 
 cWolf::cWolf()
 {
diff --git a/source/cWolf.h b/source/Mobs/Wolf.h
index 174968cdb..bde5b9d32 100644
--- a/source/cWolf.h
+++ b/source/Mobs/Wolf.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cPassiveAggressiveMonster.h"
+#include "PassiveAggressiveMonster.h"
 
 class cWolf : public cPassiveAggressiveMonster
 {
diff --git a/source/cZombie.cpp b/source/Mobs/Zombie.cpp
index 94c1d669b..b51931904 100644
--- a/source/cZombie.cpp
+++ b/source/Mobs/Zombie.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cZombie.h"
+#include "Zombie.h"
 
 
 
diff --git a/source/cZombie.h b/source/Mobs/Zombie.h
index 4d6e39fb0..6adaaf41f 100644
--- a/source/cZombie.h
+++ b/source/Mobs/Zombie.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cAggressiveMonster.h"
+#include "AggressiveMonster.h"
 
 class cZombie : public cAggressiveMonster
 {
diff --git a/source/cZombiepigman.cpp b/source/Mobs/Zombiepigman.cpp
index 5aefbae72..65293cfce 100644
--- a/source/cZombiepigman.cpp
+++ b/source/Mobs/Zombiepigman.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cZombiepigman.h"
+#include "Zombiepigman.h"
 
 
 
diff --git a/source/cZombiepigman.h b/source/Mobs/Zombiepigman.h
index 76fb34e4b..93fe2d607 100644
--- a/source/cZombiepigman.h
+++ b/source/Mobs/Zombiepigman.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cPassiveAggressiveMonster.h"
+#include "PassiveAggressiveMonster.h"
 
 class cZombiepigman : public cPassiveAggressiveMonster
 {
diff --git a/source/Protocol/Protocol125.cpp b/source/Protocol/Protocol125.cpp
index dc2e39c16..0a3814f47 100644
--- a/source/Protocol/Protocol125.cpp
+++ b/source/Protocol/Protocol125.cpp
@@ -16,7 +16,7 @@ Documentation:
 #include "../cClientHandle.h"
 #include "../ChunkDataSerializer.h"
 #include "../cEntity.h"
-#include "../cMonster.h"
+#include "../Mobs/Monster.h"
 #include "../cPickup.h"
 #include "../cPlayer.h"
 #include "../cChatColor.h"
diff --git a/source/Protocol/Protocol132.cpp b/source/Protocol/Protocol132.cpp
index 33f404113..0d21ca01f 100644
--- a/source/Protocol/Protocol132.cpp
+++ b/source/Protocol/Protocol132.cpp
@@ -12,7 +12,7 @@
 #include "../cItem.h"
 #include "../ChunkDataSerializer.h"
 #include "../cPlayer.h"
-#include "../cMonster.h"
+#include "../Mobs/Monster.h"
 #include "../UI/Window.h"
 
 
diff --git a/source/cClientHandle.cpp b/source/cClientHandle.cpp
index 6a1ba695e..531edb087 100644
--- a/source/cClientHandle.cpp
+++ b/source/cClientHandle.cpp
@@ -20,7 +20,7 @@
 #include "cRedstone.h"
 #include "cPiston.h"
 #include "cBlockToPickup.h"
-#include "cMonster.h"
+#include "Mobs/Monster.h"
 #include "cChatColor.h"
 #include "cSocket.h"
 #include "cTimer.h"
diff --git a/source/cMonsterConfig.cpp b/source/cMonsterConfig.cpp
index f8bc9e16f..c399902c3 100644
--- a/source/cMonsterConfig.cpp
+++ b/source/cMonsterConfig.cpp
@@ -2,7 +2,7 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "cMonsterConfig.h"
-#include "cMonster.h"
+#include "Mobs/Monster.h"
 #include "../iniFile/iniFile.h"
 //#include <cstdio>
 
diff --git a/source/cServer.cpp b/source/cServer.cpp
index 0ededcf3c..cd7710fb8 100644
--- a/source/cServer.cpp
+++ b/source/cServer.cpp
@@ -6,7 +6,7 @@
 #include "cServer.h"
 #include "cClientHandle.h"
 #include "cTimer.h"
-#include "cMonster.h"
+#include "Mobs/Monster.h"
 #include "cSocket.h"
 #include "cRoot.h"
 #include "cWorld.h"
diff --git a/source/cWorld.cpp b/source/cWorld.cpp
index fecda733a..4a7ff2fc7 100644
--- a/source/cWorld.cpp
+++ b/source/cWorld.cpp
@@ -20,22 +20,25 @@
 #include "cFireSimulator.h"
 #include "cSandSimulator.h"
 #include "cRedstoneSimulator.h"
-#include "cChicken.h"
-#include "cSpider.h"
-#include "cCow.h" //cow
-#include "cSquid.h" //Squid
-#include "cWolf.h" //wolf
-#include "cSlime.h" //slime
-#include "cSkeleton.h" //Skeleton
-#include "cSilverfish.h" //Silverfish
-#include "cPig.h" //pig
-#include "cSheep.h" //sheep
-#include "cZombie.h" //zombie
-#include "cEnderman.h" //enderman
-#include "cCreeper.h" //creeper
-#include "cCavespider.h" //cavespider
-#include "cGhast.h" //Ghast
-#include "cZombiepigman.h" //Zombiepigman
+
+// Mobs:
+#include "Mobs/Chicken.h"
+#include "Mobs/Spider.h"
+#include "Mobs/Cow.h"
+#include "Mobs/Squid.h"
+#include "Mobs/Wolf.h"
+#include "Mobs/Slime.h"
+#include "Mobs/Skeleton.h"
+#include "Mobs/Silverfish.h"
+#include "Mobs/Pig.h"
+#include "Mobs/Sheep.h"
+#include "Mobs/Zombie.h"
+#include "Mobs/Enderman.h"
+#include "Mobs/Creeper.h"
+#include "Mobs/Cavespider.h"
+#include "Mobs/Ghast.h"
+#include "Mobs/Zombiepigman.h"
+
 #include "cMakeDir.h"
 #include "MersenneTwister.h"
 #include "cTracer.h"