diff --git a/core/systems/ExtensionSys.cpp b/core/ExtensionSys.cpp
similarity index 100%
rename from core/systems/ExtensionSys.cpp
rename to core/ExtensionSys.cpp
diff --git a/core/systems/ExtensionSys.h b/core/ExtensionSys.h
similarity index 100%
rename from core/systems/ExtensionSys.h
rename to core/ExtensionSys.h
diff --git a/core/systems/ForwardSys.cpp b/core/ForwardSys.cpp
similarity index 100%
rename from core/systems/ForwardSys.cpp
rename to core/ForwardSys.cpp
diff --git a/core/systems/ForwardSys.h b/core/ForwardSys.h
similarity index 100%
rename from core/systems/ForwardSys.h
rename to core/ForwardSys.h
diff --git a/core/systems/HandleSys.cpp b/core/HandleSys.cpp
similarity index 100%
rename from core/systems/HandleSys.cpp
rename to core/HandleSys.cpp
diff --git a/core/systems/HandleSys.h b/core/HandleSys.h
similarity index 100%
rename from core/systems/HandleSys.h
rename to core/HandleSys.h
diff --git a/core/systems/LibrarySys.cpp b/core/LibrarySys.cpp
similarity index 100%
rename from core/systems/LibrarySys.cpp
rename to core/LibrarySys.cpp
diff --git a/core/systems/LibrarySys.h b/core/LibrarySys.h
similarity index 100%
rename from core/systems/LibrarySys.h
rename to core/LibrarySys.h
diff --git a/core/Logger.cpp b/core/Logger.cpp
index cc35ef1a..977bf732 100644
--- a/core/Logger.cpp
+++ b/core/Logger.cpp
@@ -34,7 +34,7 @@
 #include "sourcemm_api.h"
 #include "sm_stringutil.h"
 #include "Logger.h"
-#include "systems/LibrarySys.h"
+#include "LibrarySys.h"
 #include "TimerSys.h"
 #include "sm_version.h"
 
diff --git a/core/PlayerManager.cpp b/core/PlayerManager.cpp
index b17a6f9c..55c25217 100644
--- a/core/PlayerManager.cpp
+++ b/core/PlayerManager.cpp
@@ -46,7 +46,7 @@
 #include <inetchannel.h>
 #include <iclient.h>
 #include "GameConfigs.h"
-#include "systems/ExtensionSys.h"
+#include "ExtensionSys.h"
 
 PlayerManager g_Players;
 bool g_OnMapStarted = false;
diff --git a/core/systems/PluginInfoDatabase.cpp b/core/PluginInfoDatabase.cpp
similarity index 100%
rename from core/systems/PluginInfoDatabase.cpp
rename to core/PluginInfoDatabase.cpp
diff --git a/core/systems/PluginInfoDatabase.h b/core/PluginInfoDatabase.h
similarity index 100%
rename from core/systems/PluginInfoDatabase.h
rename to core/PluginInfoDatabase.h
diff --git a/core/systems/PluginSys.cpp b/core/PluginSys.cpp
similarity index 100%
rename from core/systems/PluginSys.cpp
rename to core/PluginSys.cpp
diff --git a/core/systems/PluginSys.h b/core/PluginSys.h
similarity index 100%
rename from core/systems/PluginSys.h
rename to core/PluginSys.h
diff --git a/core/systems/ShareSys.cpp b/core/ShareSys.cpp
similarity index 100%
rename from core/systems/ShareSys.cpp
rename to core/ShareSys.cpp
diff --git a/core/systems/ShareSys.h b/core/ShareSys.h
similarity index 100%
rename from core/systems/ShareSys.h
rename to core/ShareSys.h
diff --git a/core/msvc8/sourcemod_mm.vcproj b/core/msvc8/sourcemod_mm.vcproj
index fcfc7357..9aea667c 100644
--- a/core/msvc8/sourcemod_mm.vcproj
+++ b/core/msvc8/sourcemod_mm.vcproj
@@ -1291,31 +1291,31 @@
 				UniqueIdentifier="{7D3AB33D-C1AD-46ee-B505-FEA8B6EF18E4}"
 				>
 				<File
-					RelativePath="..\systems\ExtensionSys.h"
+					RelativePath="..\ExtensionSys.h"
 					>
 				</File>
 				<File
-					RelativePath="..\systems\ForwardSys.h"
+					RelativePath="..\ForwardSys.h"
 					>
 				</File>
 				<File
-					RelativePath="..\systems\HandleSys.h"
+					RelativePath="..\HandleSys.h"
 					>
 				</File>
 				<File
-					RelativePath="..\systems\LibrarySys.h"
+					RelativePath="..\LibrarySys.h"
 					>
 				</File>
 				<File
-					RelativePath="..\systems\PluginInfoDatabase.h"
+					RelativePath="..\PluginInfoDatabase.h"
 					>
 				</File>
 				<File
-					RelativePath="..\systems\PluginSys.h"
+					RelativePath="..\PluginSys.h"
 					>
 				</File>
 				<File
-					RelativePath="..\systems\ShareSys.h"
+					RelativePath="..\ShareSys.h"
 					>
 				</File>
 			</Filter>
