diff --git a/dlls/ns/msvc7/ns.sln b/dlls/ns/msvc7/ns.sln
index 21fd284a..d5074c4a 100755
--- a/dlls/ns/msvc7/ns.sln
+++ b/dlls/ns/msvc7/ns.sln
@@ -1,21 +1,20 @@
+
 Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ns", "ns.vcproj", "{97ABBCAF-5C0E-4103-A11F-3D26032C6377}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
+# Visual C++ Express 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ns", "ns.vcproj", "{5B5DEFD0-28ED-4D0E-A1B0-50F9304A65DF}"
 EndProject
 Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		Release = Release
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
 	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{97ABBCAF-5C0E-4103-A11F-3D26032C6377}.Debug.ActiveCfg = Release|Win32
-		{97ABBCAF-5C0E-4103-A11F-3D26032C6377}.Debug.Build.0 = Release|Win32
-		{97ABBCAF-5C0E-4103-A11F-3D26032C6377}.Release.ActiveCfg = Release|Win32
-		{97ABBCAF-5C0E-4103-A11F-3D26032C6377}.Release.Build.0 = Release|Win32
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{5B5DEFD0-28ED-4D0E-A1B0-50F9304A65DF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5B5DEFD0-28ED-4D0E-A1B0-50F9304A65DF}.Debug|Win32.Build.0 = Debug|Win32
+		{5B5DEFD0-28ED-4D0E-A1B0-50F9304A65DF}.Release|Win32.ActiveCfg = Release|Win32
+		{5B5DEFD0-28ED-4D0E-A1B0-50F9304A65DF}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
 	EndGlobalSection
 EndGlobal
diff --git a/dlls/ns/msvc7/ns.vcproj b/dlls/ns/msvc7/ns.vcproj
index 8b1c3817..c4578860 100755
--- a/dlls/ns/msvc7/ns.vcproj
+++ b/dlls/ns/msvc7/ns.vcproj
@@ -3,141 +3,206 @@
 	ProjectType="Visual C++"
 	Version="7.10"
 	Name="ns"
-	SccProjectName=""
-	SccLocalPath="">
+	ProjectGUID="{5B5DEFD0-28ED-4D0E-A1B0-50F9304A65DF}"
+	RootNamespace="ns"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\Release"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/ns_amxx.tlb"
+				HeaderFileName=""
+			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\;..\sdk"
+				AdditionalIncludeDirectories="z:\metamod\metamod;z:\hlsdk\common;z:\hlsdk\engine;z:\hlsdk\dlls;z:\hlsdk\pm_shared"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;ns_amxx_EXPORTS"
-				StringPooling="TRUE"
-				RuntimeLibrary="4"
-				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="2"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				RuntimeTypeInfo="false"
+				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile=".\Release/ns_amxx.pch"
 				AssemblerListingLocation=".\Release/"
 				ObjectFile=".\Release/"
 				ProgramDataBaseFileName=".\Release/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				CompileAs="0"/>
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
 				Name="VCLinkerTool"
 				OutputFile="./Release/ns_amxx.dll"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				ProgramDatabaseFile=".\Release/ns_amxx.pdb"
 				ImportLibrary=".\Release/ns_amxx.lib"
-				TargetMachine="1"/>
+				TargetMachine="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/ns_amxx.tlb"
-				HeaderFileName=""/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="Debug|Win32"
 			OutputDirectory=".\Debug"
 			IntermediateDirectory=".\Debug"
 			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
 			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Debug/ns_amxx.tlb"
+				HeaderFileName=""
+			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/I "
 				Optimization="0"
-				AdditionalIncludeDirectories="..\;..\sdk"
+				AdditionalIncludeDirectories="z:\metamod\metamod;z:\hlsdk\common;z:\hlsdk\engine;z:\hlsdk\dlls;z:\hlsdk\pm_shared"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;ns_amxx_EXPORTS"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
-				UsePrecompiledHeader="2"
+				RuntimeLibrary="1"
+				RuntimeTypeInfo="false"
+				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile=".\Debug/ns_amxx.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				DebugInformationFormat="3"
-				CompileAs="0"/>
+				CompileAs="0"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
 				Name="VCLinkerTool"
 				OutputFile=".\Debug/ns_amxx.dll"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
