diff --git a/core-legacy/msvc7/sourcemm.sln b/core-legacy/msvc7/sourcemm.sln
deleted file mode 100644
index fa8eb75..0000000
--- a/core-legacy/msvc7/sourcemm.sln
+++ /dev/null
@@ -1,21 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sourcemm", "sourcemm.vcproj", "{F7D47743-73B3-49B5-9D76-2333C5DFD565}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		Release = Release
-	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{F7D47743-73B3-49B5-9D76-2333C5DFD565}.Debug.ActiveCfg = Debug|Win32
-		{F7D47743-73B3-49B5-9D76-2333C5DFD565}.Debug.Build.0 = Debug|Win32
-		{F7D47743-73B3-49B5-9D76-2333C5DFD565}.Release.ActiveCfg = Release|Win32
-		{F7D47743-73B3-49B5-9D76-2333C5DFD565}.Release.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
-	EndGlobalSection
-EndGlobal
diff --git a/core-legacy/msvc7/sourcemm.vcproj b/core-legacy/msvc7/sourcemm.vcproj
deleted file mode 100644
index 556c859..0000000
--- a/core-legacy/msvc7/sourcemm.vcproj
+++ /dev/null
@@ -1,258 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="sourcemm"
-	ProjectGUID="{F7D47743-73B3-49B5-9D76-2333C5DFD565}"
-	RootNamespace="sourcemm"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="2"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SOURCEMM_EXPORTS"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="tier1.lib vstdlib.lib tier0.lib"
-				OutputFile="$(OutDir)/server.dll"
-				LinkIncremental="2"
-				IgnoreDefaultLibraryNames="libc.lib;libcmt.lib;libcmtd.lib"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="$(OutDir)/sourcemm.pdb"
-				SubSystem="2"
-				EnableCOMDATFolding="1"
-				ImportLibrary="$(OutDir)/sourcemm.lib"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
-			ConfigurationType="2"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="TRUE"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SOURCEMM_EXPORTS"
-				StringPooling="TRUE"
-				ExceptionHandling="TRUE"
-				RuntimeLibrary="4"
-				BufferSecurityCheck="FALSE"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="FALSE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="tier0.lib tier1.lib vstdlib.lib"
-				OutputFile="$(OutDir)/server.dll"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libcd.lib;libcmt.lib;libcmtd.lib"
-				GenerateDebugInformation="TRUE"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)/sourcemm.lib"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-			<File
-				RelativePath="..\concommands.cpp">
-			</File>
-			<File
-				RelativePath="..\CPlugin.cpp">
-			</File>
-			<File
-				RelativePath="..\CSmmAPI.cpp">
-			</File>
-			<File
-				RelativePath="..\oslink.cpp">
-			</File>
-			<File
-				RelativePath="..\sourcemm.cpp">
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Detect64BitPortabilityProblems="FALSE"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\util.cpp">
-			</File>
-			<File
-				RelativePath="..\vsp_listener.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-			<File
-				RelativePath="..\concommands.h">
-			</File>
-			<File
-				RelativePath="..\CPlugin.h">
-			</File>
-			<File
-				RelativePath="..\CSmmAPI.h">
-			</File>
-			<File
-				RelativePath="..\oslink.h">
-			</File>
-			<File
-				RelativePath="..\resource.h">
-			</File>
-			<File
-				RelativePath="..\sourcemm.h">
-			</File>
-			<File
-				RelativePath="..\util.h">
-			</File>
-			<File
-				RelativePath="..\vsp_listener.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
-			<File
-				RelativePath="..\version.rc">
-			</File>
-		</Filter>
-		<Filter
-			Name="Interfaces"
-			Filter="">
-			<File
-				RelativePath="..\IPluginManager.h">
-			</File>
-			<File
-				RelativePath="..\ISmmAPI.h">
-			</File>
-			<File
-				RelativePath="..\ISmmPlugin.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="SourceHook"
-			Filter="">
-			<File
-				RelativePath="..\..\sourcehook\sh_list.h">
-			</File>
-			<File
-				RelativePath="..\..\sourcehook\sh_stack.h">
-			</File>
-			<File
-				RelativePath="..\..\sourcehook\sh_string.h">
-			</File>
-			<File
-				RelativePath="..\..\sourcehook\sh_tinyhash.h">
-			</File>
-			<File
-				RelativePath="..\..\sourcehook\sh_vector.h">
-			</File>
-			<Filter
-				Name="Headers"
-				Filter="">
-				<File
-					RelativePath="..\..\sourcehook\FastDelegate.h">
-				</File>
-				<File
-					RelativePath="..\..\sourcehook\sh_memfuncinfo.h">
-				</File>
-				<File
-					RelativePath="..\..\sourcehook\sh_memory.h">
-				</File>
-				<File
-					RelativePath="..\..\sourcehook\sourcehook.cpp">
-				</File>
-				<File
-					RelativePath="..\..\sourcehook\sourcehook.h">
-				</File>
-				<File
-					RelativePath="..\..\sourcehook\sourcehook_impl.h">
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="HL2SDK"
-			Filter="">
-			<File
-				RelativePath="..\convar_smm.h">
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/core-legacy/msvc8/sourcemm.sln b/core-legacy/msvc8/sourcemm.sln
deleted file mode 100644
index b338452..0000000
--- a/core-legacy/msvc8/sourcemm.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sourcemm", "sourcemm.vcproj", "{F7D47743-73B3-49B5-9D76-2333C5DFD565}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F7D47743-73B3-49B5-9D76-2333C5DFD565}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F7D47743-73B3-49B5-9D76-2333C5DFD565}.Debug|Win32.Build.0 = Debug|Win32
-		{F7D47743-73B3-49B5-9D76-2333C5DFD565}.Release|Win32.ActiveCfg = Release|Win32
-		{F7D47743-73B3-49B5-9D76-2333C5DFD565}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/core-legacy/msvc8/sourcemm.vcproj b/core-legacy/msvc8/sourcemm.vcproj
deleted file mode 100644
index 6430d55..0000000
--- a/core-legacy/msvc8/sourcemm.vcproj
+++ /dev/null
@@ -1,366 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="sourcemm"
-	ProjectGUID="{F7D47743-73B3-49B5-9D76-2333C5DFD565}"
-	RootNamespace="sourcemm"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(HL2SDK)\public&quot;;&quot;$(HL2SDK)\public\dlls&quot;;&quot;$(HL2SDK)\public\engine&quot;;&quot;$(HL2SDK)\public\tier0&quot;;&quot;$(HL2SDK)\public\tier1&quot;;&quot;$(HL2SDK)\public\vstdlib&quot;;..\..;..\..\sourcehook"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SOURCEMM_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="&quot;$(HL2SDK)\lib\public\tier0.lib&quot; &quot;$(HL2SDK)\lib\public\tier1.lib&quot; &quot;$(HL2SDK)\lib\public\vstdlib.lib&quot;"
-				OutputFile="$(OutDir)/server.dll"
-				LinkIncremental="2"
-				IgnoreDefaultLibraryNames="libc.lib;libcd.lib;libcmt.lib"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/sourcemm.pdb"
-				SubSystem="2"
-				EnableCOMDATFolding="1"
-				ImportLibrary="$(OutDir)/sourcemm.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="&quot;$(HL2SDK)\public&quot;;&quot;$(HL2SDK)\public\dlls&quot;;&quot;$(HL2SDK)\public\engine&quot;;&quot;$(HL2SDK)\public\tier0&quot;;&quot;$(HL2SDK)\public\tier1&quot;;&quot;$(HL2SDK)\public\vstdlib&quot;;..\..;..\..\sourcehook"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SOURCEMM_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="&quot;$(HL2SDK)\lib\public\tier0.lib&quot; &quot;$(HL2SDK)\lib\public\tier1.lib&quot; &quot;$(HL2SDK)\lib\public\vstdlib.lib&quot;"
-				OutputFile="$(OutDir)/server.dll"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libc.lib;libcd.lib;libcmtd.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)/sourcemm.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\concommands.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\CPlugin.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\CSmmAPI.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\oslink.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\sourcemm.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Detect64BitPortabilityProblems="false"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\util.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\vsp_listener.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\concommands.h"
-				>
-			</File>
-			<File
-				RelativePath="..\CPlugin.h"
-				>
-			</File>
-			<File
-				RelativePath="..\CSmmAPI.h"
-				>
-			</File>
-			<File
-				RelativePath="..\oslink.h"
-				>
-			</File>
-			<File
-				RelativePath="..\sourcemm.h"
-				>
-			</File>
-			<File
-				RelativePath="..\svn_version.h"
-				>
-			</File>
-			<File
-				RelativePath="..\util.h"
-				>
-			</File>
-			<File
-				RelativePath="..\vsp_listener.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\svn_version.tpl"
-				>
-			</File>
-			<File
-				RelativePath="..\version.rc"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Interfaces"
-			>
-			<File
-				RelativePath="..\IPluginManager.h"
-				>
-			</File>
-			<File
-				RelativePath="..\ISmmAPI.h"
-				>
-			</File>
-			<File
-				RelativePath="..\ISmmPlugin.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="SourceHook"
-			>
-			<File
-				RelativePath="..\..\sourcehook\sh_list.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sourcehook\sh_stack.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sourcehook\sh_string.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sourcehook\sh_tinyhash.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\sourcehook\sh_vector.h"
-				>
-			</File>
-			<Filter
-				Name="Headers"
-				>
-				<File
-					RelativePath="..\..\sourcehook\FastDelegate.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\sourcehook\sh_memfuncinfo.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\sourcehook\sh_memory.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\sourcehook\sourcehook.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\sourcehook\sourcehook.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\sourcehook\sourcehook_impl.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="HL2SDK"
-			>
-			<File
-				RelativePath="..\convar_smm.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/core/msvc9/sourcemm.sln b/core-legacy/msvc9/mm_core-legacy.sln
similarity index 82%
rename from core/msvc9/sourcemm.sln
rename to core-legacy/msvc9/mm_core-legacy.sln
index b29443a..fdd8fba 100644
--- a/core/msvc9/sourcemm.sln
+++ b/core-legacy/msvc9/mm_core-legacy.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "metamodsource_ep2", "sourcemm.vcproj", "{F7D47743-73B3-49B5-9D76-2333C5DFD565}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mm_core-legacy", "mm_core-legacy.vcproj", "{F7D47743-73B3-49B5-9D76-2333C5DFD565}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/core-legacy/msvc9/sourcemm.vcproj b/core-legacy/msvc9/mm_core-legacy.vcproj
similarity index 75%
rename from core-legacy/msvc9/sourcemm.vcproj
rename to core-legacy/msvc9/mm_core-legacy.vcproj
index 90d6340..a0c540d 100644
--- a/core-legacy/msvc9/sourcemm.vcproj
+++ b/core-legacy/msvc9/mm_core-legacy.vcproj
@@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
-	Name="sourcemm"
+	Name="mm_core-legacy"
 	ProjectGUID="{F7D47743-73B3-49B5-9D76-2333C5DFD565}"
