diff --git a/source/blocks/BlockBed.h b/source/Blocks/BlockBed.h
similarity index 100%
rename from source/blocks/BlockBed.h
rename to source/Blocks/BlockBed.h
diff --git a/source/blocks/BlockCactus.h b/source/Blocks/BlockCactus.h
similarity index 100%
rename from source/blocks/BlockCactus.h
rename to source/Blocks/BlockCactus.h
diff --git a/source/blocks/BlockChest.h b/source/Blocks/BlockChest.h
similarity index 100%
rename from source/blocks/BlockChest.h
rename to source/Blocks/BlockChest.h
diff --git a/source/blocks/BlockCloth.h b/source/Blocks/BlockCloth.h
similarity index 100%
rename from source/blocks/BlockCloth.h
rename to source/Blocks/BlockCloth.h
diff --git a/source/blocks/BlockCrops.h b/source/Blocks/BlockCrops.h
similarity index 100%
rename from source/blocks/BlockCrops.h
rename to source/Blocks/BlockCrops.h
diff --git a/source/blocks/BlockDirt.h b/source/Blocks/BlockDirt.h
similarity index 100%
rename from source/blocks/BlockDirt.h
rename to source/Blocks/BlockDirt.h
diff --git a/source/blocks/BlockDispenser.h b/source/Blocks/BlockDispenser.h
similarity index 100%
rename from source/blocks/BlockDispenser.h
rename to source/Blocks/BlockDispenser.h
diff --git a/source/blocks/BlockDoor.cpp b/source/Blocks/BlockDoor.cpp
similarity index 100%
rename from source/blocks/BlockDoor.cpp
rename to source/Blocks/BlockDoor.cpp
diff --git a/source/blocks/BlockDoor.h b/source/Blocks/BlockDoor.h
similarity index 100%
rename from source/blocks/BlockDoor.h
rename to source/Blocks/BlockDoor.h
diff --git a/source/blocks/BlockEntity.h b/source/Blocks/BlockEntity.h
similarity index 100%
rename from source/blocks/BlockEntity.h
rename to source/Blocks/BlockEntity.h
diff --git a/source/blocks/BlockFire.h b/source/Blocks/BlockFire.h
similarity index 100%
rename from source/blocks/BlockFire.h
rename to source/Blocks/BlockFire.h
diff --git a/source/blocks/BlockFlower.h b/source/Blocks/BlockFlower.h
similarity index 100%
rename from source/blocks/BlockFlower.h
rename to source/Blocks/BlockFlower.h
diff --git a/source/blocks/BlockFluid.h b/source/Blocks/BlockFluid.h
similarity index 100%
rename from source/blocks/BlockFluid.h
rename to source/Blocks/BlockFluid.h
diff --git a/source/blocks/BlockFurnace.h b/source/Blocks/BlockFurnace.h
similarity index 100%
rename from source/blocks/BlockFurnace.h
rename to source/Blocks/BlockFurnace.h
diff --git a/source/blocks/BlockGlowstone.h b/source/Blocks/BlockGlowstone.h
similarity index 100%
rename from source/blocks/BlockGlowstone.h
rename to source/Blocks/BlockGlowstone.h
diff --git a/source/blocks/BlockGravel.h b/source/Blocks/BlockGravel.h
similarity index 100%
rename from source/blocks/BlockGravel.h
rename to source/Blocks/BlockGravel.h
diff --git a/source/blocks/BlockHandler.cpp b/source/Blocks/BlockHandler.cpp
similarity index 100%
rename from source/blocks/BlockHandler.cpp
rename to source/Blocks/BlockHandler.cpp
diff --git a/source/blocks/BlockHandler.h b/source/Blocks/BlockHandler.h
similarity index 100%
rename from source/blocks/BlockHandler.h
rename to source/Blocks/BlockHandler.h
diff --git a/source/blocks/BlockIce.h b/source/Blocks/BlockIce.h
similarity index 100%
rename from source/blocks/BlockIce.h
rename to source/Blocks/BlockIce.h
diff --git a/source/blocks/BlockLadder.h b/source/Blocks/BlockLadder.h
similarity index 100%
rename from source/blocks/BlockLadder.h
rename to source/Blocks/BlockLadder.h
diff --git a/source/blocks/BlockLeaves.h b/source/Blocks/BlockLeaves.h
similarity index 100%
rename from source/blocks/BlockLeaves.h
rename to source/Blocks/BlockLeaves.h
diff --git a/source/blocks/BlockMelon.h b/source/Blocks/BlockMelon.h
similarity index 100%
rename from source/blocks/BlockMelon.h
rename to source/Blocks/BlockMelon.h
diff --git a/source/blocks/BlockMushroom.h b/source/Blocks/BlockMushroom.h
similarity index 100%
rename from source/blocks/BlockMushroom.h
rename to source/Blocks/BlockMushroom.h
diff --git a/source/blocks/BlockNote.h b/source/Blocks/BlockNote.h
similarity index 100%
rename from source/blocks/BlockNote.h
rename to source/Blocks/BlockNote.h
diff --git a/source/blocks/BlockOre.h b/source/Blocks/BlockOre.h
similarity index 100%
rename from source/blocks/BlockOre.h
rename to source/Blocks/BlockOre.h
diff --git a/source/blocks/BlockPiston.cpp b/source/Blocks/BlockPiston.cpp
similarity index 100%
rename from source/blocks/BlockPiston.cpp
rename to source/Blocks/BlockPiston.cpp
diff --git a/source/blocks/BlockPiston.h b/source/Blocks/BlockPiston.h
similarity index 100%
rename from source/blocks/BlockPiston.h
rename to source/Blocks/BlockPiston.h
diff --git a/source/blocks/BlockRedstone.cpp b/source/Blocks/BlockRedstone.cpp
similarity index 100%
rename from source/blocks/BlockRedstone.cpp
rename to source/Blocks/BlockRedstone.cpp
diff --git a/source/blocks/BlockRedstone.h b/source/Blocks/BlockRedstone.h
similarity index 100%
rename from source/blocks/BlockRedstone.h
rename to source/Blocks/BlockRedstone.h
diff --git a/source/blocks/BlockRedstoneRepeater.cpp b/source/Blocks/BlockRedstoneRepeater.cpp
similarity index 100%
rename from source/blocks/BlockRedstoneRepeater.cpp
rename to source/Blocks/BlockRedstoneRepeater.cpp
diff --git a/source/blocks/BlockRedstoneRepeater.h b/source/Blocks/BlockRedstoneRepeater.h
similarity index 100%
rename from source/blocks/BlockRedstoneRepeater.h
rename to source/Blocks/BlockRedstoneRepeater.h
diff --git a/source/blocks/BlockRedstoneTorch.h b/source/Blocks/BlockRedstoneTorch.h
similarity index 100%
rename from source/blocks/BlockRedstoneTorch.h
rename to source/Blocks/BlockRedstoneTorch.h
diff --git a/source/blocks/BlockSand.h b/source/Blocks/BlockSand.h
similarity index 100%
rename from source/blocks/BlockSand.h
rename to source/Blocks/BlockSand.h
diff --git a/source/blocks/BlockSapling.h b/source/Blocks/BlockSapling.h
similarity index 100%
rename from source/blocks/BlockSapling.h
rename to source/Blocks/BlockSapling.h
diff --git a/source/blocks/BlockSign.h b/source/Blocks/BlockSign.h
similarity index 100%
rename from source/blocks/BlockSign.h
rename to source/Blocks/BlockSign.h
diff --git a/source/blocks/BlockSlab.h b/source/Blocks/BlockSlab.h
similarity index 100%
rename from source/blocks/BlockSlab.h
rename to source/Blocks/BlockSlab.h
diff --git a/source/blocks/BlockSnow.h b/source/Blocks/BlockSnow.h
similarity index 100%
rename from source/blocks/BlockSnow.h
rename to source/Blocks/BlockSnow.h
diff --git a/source/blocks/BlockStairs.h b/source/Blocks/BlockStairs.h
similarity index 100%
rename from source/blocks/BlockStairs.h
rename to source/Blocks/BlockStairs.h
diff --git a/source/blocks/BlockStems.h b/source/Blocks/BlockStems.h
similarity index 100%
rename from source/blocks/BlockStems.h
rename to source/Blocks/BlockStems.h
diff --git a/source/blocks/BlockStone.h b/source/Blocks/BlockStone.h
similarity index 100%
rename from source/blocks/BlockStone.h
rename to source/Blocks/BlockStone.h
diff --git a/source/blocks/BlockSugarcane.h b/source/Blocks/BlockSugarcane.h
similarity index 100%
rename from source/blocks/BlockSugarcane.h
rename to source/Blocks/BlockSugarcane.h
diff --git a/source/blocks/BlockTallGrass.h b/source/Blocks/BlockTallGrass.h
similarity index 100%
rename from source/blocks/BlockTallGrass.h
rename to source/Blocks/BlockTallGrass.h
diff --git a/source/blocks/BlockTorch.h b/source/Blocks/BlockTorch.h
similarity index 100%
rename from source/blocks/BlockTorch.h
rename to source/Blocks/BlockTorch.h
diff --git a/source/blocks/BlockVine.h b/source/Blocks/BlockVine.h
similarity index 100%
rename from source/blocks/BlockVine.h
rename to source/Blocks/BlockVine.h
diff --git a/source/blocks/BlockWood.h b/source/Blocks/BlockWood.h
similarity index 100%
rename from source/blocks/BlockWood.h
rename to source/Blocks/BlockWood.h
diff --git a/source/blocks/BlockWorkbench.h b/source/Blocks/BlockWorkbench.h
similarity index 100%
rename from source/blocks/BlockWorkbench.h
rename to source/Blocks/BlockWorkbench.h
diff --git a/source/Chunk.cpp b/source/Chunk.cpp
index cb4e5511f..e7a828c66 100644
--- a/source/Chunk.cpp
+++ b/source/Chunk.cpp
@@ -29,7 +29,7 @@
 #include "Player.h"
 #include "BlockArea.h"
 #include "PluginManager.h"
