diff --git a/src/bindings/scripts/CMakeLists.txt b/src/bindings/scripts/CMakeLists.txt
index 0ea35a6b201..3ee74c0e592 100644
--- a/src/bindings/scripts/CMakeLists.txt
+++ b/src/bindings/scripts/CMakeLists.txt
@@ -510,7 +510,8 @@ SET(trinityscript_LIB_SRCS
    scripts/world/npc_taxi.cpp
    system/ScriptLoader.cpp
    system/ScriptLoader.h
-   system.cpp
+   system/system.cpp
+   system/system.h
 )
 
 add_library(trinityscript SHARED ${trinityscript_LIB_SRCS})
diff --git a/src/bindings/scripts/VC80/80ScriptDev2.vcproj b/src/bindings/scripts/VC80/80ScriptDev2.vcproj
index 3136b5d6adc..7368025639f 100644
--- a/src/bindings/scripts/VC80/80ScriptDev2.vcproj
+++ b/src/bindings/scripts/VC80/80ScriptDev2.vcproj
@@ -2754,6 +2754,14 @@
                 RelativePath="..\system\ScriptLoader.h"
                 >
             </File>
+            <File
+                RelativePath="..\system\system.cpp"
+                >
+            </File>
+            <File
+                RelativePath="..\system\system.h"
+                >
+            </File>
         </Filter>
 		<File
 			RelativePath="..\ScriptMgr.cpp"
@@ -2763,10 +2771,6 @@
 			RelativePath="..\ScriptMgr.h"
 			>
 		</File>
-		<File
-			RelativePath="..\system.cpp"
-			>
-		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/src/bindings/scripts/VC90/90ScriptDev2.vcproj b/src/bindings/scripts/VC90/90ScriptDev2.vcproj
index 33a3e2aeca1..ea5fbf72f26 100644
--- a/src/bindings/scripts/VC90/90ScriptDev2.vcproj
+++ b/src/bindings/scripts/VC90/90ScriptDev2.vcproj
@@ -2751,6 +2751,14 @@
                 RelativePath="..\system\ScriptLoader.h"
                 >
             </File>
+            <File
+                RelativePath="..\system\system.cpp"
+                >
+            </File>
+            <File
+                RelativePath="..\system\system.h"
+                >
+            </File>
         </Filter>
 		<File
 			RelativePath="..\ScriptMgr.cpp"
@@ -2760,10 +2768,6 @@
 			RelativePath="..\ScriptMgr.h"
 			>
 		</File>
-		<File
-			RelativePath="..\system.cpp"
-			>
-		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/src/bindings/scripts/system.cpp b/src/bindings/scripts/system/system.cpp
similarity index 100%
rename from src/bindings/scripts/system.cpp
rename to src/bindings/scripts/system/system.cpp
diff --git a/src/bindings/scripts/system/system.h b/src/bindings/scripts/system/system.h
new file mode 100644
index 00000000000..886f31355a9
--- /dev/null
+++ b/src/bindings/scripts/system/system.h
@@ -0,0 +1,8 @@
+/* Copyright (C) 2006 - 2009 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/>
+* This program is free software licensed under GPL version 2
+* Please see the included DOCS/LICENSE.TXT for more information */
+
+#ifndef SC_SYSTEM_H
+#define SC_SYSTEM_H
+
+#endif