-				GenerateDebugInformation="TRUE"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/ns_amxx.pdb"
 				ImportLibrary=".\Debug/ns_amxx.lib"
-				TargetMachine="1"/>
+				TargetMachine="1"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/ns_amxx.tlb"
-				HeaderFileName=""/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
 	<References>
@@ -145,76 +210,181 @@
 	<Files>
 		<Filter
 			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
 			<File
-				RelativePath="..\CPlayer.cpp">
+				RelativePath="..\amxxapi.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\CSpawn.cpp">
+				RelativePath="..\dllapi.cpp"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;_USRDLL;ns_amxx_EXPORTS;$(NoInherit)"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;ns_amxx_EXPORTS;$(NoInherit)"
+						BasicRuntimeChecks="3"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\hookedfunctions.cpp">
+				RelativePath="..\engineapi.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\NMisc.cpp">
+				RelativePath="..\GameManager.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\NPData.cpp">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
-			<File
-				RelativePath="..\CPlayer.h">
+				RelativePath="..\MessageHandler.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\CSpawn.h">
+				RelativePath="..\ParticleManager.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\ns.h">
+				RelativePath="..\TitleManager.cpp"
+				>
 			</File>
 			<File
-				RelativePath="..\ns_const.h">
-			</File>
-			<File
-				RelativePath="..\plugin.h">
-			</File>
-			<File
-				RelativePath="..\svn_version.h">
-			</File>
-			<File
-				RelativePath="..\utilfunctions.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Module SDK"
-			Filter="">
-			<File
-				RelativePath="..\sdk\moduleconfig.h">
+				RelativePath="..\utils.cpp"
+				>
 			</File>
 			<Filter
-				Name="SDK Base"
-				Filter="">
+				Name="Natives"
+				>
 				<File
-					RelativePath="..\sdk\amxxmodule.cpp">
+					RelativePath="..\natives\general.cpp"
+					>
 				</File>
 				<File
-					RelativePath="..\sdk\amxxmodule.h">
+					RelativePath="..\natives\memberfuncs.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\natives\particles.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\natives\player.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\natives\player_memory.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\natives\structure.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\natives\weapons.cpp"
+					>
 				</File>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="Pawn Includes"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl"
+			>
 			<File
-				RelativePath="..\..\..\plugins\include\ns.inc">
+				RelativePath="..\AllocString.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\..\plugins\include\ns2amx.inc">
+				RelativePath="..\CPlayer.h"
+				>
 			</File>
 			<File
-				RelativePath="..\..\..\plugins\include\ns_const.inc">
+				RelativePath="..\CString.h"
+				>
+			</File>
+			<File
+				RelativePath="..\CVector.h"
+				>
+			</File>
+			<File
+				RelativePath="..\FastDelegate.h"
+				>
+			</File>
+			<File
+				RelativePath="..\GameManager.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Hash.h"
+				>
+			</File>
+			<File
+				RelativePath="..\LocationManager.h"
+				>
+			</File>
+			<File
+				RelativePath="..\MessageHandler.h"
+				>
+			</File>
+			<File
+				RelativePath="..\NEW_Util.h"
+				>
+			</File>
+			<File
+				RelativePath="..\ns.h"
+				>
+			</File>
+			<File
+				RelativePath="..\ns_const.h"
+				>
+			</File>
+			<File
+				RelativePath="..\ParticleManager.h"
+				>
+			</File>
+			<File
+				RelativePath="..\sh_list.h"
+				>
+			</File>
+			<File
+				RelativePath="..\SpawnManager.h"
+				>
+			</File>
+			<File
+				RelativePath="..\TitleManager.h"
+				>
+			</File>
+			<File
+				RelativePath="..\utilfunctions.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="sdk"
+			>
+			<File
+				RelativePath="..\sdk\amxxmodule.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\sdk\amxxmodule.h"
+				>
+			</File>
+			<File
+				RelativePath="..\sdk\moduleconfig.h"
+				>
 			</File>
 		</Filter>
 	</Files>