-#include "blocks/BlockHandler.h"
+#include "Blocks/BlockHandler.h"
 
 #include <json/json.h>
 
diff --git a/source/ClientHandle.cpp b/source/ClientHandle.cpp
index e32e03f16..1585a08b0 100644
--- a/source/ClientHandle.cpp
+++ b/source/ClientHandle.cpp
@@ -23,8 +23,8 @@
 #include "ChatColor.h"
 #include "OSSupport/Socket.h"
 #include "OSSupport/Timer.h"
-#include "items/ItemHandler.h"
-#include "blocks/BlockHandler.h"
+#include "Items/ItemHandler.h"
+#include "Blocks/BlockHandler.h"
 
 #include "Tracer.h"
 #include "Vector3f.h"
diff --git a/source/FluidSimulator.cpp b/source/FluidSimulator.cpp
index 804db9d36..d8007b9bf 100644
--- a/source/FluidSimulator.cpp
+++ b/source/FluidSimulator.cpp
@@ -9,7 +9,7 @@
 #include "BlockID.h"
 #include "Defines.h"
 #include "Item.h"
-#include "blocks/BlockHandler.h"
+#include "Blocks/BlockHandler.h"
 
 
 
diff --git a/source/Inventory.cpp b/source/Inventory.cpp
index 1ad349fb5..c35a6c5d0 100644
--- a/source/Inventory.cpp
+++ b/source/Inventory.cpp
@@ -10,7 +10,7 @@
 
 #include <json/json.h>
 