-	RootNamespace="sourcemm"
+	RootNamespace="mm_core-legacy"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
 	>
@@ -18,10 +18,9 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -42,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(HL2SDK)\public&quot;;&quot;$(HL2SDK)\public\dlls&quot;;&quot;$(HL2SDK)\public\engine&quot;;&quot;$(HL2SDK)\public\tier0&quot;;&quot;$(HL2SDK)\public\tier1&quot;;&quot;$(HL2SDK)\public\vstdlib&quot;;..\..;..\..\sourcehook"
+				AdditionalIncludeDirectories="..;..\..\loader;..\sourcehook;&quot;$(HL2SDK)\public&quot;;&quot;$(HL2SDK)\public\dlls&quot;;&quot;$(HL2SDK)\public\engine&quot;;&quot;$(HL2SDK)\public\tier0&quot;;&quot;$(HL2SDK)\public\tier1&quot;;&quot;$(HL2SDK)\public\vstdlib&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SOURCEMM_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -65,7 +64,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="&quot;$(HL2SDK)\lib\public\tier0.lib&quot; &quot;$(HL2SDK)\lib\public\tier1.lib&quot; &quot;$(HL2SDK)\lib\public\vstdlib.lib&quot;"
-				OutputFile="$(OutDir)/server.dll"
+				OutputFile="$(OutDir)/metamod.1.ep1.dll"
 				LinkIncremental="2"
 				IgnoreDefaultLibraryNames="libc.lib;libcd.lib;libcmt.lib"
 				GenerateDebugInformation="true"