@@ -1325,31 +1325,31 @@
 				UniqueIdentifier="{D1864A10-FF5F-4672-A70E-57C9F7486F92}"
 				>
 				<File
-					RelativePath="..\systems\ExtensionSys.cpp"
+					RelativePath="..\ExtensionSys.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\systems\ForwardSys.cpp"
+					RelativePath="..\ForwardSys.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\systems\HandleSys.cpp"
+					RelativePath="..\HandleSys.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\systems\LibrarySys.cpp"
+					RelativePath="..\LibrarySys.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\systems\PluginInfoDatabase.cpp"
+					RelativePath="..\PluginInfoDatabase.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\systems\PluginSys.cpp"
+					RelativePath="..\PluginSys.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\systems\ShareSys.cpp"
+					RelativePath="..\ShareSys.cpp"
 					>
 				</File>
 			</Filter>
diff --git a/core/msvc9/sourcemod_mm.vcproj b/core/msvc9/sourcemod_mm.vcproj
index d3f79183..1491051b 100644
--- a/core/msvc9/sourcemod_mm.vcproj
+++ b/core/msvc9/sourcemod_mm.vcproj
@@ -844,6 +844,14 @@
 				RelativePath="..\EventManager.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\ExtensionSys.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\ForwardSys.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\frame_hooks.cpp"
 				>
@@ -860,6 +868,14 @@
 				RelativePath="..\HalfLife2.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\HandleSys.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\LibrarySys.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\Logger.cpp"
 				>
@@ -908,10 +924,22 @@
 				RelativePath="..\PlayerManager.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\PluginInfoDatabase.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\PluginSys.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\Profiler.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\ShareSys.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\sm_autonatives.cpp"
 				>
@@ -1026,6 +1054,14 @@
 				RelativePath="..\EventManager.h"
 				>
 			</File>
+			<File
+				RelativePath="..\ExtensionSys.h"
+				>
+			</File>
+			<File
+				RelativePath="..\ForwardSys.h"
+				>
+			</File>
 			<File
 				RelativePath="..\frame_hooks.h"
 				>
@@ -1042,6 +1078,14 @@
 				RelativePath="..\HalfLife2.h"
 				>
 			</File>
+			<File
+				RelativePath="..\HandleSys.h"
+				>
+			</File>
+			<File
+				RelativePath="..\LibrarySys.h"
+				>
+			</File>
 			<File
 				RelativePath="..\Logger.h"
 				>
@@ -1090,10 +1134,22 @@
 				RelativePath="..\PlayerManager.h"
 				>
 			</File>
+			<File
+				RelativePath="..\PluginInfoDatabase.h"
+				>
+			</File>
+			<File
+				RelativePath="..\PluginSys.h"
+				>
+			</File>
 			<File
 				RelativePath="..\Profiler.h"
 				>
 			</File>
+			<File
+				RelativePath="..\ShareSys.h"
+				>
+			</File>
 			<File
 				RelativePath="..\sm_autonatives.h"
 				>
@@ -1264,79 +1320,6 @@
 				>
 			</File>
 		</Filter>
-		<Filter
-			Name="Systems"
-			UniqueIdentifier="{63775418-DF3F-4198-BFB1-738B19EE3EE0}"
-			>
-			<Filter
-				Name="Header Files"
-				Filter="h;hpp;hxx;hm;inl;inc;xsd"
-				UniqueIdentifier="{7D3AB33D-C1AD-46ee-B505-FEA8B6EF18E4}"
-				>
-				<File
-					RelativePath="..\systems\ExtensionSys.h"
-					>
-				</File>
-				<File
-					RelativePath="..\systems\ForwardSys.h"
-					>
-				</File>
-				<File
-					RelativePath="..\systems\HandleSys.h"
-					>
-				</File>
-				<File
-					RelativePath="..\systems\LibrarySys.h"
-					>
-				</File>
-				<File
-					RelativePath="..\systems\PluginInfoDatabase.h"
-					>
-				</File>
-				<File
-					RelativePath="..\systems\PluginSys.h"
-					>
-				</File>
-				<File
-					RelativePath="..\systems\ShareSys.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Source Files"
-				Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-				UniqueIdentifier="{D1864A10-FF5F-4672-A70E-57C9F7486F92}"
-				>
-				<File
-					RelativePath="..\systems\ExtensionSys.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\systems\ForwardSys.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\systems\HandleSys.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\systems\LibrarySys.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\systems\PluginInfoDatabase.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\systems\PluginSys.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\systems\ShareSys.cpp"
-					>
-				</File>
-			</Filter>
-		</Filter>
 		<Filter
 			Name="SourcePawn"
 			UniqueIdentifier="{C3C3DC6E-E392-4916-B893-7ACB92192DE0}"
diff --git a/core/sourcemod.cpp b/core/sourcemod.cpp
index 9a3987ad..19ed9d92 100644
--- a/core/sourcemod.cpp
+++ b/core/sourcemod.cpp
@@ -32,7 +32,7 @@
 #include <stdio.h>
 #include "sourcemod.h"
 #include "sourcemm_api.h"
-#include "systems/LibrarySys.h"
+#include "LibrarySys.h"
 #include <sh_string.h>
 #include "PluginSys.h"
 #include "ShareSys.h"