-#include "items/ItemHandler.h"
+#include "Items/ItemHandler.h"
 
 
 
diff --git a/source/items/ItemBed.h b/source/Items/ItemBed.h
similarity index 100%
rename from source/items/ItemBed.h
rename to source/Items/ItemBed.h
diff --git a/source/items/ItemBucket.h b/source/Items/ItemBucket.h
similarity index 100%
rename from source/items/ItemBucket.h
rename to source/Items/ItemBucket.h
diff --git a/source/items/ItemCloth.h b/source/Items/ItemCloth.h
similarity index 100%
rename from source/items/ItemCloth.h
rename to source/Items/ItemCloth.h
diff --git a/source/items/ItemDoor.h b/source/Items/ItemDoor.h
similarity index 100%
rename from source/items/ItemDoor.h
rename to source/Items/ItemDoor.h
diff --git a/source/items/ItemDye.h b/source/Items/ItemDye.h
similarity index 100%
rename from source/items/ItemDye.h
rename to source/Items/ItemDye.h
diff --git a/source/items/ItemFood.h b/source/Items/ItemFood.h
similarity index 100%
rename from source/items/ItemFood.h
rename to source/Items/ItemFood.h
diff --git a/source/items/ItemHandler.cpp b/source/Items/ItemHandler.cpp
similarity index 94%
rename from source/items/ItemHandler.cpp
rename to source/Items/ItemHandler.cpp
index 63d4f4258..49ed865e7 100644
--- a/source/items/ItemHandler.cpp
+++ b/source/Items/ItemHandler.cpp
@@ -28,7 +28,7 @@
 #include "ItemSign.h"
 #include "ItemBed.h"
 
-#include "../blocks/BlockHandler.h"
+#include "../Blocks/BlockHandler.h"
 
 
 