@@ -101,10 +100,9 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			CharacterSet="2"
 			>
 			<Tool
@@ -127,7 +125,7 @@
 				Optimization="3"
 				FavorSizeOrSpeed="1"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="&quot;$(HL2SDK)\public&quot;;&quot;$(HL2SDK)\public\dlls&quot;;&quot;$(HL2SDK)\public\engine&quot;;&quot;$(HL2SDK)\public\tier0&quot;;&quot;$(HL2SDK)\public\tier1&quot;;&quot;$(HL2SDK)\public\vstdlib&quot;;..\..;..\..\sourcehook"
+				AdditionalIncludeDirectories="..;..\..\loader;..\sourcehook;&quot;$(HL2SDK)\public&quot;;&quot;$(HL2SDK)\public\dlls&quot;;&quot;$(HL2SDK)\public\engine&quot;;&quot;$(HL2SDK)\public\tier0&quot;;&quot;$(HL2SDK)\public\tier1&quot;;&quot;$(HL2SDK)\public\vstdlib&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SOURCEMM_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="true"
 				ExceptionHandling="1"
@@ -151,7 +149,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="&quot;$(HL2SDK)\lib\public\tier0.lib&quot; &quot;$(HL2SDK)\lib\public\tier1.lib&quot; &quot;$(HL2SDK)\lib\public\vstdlib.lib&quot;"
-				OutputFile="$(OutDir)/server.dll"
+				OutputFile="$(OutDir)/metamod.1.ep1.dll"
 				LinkIncremental="1"
 				IgnoreDefaultLibraryNames="libc.lib;libcd.lib;libcmtd.lib"
 				GenerateDebugInformation="true"
@@ -213,19 +211,15 @@
 			<File
 				RelativePath="..\sourcemm.cpp"
 				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						Detect64BitPortabilityProblems="false"
-					/>
-				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\util.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\vsp_bridge.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\vsp_listener.cpp"
 				>
@@ -303,50 +297,50 @@
 			Name="SourceHook"
 			>
 			<File
-				RelativePath="..\..\sourcehook\sh_list.h"
+				RelativePath="..\sourcehook\sh_list.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\sourcehook\sh_stack.h"
+				RelativePath="..\sourcehook\sh_stack.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\sourcehook\sh_string.h"
+				RelativePath="..\sourcehook\sh_string.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\sourcehook\sh_tinyhash.h"
+				RelativePath="..\sourcehook\sh_tinyhash.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\sourcehook\sh_vector.h"
+				RelativePath="..\sourcehook\sh_vector.h"
 				>
 			</File>
 			<Filter
 				Name="Headers"
 				>
 				<File
-					RelativePath="..\..\sourcehook\FastDelegate.h"
+					RelativePath="..\sourcehook\FastDelegate.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\sourcehook\sh_memfuncinfo.h"
+					RelativePath="..\sourcehook\sh_memfuncinfo.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\sourcehook\sh_memory.h"
+					RelativePath="..\sourcehook\sh_memory.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\sourcehook\sourcehook.cpp"
+					RelativePath="..\sourcehook\sourcehook.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\sourcehook\sourcehook.h"
+					RelativePath="..\sourcehook\sourcehook.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\sourcehook\sourcehook_impl.h"
+					RelativePath="..\sourcehook\sourcehook_impl.h"
 					>
 				</File>
 			</Filter>
diff --git a/core/Makefile b/core/Makefile
index 2394b59..cb945b0 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -36,6 +36,7 @@ ifeq "$(ENGINE)" "orangebox"
 	HL2SDK = $(HL2SDK_OB)
 	HL2PUB = $(HL2SDK_OB)/public
 	HL2LIB = $(HL2SDK_OB)/lib/linux
+	CFLAGS += -DSOURCE_ENGINE=3
 	INCLUDE += -I$(HL2SDK_OB)/public/game/server
 	SRCDS = $(SRCDS_BASE)/orangebox
 	BINARY = metamod.2.ep2.so
