diff --git a/VC2008/MCServer.vcproj b/VC2008/MCServer.vcproj
index 1320154e0..c294a13a1 100644
--- a/VC2008/MCServer.vcproj
+++ b/VC2008/MCServer.vcproj
@@ -1621,38 +1621,38 @@
 				</File>
 			</Filter>
 			<Filter
-				Name="World storage"
+				Name="WorldStorage"
 				>
 				<File
-					RelativePath="..\source\FastNBT.cpp"
+					RelativePath="..\source\WorldStorage\FastNBT.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\FastNBT.h"
+					RelativePath="..\source\WorldStorage\FastNBT.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\WorldStorage.cpp"
+					RelativePath="..\source\WorldStorage\WorldStorage.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\WorldStorage.h"
+					RelativePath="..\source\WorldStorage\WorldStorage.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\WSSAnvil.cpp"
+					RelativePath="..\source\WorldStorage\WSSAnvil.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\WSSAnvil.h"
+					RelativePath="..\source\WorldStorage\WSSAnvil.h"
 					>
 				</File>
 				<File
-					RelativePath="..\source\WSSCompact.cpp"
+					RelativePath="..\source\WorldStorage\WSSCompact.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\source\WSSCompact.h"
+					RelativePath="..\source\WorldStorage\WSSCompact.h"
 					>
 				</File>
 			</Filter>
diff --git a/source/FastNBT.cpp b/source/WorldStorage/FastNBT.cpp
similarity index 100%
rename from source/FastNBT.cpp
rename to source/WorldStorage/FastNBT.cpp
diff --git a/source/FastNBT.h b/source/WorldStorage/FastNBT.h
similarity index 99%
rename from source/FastNBT.h
rename to source/WorldStorage/FastNBT.h
index 88d79f4c1..e4cb3179b 100644
--- a/source/FastNBT.h
+++ b/source/WorldStorage/FastNBT.h
@@ -19,7 +19,7 @@ It directly outputs a string containing the serialized NBT data.
 
 #pragma once
 
-#include "Endianness.h"
+#include "../Endianness.h"
 
 
 
diff --git a/source/WSSAnvil.cpp b/source/WorldStorage/WSSAnvil.cpp
similarity index 98%
rename from source/WSSAnvil.cpp
rename to source/WorldStorage/WSSAnvil.cpp
index cacd81df9..e10c0e99a 100644
--- a/source/WSSAnvil.cpp
+++ b/source/WorldStorage/WSSAnvil.cpp
@@ -5,17 +5,17 @@
 
 #include "Globals.h"
 #include "WSSAnvil.h"
-#include "cWorld.h"
+#include "../cWorld.h"
 #include "zlib.h"
-#include "BlockID.h"
-#include "cChestEntity.h"
-#include "cFurnaceEntity.h"
-#include "cSignEntity.h"
-#include "cNoteEntity.h"
-#include "cItem.h"
-#include "StringCompression.h"
-#include "cEntity.h"
-#include "cMakeDir.h"
+#include "../BlockID.h"
+#include "../cChestEntity.h"
+#include "../cFurnaceEntity.h"
+#include "../cSignEntity.h"
+#include "../cNoteEntity.h"
+#include "../cItem.h"
+#include "../StringCompression.h"
+#include "../cEntity.h"
+#include "../cMakeDir.h"
 #include "FastNBT.h"
 
 
diff --git a/source/WSSAnvil.h b/source/WorldStorage/WSSAnvil.h
similarity index 100%
rename from source/WSSAnvil.h
rename to source/WorldStorage/WSSAnvil.h
diff --git a/source/WSSCompact.cpp b/source/WorldStorage/WSSCompact.cpp
similarity index 99%
rename from source/WSSCompact.cpp
rename to source/WorldStorage/WSSCompact.cpp
index a47c62dcb..e604ca9b9 100644
--- a/source/WSSCompact.cpp
+++ b/source/WorldStorage/WSSCompact.cpp
@@ -5,15 +5,15 @@
 
 #include "Globals.h"
 #include "WSSCompact.h"
-#include "cWorld.h"
+#include "../cWorld.h"
 #include "zlib.h"
 #include <json/json.h>
-#include "StringCompression.h"
-#include "cChestEntity.h"
-#include "cSignEntity.h"
-#include "cFurnaceEntity.h"
-#include "cNoteEntity.h"
-#include "BlockID.h"
+#include "../StringCompression.h"
+#include "../cChestEntity.h"
+#include "../cSignEntity.h"
+#include "../cFurnaceEntity.h"
+#include "../cNoteEntity.h"
+#include "../BlockID.h"
 
 
 
diff --git a/source/WSSCompact.h b/source/WorldStorage/WSSCompact.h
similarity index 99%
rename from source/WSSCompact.h
rename to source/WorldStorage/WSSCompact.h
index 2e2318fc3..e6a013eaf 100644
--- a/source/WSSCompact.h
+++ b/source/WorldStorage/WSSCompact.h
@@ -12,7 +12,7 @@
 #define WSSCOMPACT_H_INCLUDED
 
 #include "WorldStorage.h"
-#include "Vector3i.h"
+#include "../Vector3i.h"
 
 
 
diff --git a/source/WorldStorage.cpp b/source/WorldStorage/WorldStorage.cpp
similarity index 98%
rename from source/WorldStorage.cpp
rename to source/WorldStorage/WorldStorage.cpp
index fda0a75da..503d49527 100644
--- a/source/WorldStorage.cpp
+++ b/source/WorldStorage/WorldStorage.cpp
@@ -9,11 +9,11 @@
 #include "WorldStorage.h"
 #include "WSSCompact.h"
 #include "WSSAnvil.h"
-#include "cWorld.h"
-#include "Generating/ChunkGenerator.h"
-#include "cEntity.h"
-#include "cBlockEntity.h"
-#include "BlockID.h"
+#include "../cWorld.h"
+#include "../Generating/ChunkGenerator.h"
+#include "../cEntity.h"
+#include "../cBlockEntity.h"
+#include "../BlockID.h"
 
 
 
diff --git a/source/WorldStorage.h b/source/WorldStorage/WorldStorage.h
similarity index 98%
rename from source/WorldStorage.h
rename to source/WorldStorage/WorldStorage.h
index 48036ed11..117def9b5 100644
--- a/source/WorldStorage.h
+++ b/source/WorldStorage/WorldStorage.h
@@ -14,8 +14,8 @@
 #ifndef WORLDSTORAGE_H_INCLUDED
 #define WORLDSTORAGE_H_INCLUDED
 
-#include "ChunkDef.h"
-#include "cIsThread.h"
+#include "../ChunkDef.h"
+#include "../cIsThread.h"
 #include <json/json.h>
 
 
diff --git a/source/cWorld.h b/source/cWorld.h
index 71a854621..a65368bfe 100644
--- a/source/cWorld.h
+++ b/source/cWorld.h
@@ -12,7 +12,7 @@
 #include "cSimulatorManager.h"
 #include "MersenneTwister.h"
 #include "cChunkMap.h"
-#include "WorldStorage.h"
+#include "WorldStorage/WorldStorage.h"
 #include "Generating/ChunkGenerator.h"
 #include "Vector3i.h"
 #include "Vector3f.h"