diff --git a/source/items/ItemHandler.h b/source/Items/ItemHandler.h
similarity index 100%
rename from source/items/ItemHandler.h
rename to source/Items/ItemHandler.h
diff --git a/source/items/ItemHoe.h b/source/Items/ItemHoe.h
similarity index 100%
rename from source/items/ItemHoe.h
rename to source/Items/ItemHoe.h
diff --git a/source/items/ItemLeaves.h b/source/Items/ItemLeaves.h
similarity index 100%
rename from source/items/ItemLeaves.h
rename to source/Items/ItemLeaves.h
diff --git a/source/items/ItemLighter.h b/source/Items/ItemLighter.h
similarity index 100%
rename from source/items/ItemLighter.h
rename to source/Items/ItemLighter.h
diff --git a/source/items/ItemPickaxe.h b/source/Items/ItemPickaxe.h
similarity index 100%
rename from source/items/ItemPickaxe.h
rename to source/Items/ItemPickaxe.h
diff --git a/source/items/ItemRedstoneDust.h b/source/Items/ItemRedstoneDust.h
similarity index 100%
rename from source/items/ItemRedstoneDust.h
rename to source/Items/ItemRedstoneDust.h
diff --git a/source/items/ItemRedstoneRepeater.h b/source/Items/ItemRedstoneRepeater.h
similarity index 100%
rename from source/items/ItemRedstoneRepeater.h
rename to source/Items/ItemRedstoneRepeater.h
diff --git a/source/items/ItemSapling.h b/source/Items/ItemSapling.h
similarity index 100%
rename from source/items/ItemSapling.h
rename to source/Items/ItemSapling.h
diff --git a/source/items/ItemSeeds.h b/source/Items/ItemSeeds.h
similarity index 100%
rename from source/items/ItemSeeds.h
rename to source/Items/ItemSeeds.h
diff --git a/source/items/ItemShears.h b/source/Items/ItemShears.h
similarity index 100%
rename from source/items/ItemShears.h
rename to source/Items/ItemShears.h
diff --git a/source/items/ItemShovel.h b/source/Items/ItemShovel.h
similarity index 90%
rename from source/items/ItemShovel.h
rename to source/Items/ItemShovel.h
index 24928efb8..f5a65795a 100644
--- a/source/items/ItemShovel.h
+++ b/source/Items/ItemShovel.h
@@ -5,7 +5,7 @@
 #include "../World.h"
 #include "../Player.h"
 
-#include "../blocks/BlockHandler.h"
+#include "../Blocks/BlockHandler.h"
 
 
 
diff --git a/source/items/ItemSign.h b/source/Items/ItemSign.h
similarity index 100%
rename from source/items/ItemSign.h
rename to source/Items/ItemSign.h
diff --git a/source/items/ItemSlab.h b/source/Items/ItemSlab.h
similarity index 100%
rename from source/items/ItemSlab.h
rename to source/Items/ItemSlab.h
diff --git a/source/items/ItemSugarcane.h b/source/Items/ItemSugarcane.h
similarity index 100%
rename from source/items/ItemSugarcane.h
rename to source/Items/ItemSugarcane.h
diff --git a/source/items/ItemSword.h b/source/Items/ItemSword.h
similarity index 100%
rename from source/items/ItemSword.h
rename to source/Items/ItemSword.h
diff --git a/source/items/ItemWood.h b/source/Items/ItemWood.h
similarity index 100%
rename from source/items/ItemWood.h
rename to source/Items/ItemWood.h
diff --git a/source/Piston.cpp b/source/Piston.cpp
index a4c014729..750d76bb0 100644
--- a/source/Piston.cpp
+++ b/source/Piston.cpp
@@ -11,7 +11,7 @@
 #include "World.h"
 #include "BlockID.h"
 #include "Server.h"
-#include "blocks/BlockHandler.h"
+#include "Blocks/BlockHandler.h"
 
 extern bool g_BlockPistonBreakable[];
 
diff --git a/source/Root.cpp b/source/Root.cpp
index 2a6afc0e7..1b7f90d60 100644
--- a/source/Root.cpp
+++ b/source/Root.cpp
@@ -12,8 +12,8 @@
 #include "MonsterConfig.h"
 #include "Redstone.h"
 #include "Player.h"
-#include "blocks/BlockHandler.h"
-#include "items/ItemHandler.h"
+#include "Blocks/BlockHandler.h"
+#include "Items/ItemHandler.h"
 #include "Chunk.h"
 
 #ifdef USE_SQUIRREL
diff --git a/source/UI/Window.cpp b/source/UI/Window.cpp
index b3d72570c..ad9ce67c7 100644
--- a/source/UI/Window.cpp
+++ b/source/UI/Window.cpp
@@ -8,7 +8,7 @@
 #include "../Pickup.h"
 #include "../Inventory.h"
 #include "WindowOwner.h"
-#include "../items/ItemHandler.h"
+#include "../Items/ItemHandler.h"
 #include "SlotArea.h"
 #include "../ChestEntity.h"
 
diff --git a/source/World.cpp b/source/World.cpp
index 184cff869..03438b227 100644
--- a/source/World.cpp
+++ b/source/World.cpp
@@ -43,7 +43,7 @@
 #include "Tracer.h"
 #include "Generating/Trees.h"
 #include "PluginManager.h"
-#include "blocks/BlockHandler.h"
+#include "Blocks/BlockHandler.h"
 #include "Vector3d.h"
 
 #include "tolua++.h"