@@ -45,15 +46,17 @@ ifeq "$(ENGINE)" "left4dead"
 	HL2SDK = $(HL2SDK_L4D)
 	HL2PUB = $(HL2SDK_L4D)/public
 	HL2LIB = $(HL2SDK_L4D)/lib/linux
+	CFLAGS += -DSOURCE_ENGINE=4
 	INCLUDE += -I$(HL2SDK_L4D)/public/game/server
 	SRCDS = $(SRCDS_BASE)/l4d_demo
-	BINARY = metamod2.l4d.so
+	BINARY = metamod.2.l4d.so
 	override ENGSET = true
 endif
 
+CFLAGS += -DSE_ORANGEBOX=3 -DSE_LEFT4DEAD=4
+
 LINK += $(HL2LIB)/tier1_i486.a vstdlib_i486.so tier0_i486.so -static-libgcc
 
-	
 INCLUDE += -I. -I.. -I$(HL2PUB) -I$(HL2PUB)/engine -I$(HL2PUB)/mathlib -I$(HL2PUB)/vstdlib \
 	-I$(HL2PUB)/tier0 -I$(HL2PUB)/tier1 -I. -Isourcehook -I../loader
 
diff --git a/core/metamod_console.cpp b/core/metamod_console.cpp
index 6683605..66c1a4b 100644
--- a/core/metamod_console.cpp
+++ b/core/metamod_console.cpp
@@ -97,6 +97,7 @@ bool Command_Meta(IMetamodSourceCommandInfo *info)
 			CONMSG("  DLL Path: %s\n", g_Metamod.GetGameBinaryPath());
 			CONMSG("  Interface: ServerGameDLL%03d\n", g_Metamod.GetGameDLLVersion());
 
