diff --git a/src/server/scripts/CMakeLists.txt b/src/server/scripts/CMakeLists.txt
index 1c55955c77..9f0cd8ad45 100644
--- a/src/server/scripts/CMakeLists.txt
+++ b/src/server/scripts/CMakeLists.txt
@@ -13,6 +13,7 @@ file(GLOB_RECURSE scripts_kalimdor Kalimdor/*.cpp)
 file(GLOB_RECURSE scripts_northrend Northrend/*.cpp)
 file(GLOB_RECURSE scripts_outland Outland/*.cpp)
 file(GLOB_RECURSE scripts_world World/*.cpp)
+file(GLOB_RECURSE scripts_spells Spells/*.cpp)
 file(GLOB_RECURSE scripts_examples Examples/*.cpp)
 
 # Enable precompiled headers when using the GCC compiler.
@@ -34,6 +35,7 @@ set(scripts_STAT_SRCS
   ${scripts_northrend}
   ${scripts_outland}
   ${scripts_world}
+  ${script_spells}
   ${scripts_examples}
 )
 message("-- Added Scriptengine to SCRIPTS lib")
diff --git a/src/server/scripts/World/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp
similarity index 100%
rename from src/server/scripts/World/spell_dk.cpp
rename to src/server/scripts/Spells/spell_dk.cpp
diff --git a/src/server/scripts/World/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp
similarity index 100%
rename from src/server/scripts/World/spell_druid.cpp
rename to src/server/scripts/Spells/spell_druid.cpp
diff --git a/src/server/scripts/World/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp
similarity index 100%
rename from src/server/scripts/World/spell_generic.cpp
rename to src/server/scripts/Spells/spell_generic.cpp
diff --git a/src/server/scripts/World/spell_hunter.cpp b/src/server/scripts/Spells/spell_hunter.cpp
similarity index 100%
rename from src/server/scripts/World/spell_hunter.cpp
rename to src/server/scripts/Spells/spell_hunter.cpp
diff --git a/src/server/scripts/World/spell_mage.cpp b/src/server/scripts/Spells/spell_mage.cpp
similarity index 100%
rename from src/server/scripts/World/spell_mage.cpp
rename to src/server/scripts/Spells/spell_mage.cpp
diff --git a/src/server/scripts/World/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp
similarity index 100%
rename from src/server/scripts/World/spell_paladin.cpp
rename to src/server/scripts/Spells/spell_paladin.cpp
diff --git a/src/server/scripts/World/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp
similarity index 100%
rename from src/server/scripts/World/spell_priest.cpp
rename to src/server/scripts/Spells/spell_priest.cpp
diff --git a/src/server/scripts/World/spell_rogue.cpp b/src/server/scripts/Spells/spell_rogue.cpp
similarity index 100%
rename from src/server/scripts/World/spell_rogue.cpp
rename to src/server/scripts/Spells/spell_rogue.cpp
diff --git a/src/server/scripts/World/spell_shaman.cpp b/src/server/scripts/Spells/spell_shaman.cpp
similarity index 100%
rename from src/server/scripts/World/spell_shaman.cpp
rename to src/server/scripts/Spells/spell_shaman.cpp
diff --git a/src/server/scripts/World/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp
similarity index 100%
rename from src/server/scripts/World/spell_warlock.cpp
rename to src/server/scripts/Spells/spell_warlock.cpp
diff --git a/src/server/scripts/World/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp
similarity index 100%
rename from src/server/scripts/World/spell_warrior.cpp
rename to src/server/scripts/Spells/spell_warrior.cpp
diff --git a/win/VC90/game.vcproj b/win/VC90/game.vcproj
index cad732a150..bd058c4da3 100644
--- a/win/VC90/game.vcproj
+++ b/win/VC90/game.vcproj
@@ -762,48 +762,52 @@
 					RelativePath="..\..\src\server\scripts\World\npcs_special.cpp"
 					>
 				</File>
+			</Filter>
+			<Filter
+				Name="Spells"
+				>
 				<File
-					RelativePath="..\..\src\server\scripts\World\spell_dk.cpp"
+					RelativePath="..\..\src\server\scripts\Spells\spell_dk.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\server\scripts\World\spell_druid.cpp"
+					RelativePath="..\..\src\server\scripts\Spells\spell_druid.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\server\scripts\World\spell_generic.cpp"
+					RelativePath="..\..\src\server\scripts\Spells\spell_generic.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\server\scripts\World\spell_hunter.cpp"
+					RelativePath="..\..\src\server\scripts\Spells\spell_hunter.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\server\scripts\World\spell_mage.cpp"
+					RelativePath="..\..\src\server\scripts\Spells\spell_mage.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\server\scripts\World\spell_paladin.cpp"
+					RelativePath="..\..\src\server\scripts\Spells\spell_paladin.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\server\scripts\World\spell_priest.cpp"
+					RelativePath="..\..\src\server\scripts\Spells\spell_priest.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\server\scripts\World\spell_rogue.cpp"
+					RelativePath="..\..\src\server\scripts\Spells\spell_rogue.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\server\scripts\World\spell_shaman.cpp"
+					RelativePath="..\..\src\server\scripts\Spells\spell_shaman.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\server\scripts\World\spell_warlock.cpp"
+					RelativePath="..\..\src\server\scripts\Spells\spell_warlock.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\src\server\scripts\World\spell_warrior.cpp"
+					RelativePath="..\..\src\server\scripts\Spells\spell_warrior.cpp"
 					>
 				</File>
 			</Filter>