+#if 0
 			int engine = g_Metamod.GetSourceEngineBuild();
 			if (engine == SOURCE_ENGINE_ORIGINAL)
 			{
@@ -110,6 +111,13 @@ bool Command_Meta(IMetamodSourceCommandInfo *info)
 			{
 				CONMSG("  Engine: Episode 2 (Orange Box, 2007)\n");
 			}
+#endif
+
+#if SOURCE_ENGINE == SE_ORANGEBOX
+			CONMSG("  Engine: Episode 2 (Orange Box, 2007)\n");
+#else
+			CONMSG("  Engine: Left 4 Dead (2008)\n");
+#endif
 
 			// Display user messages
 			int messages = g_Metamod.GetUserMessageCount();
diff --git a/core/msvc8/sourcemm.sln b/core/msvc8/sourcemm.sln
deleted file mode 100644
index b338452..0000000
--- a/core/msvc8/sourcemm.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sourcemm", "sourcemm.vcproj", "{F7D47743-73B3-49B5-9D76-2333C5DFD565}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F7D47743-73B3-49B5-9D76-2333C5DFD565}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F7D47743-73B3-49B5-9D76-2333C5DFD565}.Debug|Win32.Build.0 = Debug|Win32
-		{F7D47743-73B3-49B5-9D76-2333C5DFD565}.Release|Win32.ActiveCfg = Release|Win32
-		{F7D47743-73B3-49B5-9D76-2333C5DFD565}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/core/msvc8/sourcemm.vcproj b/core/msvc8/sourcemm.vcproj
deleted file mode 100644
index 4d35750..0000000
--- a/core/msvc8/sourcemm.vcproj
+++ /dev/null
@@ -1,418 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="metamodsource_ep2"
-	ProjectGUID="{F7D47743-73B3-49B5-9D76-2333C5DFD565}"
-	RootNamespace="sourcemm"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..;..\..\..;..\..\..\sourcehook;&quot;$(HL2SDKOB)\public&quot;;&quot;$(HL2SDKOB)\public\engine&quot;;&quot;$(HL2SDKOB)\public\game\server&quot;;&quot;$(HL2SDKOB)\public\tier0&quot;;&quot;$(HL2SDKOB)\public\tier1&quot;;&quot;$(HL2SDKOB)\public\vstdlib&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SOURCEMM_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="&quot;$(HL2SDKOB)\lib\public\tier0.lib&quot; &quot;$(HL2SDKOB)\lib\public\tier1.lib&quot; &quot;$(HL2SDKOB)\lib\public\vstdlib.lib&quot;"
-				OutputFile="$(OutDir)/server.dll"
-				LinkIncremental="2"
-				IgnoreDefaultLibraryNames="libc.lib;libcd.lib;libcmt.lib"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/sourcemm.pdb"
-				SubSystem="2"
-				EnableCOMDATFolding="1"
-				ImportLibrary="$(OutDir)/sourcemm.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\..;..\..\..;..\..\..\sourcehook;&quot;$(HL2SDKOB)\public&quot;;&quot;$(HL2SDKOB)\public\engine&quot;;&quot;$(HL2SDKOB)\public\game\server&quot;;&quot;$(HL2SDKOB)\public\tier0&quot;;&quot;$(HL2SDKOB)\public\tier1&quot;;&quot;$(HL2SDKOB)\public\vstdlib&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SOURCEMM_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="&quot;$(HL2SDKOB)\lib\public\tier0.lib&quot; &quot;$(HL2SDKOB)\lib\public\tier1.lib&quot; &quot;$(HL2SDKOB)\lib\public\vstdlib.lib&quot;"
-				OutputFile="$(OutDir)/server.dll"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libc.lib;libcd.lib;libcmtd.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)/sourcemm.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\version.rc"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Interfaces"
-			>
-			<File
-				RelativePath="..\..\IPluginManager.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ISmmAPI.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ISmmPlugin.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ISmmPluginExt.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Metamod"
-			>
-			<Filter
-				Name="Source Files"
-				>
-				<File
-					RelativePath="..\..\metamod.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\metamod_console.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\metamod_oslink.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\metamod_plugins.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\metamod_util.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Header Files"
-				>
-				<File
-					RelativePath="..\..\metamod.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\metamod_console.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\metamod_oslink.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\metamod_plugins.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\metamod_provider.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\metamod_util.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Provider"
-			>
-			<Filter
-				Name="Header Files"
-				>
-				<File
-					RelativePath="..\console.h"
-					>
-				</File>
-				<File
-					RelativePath="..\provider_ep2.h"
-					>
-				</File>
-				<File
-					RelativePath="..\vsp_listener.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Source Files"
-				>
-				<File
-					RelativePath="..\console.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\provider_ep2.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\vsp_listener.cpp"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="SourceHook"
-			>
-			<Filter
-				Name="Source Files"
-				>
-				<File
-					RelativePath="..\..\..\sourcehook\sourcehook.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\sourcehook\sourcehook_hookmangen.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Header Files"
-				>
-				<File
-					RelativePath="..\..\..\sourcehook\FastDelegate.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\sourcehook\sh_list.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\sourcehook\sh_memfuncinfo.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\sourcehook\sh_memory.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\sourcehook\sh_pagealloc.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\sourcehook\sh_stack.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\sourcehook\sh_string.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\sourcehook\sh_tinyhash.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\sourcehook\sh_vector.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\sourcehook\sourcehook.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\sourcehook\sourcehook_hookmangen.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\sourcehook\sourcehook_hookmangen_x86.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\sourcehook\sourcehook_impl.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\sourcehook\sourcehook_impl_chook.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\sourcehook\sourcehook_impl_chookidman.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\sourcehook\sourcehook_impl_chookmaninfo.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\sourcehook\sourcehook_impl_ciface.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\sourcehook\sourcehook_impl_cproto.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\sourcehook\sourcehook_impl_cvfnptr.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\sourcehook\sourcehook_pibuilder.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/core/msvc9/mm_core.sln b/core/msvc9/mm_core.sln
new file mode 100644
index 0000000..e0fcb9a
--- /dev/null
+++ b/core/msvc9/mm_core.sln
@@ -0,0 +1,26 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mm_core", "mm_core.vcproj", "{F7D47743-73B3-49B5-9D76-2333C5DFD565}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug - Left 4 Dead|Win32 = Debug - Left 4 Dead|Win32
+		Debug - Orange Box|Win32 = Debug - Orange Box|Win32
+		Release - Left 4 Dead|Win32 = Release - Left 4 Dead|Win32
+		Release - Orange Box|Win32 = Release - Orange Box|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{F7D47743-73B3-49B5-9D76-2333C5DFD565}.Debug - Left 4 Dead|Win32.ActiveCfg = Debug - Left 4 Dead|Win32
+		{F7D47743-73B3-49B5-9D76-2333C5DFD565}.Debug - Left 4 Dead|Win32.Build.0 = Debug - Left 4 Dead|Win32
+		{F7D47743-73B3-49B5-9D76-2333C5DFD565}.Debug - Orange Box|Win32.ActiveCfg = Debug - Orange Box|Win32
+		{F7D47743-73B3-49B5-9D76-2333C5DFD565}.Debug - Orange Box|Win32.Build.0 = Debug - Orange Box|Win32
+		{F7D47743-73B3-49B5-9D76-2333C5DFD565}.Release - Left 4 Dead|Win32.ActiveCfg = Release - Left 4 Dead|Win32
+		{F7D47743-73B3-49B5-9D76-2333C5DFD565}.Release - Left 4 Dead|Win32.Build.0 = Release - Left 4 Dead|Win32
+		{F7D47743-73B3-49B5-9D76-2333C5DFD565}.Release - Orange Box|Win32.ActiveCfg = Release - Orange Box|Win32
+		{F7D47743-73B3-49B5-9D76-2333C5DFD565}.Release - Orange Box|Win32.Build.0 = Release - Orange Box|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/core/msvc9/mm_core.vcproj b/core/msvc9/mm_core.vcproj
new file mode 100644
index 0000000..4aa9c00
--- /dev/null
+++ b/core/msvc9/mm_core.vcproj
@@ -0,0 +1,586 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="mm_core"
+	ProjectGUID="{F7D47743-73B3-49B5-9D76-2333C5DFD565}"
+	RootNamespace="mm_core"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug - Orange Box|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..;..\..\loader;..\sourcehook;&quot;$(HL2SDKOB)\public&quot;;&quot;$(HL2SDKOB)\public\engine&quot;;&quot;$(HL2SDKOB)\public\game\server&quot;;&quot;$(HL2SDKOB)\public\tier0&quot;;&quot;$(HL2SDKOB)\public\tier1&quot;;&quot;$(HL2SDKOB)\public\vstdlib&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SOURCEMM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SE_ORANGEBOX=3;SE_LEFT4DEAD=4;SOURCE_ENGINE=3"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				RuntimeTypeInfo="false"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="&quot;$(HL2SDKOB)\lib\public\tier0.lib&quot; &quot;$(HL2SDKOB)\lib\public\tier1.lib&quot; &quot;$(HL2SDKOB)\lib\public\vstdlib.lib&quot;"
+				OutputFile="$(OutDir)/metamod.2.ep2.dll"
+				LinkIncremental="2"
+				IgnoreDefaultLibraryNames="libc.lib;libcd.lib;libcmt.lib"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/sourcemm.pdb"
+				SubSystem="2"
+				EnableCOMDATFolding="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				ImportLibrary="$(OutDir)/sourcemm.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release - Orange Box|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories="..;..\..\loader;..\sourcehook;&quot;$(HL2SDKOB)\public&quot;;&quot;$(HL2SDKOB)\public\engine&quot;;&quot;$(HL2SDKOB)\public\game\server&quot;;&quot;$(HL2SDKOB)\public\tier0&quot;;&quot;$(HL2SDKOB)\public\tier1&quot;;&quot;$(HL2SDKOB)\public\vstdlib&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SOURCEMM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SE_ORANGEBOX=3;SE_LEFT4DEAD=4;SOURCE_ENGINE=3"
+				StringPooling="true"
+				ExceptionHandling="1"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="false"
+				RuntimeTypeInfo="false"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="&quot;$(HL2SDKOB)\lib\public\tier0.lib&quot; &quot;$(HL2SDKOB)\lib\public\tier1.lib&quot; &quot;$(HL2SDKOB)\lib\public\vstdlib.lib&quot;"
+				OutputFile="$(OutDir)/metamod.2.ep2.dll"
+				LinkIncremental="1"
+				IgnoreDefaultLibraryNames="libc.lib;libcd.lib;libcmtd.lib"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				ImportLibrary="$(OutDir)/sourcemm.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug - Left 4 Dead|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..;..\..\loader;..\sourcehook;&quot;$(HL2SDKL4D)\public&quot;;&quot;$(HL2SDKL4D)\public\engine&quot;;&quot;$(HL2SDKL4D)\public\game\server&quot;;&quot;$(HL2SDKL4D)\public\tier0&quot;;&quot;$(HL2SDKL4D)\public\tier1&quot;;&quot;$(HL2SDKL4D)\public\vstdlib&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SOURCEMM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SE_ORANGEBOX=3;SE_LEFT4DEAD=4;SOURCE_ENGINE=4"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				RuntimeTypeInfo="false"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="&quot;$(HL2SDKL4D)\lib\public\tier0.lib&quot; &quot;$(HL2SDKL4D)\lib\public\tier1.lib&quot; &quot;$(HL2SDKL4D)\lib\public\vstdlib.lib&quot;"
+				OutputFile="$(OutDir)/metamod.2.l4d.dll"
+				LinkIncremental="2"
+				IgnoreDefaultLibraryNames="libc.lib;libcd.lib;libcmt.lib"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/sourcemm.pdb"
+				SubSystem="2"
+				EnableCOMDATFolding="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				ImportLibrary="$(OutDir)/sourcemm.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release - Left 4 Dead|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				FavorSizeOrSpeed="1"
+				OmitFramePointers="true"
+				AdditionalIncludeDirectories="..;..\..\loader;..\sourcehook;&quot;$(HL2SDKL4D)\public&quot;;&quot;$(HL2SDKL4D)\public\engine&quot;;&quot;$(HL2SDKL4D)\public\game\server&quot;;&quot;$(HL2SDKL4D)\public\tier0&quot;;&quot;$(HL2SDKL4D)\public\tier1&quot;;&quot;$(HL2SDKL4D)\public\vstdlib&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SOURCEMM_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SE_ORANGEBOX=3;SE_LEFT4DEAD=4;SOURCE_ENGINE=4"
+				StringPooling="true"
+				ExceptionHandling="1"
+				RuntimeLibrary="0"
+				BufferSecurityCheck="false"
+				RuntimeTypeInfo="false"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="false"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="&quot;$(HL2SDKL4D)\lib\public\tier0.lib&quot; &quot;$(HL2SDKL4D)\lib\public\tier1.lib&quot; &quot;$(HL2SDKL4D)\lib\public\vstdlib.lib&quot;"
+				OutputFile="$(OutDir)/metamod.2.l4d.dll"
+				LinkIncremental="1"
+				IgnoreDefaultLibraryNames="libc.lib;libcd.lib;libcmtd.lib"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				ImportLibrary="$(OutDir)/sourcemm.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+			<File
+				RelativePath="..\version.rc"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Interfaces"
+			>
+			<File
+				RelativePath="..\IPluginManager.h"
+				>
+			</File>
+			<File
+				RelativePath="..\ISmmAPI.h"
+				>
+			</File>
+			<File
+				RelativePath="..\ISmmPlugin.h"
+				>
+			</File>
+			<File
+				RelativePath="..\ISmmPluginExt.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Metamod"
+			>
+			<Filter
+				Name="Source Files"
+				>
+				<File
+					RelativePath="..\metamod.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\metamod_console.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\metamod_oslink.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\metamod_plugins.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\metamod_util.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\vsp_bridge.cpp"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Header Files"
+				>
+				<File
+					RelativePath="..\metamod.h"
+					>
+				</File>
+				<File
+					RelativePath="..\metamod_console.h"
+					>
+				</File>
+				<File
+					RelativePath="..\metamod_oslink.h"
+					>
+				</File>
+				<File
+					RelativePath="..\metamod_plugins.h"
+					>
+				</File>
+				<File
+					RelativePath="..\metamod_provider.h"
+					>
+				</File>
+				<File
+					RelativePath="..\metamod_util.h"
+					>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Provider"
+			>
+			<Filter
+				Name="Header Files"
+				>
+				<File
+					RelativePath="..\provider\console.h"
+					>
+				</File>
+				<File
+					RelativePath="..\provider\provider_ep2.h"
+					>
+				</File>
+				<File
+					RelativePath="..\provider\vsp_listener.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Source Files"
+				>
+				<File
+					RelativePath="..\provider\console.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\provider\provider_ep2.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\provider\vsp_listener.cpp"
+					>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="SourceHook"
+			>
+			<Filter
+				Name="Source Files"
+				>
+				<File
+					RelativePath="..\sourcehook\sourcehook.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\sourcehook\sourcehook_hookmangen.cpp"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Header Files"
+				>
+				<File
+					RelativePath="..\sourcehook\FastDelegate.h"
+					>
+				</File>
+				<File
+					RelativePath="..\sourcehook\sh_list.h"
+					>
+				</File>
+				<File
+					RelativePath="..\sourcehook\sh_memfuncinfo.h"
+					>
+				</File>
+				<File
+					RelativePath="..\sourcehook\sh_memory.h"
+					>
+				</File>
+				<File
+					RelativePath="..\sourcehook\sh_pagealloc.h"
+					>
+				</File>
+				<File
+					RelativePath="..\sourcehook\sh_stack.h"
+					>
+				</File>
+				<File
+					RelativePath="..\sourcehook\sh_string.h"
+					>
+				</File>
+				<File
+					RelativePath="..\sourcehook\sh_tinyhash.h"
+					>
+				</File>
+				<File
+					RelativePath="..\sourcehook\sh_vector.h"
+					>
+				</File>
+				<File
+					RelativePath="..\sourcehook\sourcehook.h"
+					>
+				</File>
+				<File
+					RelativePath="..\sourcehook\sourcehook_hookmangen.h"
+					>
+				</File>
+				<File
+					RelativePath="..\sourcehook\sourcehook_hookmangen_x86.h"
+					>
+				</File>
+				<File
+					RelativePath="..\sourcehook\sourcehook_impl.h"
+					>
+				</File>
+				<File
+					RelativePath="..\sourcehook\sourcehook_impl_chook.h"
+					>
+				</File>
+				<File
+					RelativePath="..\sourcehook\sourcehook_impl_chookidman.h"
+					>
+				</File>
+				<File
+					RelativePath="..\sourcehook\sourcehook_impl_chookmaninfo.h"
+					>
+				</File>
+				<File
+					RelativePath="..\sourcehook\sourcehook_impl_ciface.h"
+					>
+				</File>
+				<File
+					RelativePath="..\sourcehook\sourcehook_impl_cproto.h"
+					>
+				</File>
+				<File
+					RelativePath="..\sourcehook\sourcehook_impl_cvfnptr.h"
+					>
+				</File>
+				<File
+					RelativePath="..\sourcehook\sourcehook_pibuilder.h"
+					>
+				</File>
+			</Filter>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/core/msvc9/sourcemm.vcproj b/core/msvc9/sourcemm.vcproj
deleted file mode 100644
index e094917..0000000
--- a/core/msvc9/sourcemm.vcproj
+++ /dev/null
@@ -1,417 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="metamodsource_ep2"
-	ProjectGUID="{F7D47743-73B3-49B5-9D76-2333C5DFD565}"
-	RootNamespace="sourcemm"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..;..\..\..;..\..\..\sourcehook;&quot;$(HL2SDKOB)\public&quot;;&quot;$(HL2SDKOB)\public\engine&quot;;&quot;$(HL2SDKOB)\public\game\server&quot;;&quot;$(HL2SDKOB)\public\tier0&quot;;&quot;$(HL2SDKOB)\public\tier1&quot;;&quot;$(HL2SDKOB)\public\vstdlib&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SOURCEMM_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="&quot;$(HL2SDKOB)\lib\public\tier0.lib&quot; &quot;$(HL2SDKOB)\lib\public\tier1.lib&quot; &quot;$(HL2SDKOB)\lib\public\vstdlib.lib&quot;"
-				OutputFile="$(OutDir)/server.dll"
-				LinkIncremental="2"
-				IgnoreDefaultLibraryNames="libc.lib;libcd.lib;libcmt.lib"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/sourcemm.pdb"
-				SubSystem="2"
-				EnableCOMDATFolding="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)/sourcemm.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
-			ConfigurationType="2"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\..;..\..\..;..\..\..\sourcehook;&quot;$(HL2SDKOB)\public&quot;;&quot;$(HL2SDKOB)\public\engine&quot;;&quot;$(HL2SDKOB)\public\game\server&quot;;&quot;$(HL2SDKOB)\public\tier0&quot;;&quot;$(HL2SDKOB)\public\tier1&quot;;&quot;$(HL2SDKOB)\public\vstdlib&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SOURCEMM_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
-				StringPooling="true"
-				ExceptionHandling="1"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="&quot;$(HL2SDKOB)\lib\public\tier0.lib&quot; &quot;$(HL2SDKOB)\lib\public\tier1.lib&quot; &quot;$(HL2SDKOB)\lib\public\vstdlib.lib&quot;"
-				OutputFile="$(OutDir)/server.dll"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libc.lib;libcd.lib;libcmtd.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)/sourcemm.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\version.rc"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Interfaces"
-			>
-			<File
-				RelativePath="..\..\IPluginManager.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ISmmAPI.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ISmmPlugin.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\ISmmPluginExt.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Metamod"
-			>
-			<Filter
-				Name="Source Files"
-				>
-				<File
-					RelativePath="..\..\metamod.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\metamod_console.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\metamod_oslink.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\metamod_plugins.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\metamod_util.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Header Files"
-				>
-				<File
-					RelativePath="..\..\metamod.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\metamod_console.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\metamod_oslink.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\metamod_plugins.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\metamod_provider.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\metamod_util.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Provider"
-			>
-			<Filter
-				Name="Header Files"
-				>
-				<File
-					RelativePath="..\console.h"
-					>
-				</File>
-				<File
-					RelativePath="..\provider_ep2.h"
-					>
-				</File>
-				<File
-					RelativePath="..\vsp_listener.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Source Files"
-				>
-				<File
-					RelativePath="..\console.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\provider_ep2.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\vsp_listener.cpp"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="SourceHook"
-			>
-			<Filter
-				Name="Source Files"
-				>
-				<File
-					RelativePath="..\..\..\sourcehook\sourcehook.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\sourcehook\sourcehook_hookmangen.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="Header Files"
-				>
-				<File
-					RelativePath="..\..\..\sourcehook\FastDelegate.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\sourcehook\sh_list.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\sourcehook\sh_memfuncinfo.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\sourcehook\sh_memory.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\sourcehook\sh_pagealloc.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\sourcehook\sh_stack.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\sourcehook\sh_string.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\sourcehook\sh_tinyhash.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\sourcehook\sh_vector.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\sourcehook\sourcehook.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\sourcehook\sourcehook_hookmangen.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\sourcehook\sourcehook_hookmangen_x86.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\sourcehook\sourcehook_impl.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\sourcehook\sourcehook_impl_chook.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\sourcehook\sourcehook_impl_chookidman.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\sourcehook\sourcehook_impl_chookmaninfo.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\sourcehook\sourcehook_impl_ciface.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\sourcehook\sourcehook_impl_cproto.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\sourcehook\sourcehook_impl_cvfnptr.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\sourcehook\sourcehook_pibuilder.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/core/provider/provider_ep2.cpp b/core/provider/provider_ep2.cpp
index 3b31e4d..3e47f47 100644
--- a/core/provider/provider_ep2.cpp
+++ b/core/provider/provider_ep2.cpp
@@ -360,7 +360,11 @@ const char *BaseProvider::GetGameDescription()
 
 int BaseProvider::DetermineSourceEngine(const char *game)
 {
+#if SOURCE_ENGINE == SE_LEFT4DEAD
+	return SOURCE_ENGINE_LEFT4DEAD;
+#else
 	return SOURCE_ENGINE_ORANGEBOX;
+#endif
 }
 
 ConVar *BaseProvider::CreateConVar(const char *name,
diff --git a/loader/loader.h b/loader/loader.h
index 883e674..67446f6 100644
--- a/loader/loader.h
+++ b/loader/loader.h
@@ -8,8 +8,6 @@
 #define WINDOWS_LEAN_AND_MEAN
 #include <windows.h>
 #define PLATFORM_MAX_PATH	MAX_PATH
-typedef INTPTR intptr_t;
-typedef UINTPTR uintptr_t;
 #define SH_COMP				SH_COMP_MSVC
 #elif defined __linux__
 #include <dlfcn.h>
diff --git a/core-legacy/msvc9/sourcemm.sln b/loader/msvc9/mm_loader.sln
similarity index 54%
rename from core-legacy/msvc9/sourcemm.sln
rename to loader/msvc9/mm_loader.sln
index 299311a..b1ffb3a 100644
--- a/core-legacy/msvc9/sourcemm.sln
+++ b/loader/msvc9/mm_loader.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sourcemm", "sourcemm.vcproj", "{F7D47743-73B3-49B5-9D76-2333C5DFD565}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mm_loader", "mm_loader.vcproj", "{B8EBE5D8-739A-4ED4-83F7-E68CDED09F90}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -9,10 +9,10 @@ Global
 		Release|Win32 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F7D47743-73B3-49B5-9D76-2333C5DFD565}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F7D47743-73B3-49B5-9D76-2333C5DFD565}.Debug|Win32.Build.0 = Debug|Win32
-		{F7D47743-73B3-49B5-9D76-2333C5DFD565}.Release|Win32.ActiveCfg = Release|Win32
-		{F7D47743-73B3-49B5-9D76-2333C5DFD565}.Release|Win32.Build.0 = Release|Win32
+		{B8EBE5D8-739A-4ED4-83F7-E68CDED09F90}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B8EBE5D8-739A-4ED4-83F7-E68CDED09F90}.Debug|Win32.Build.0 = Debug|Win32
+		{B8EBE5D8-739A-4ED4-83F7-E68CDED09F90}.Release|Win32.ActiveCfg = Release|Win32
+		{B8EBE5D8-739A-4ED4-83F7-E68CDED09F90}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/loader/msvc9/mm_loader.vcproj b/loader/msvc9/mm_loader.vcproj
new file mode 100644
index 0000000..07e14f0
--- /dev/null
+++ b/loader/msvc9/mm_loader.vcproj
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="mm_loader"
+	ProjectGUID="{B8EBE5D8-739A-4ED4-83F7-E68CDED09F90}"
+	RootNamespace="mm_loader"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\core\sourcehook"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LOADER_EXPORTS;_CRT_SECURE_NO_WARNINGS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\server.dll"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..\..\core\sourcehook"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LOADER_EXPORTS;_CRT_SECURE_NO_WARNINGS"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\server.dll"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\loader.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\serverplugin.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\loader.h"
+				>
+			</File>
+			<File
+				RelativePath="..\loader_bridge.h"
+				>
+			</File>
+			<File
+				RelativePath="..\serverplugin.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>