diff --git a/ModelConverter/ModelConverter.csproj b/ModelConverter/ModelConverter.csproj
index 07d2133..377dc9b 100644
--- a/ModelConverter/ModelConverter.csproj
+++ b/ModelConverter/ModelConverter.csproj
@@ -1,134 +1,120 @@
-<VisualStudioProject>
-    <CSHARP
-        ProjectType = "Local"
-        ProductVersion = "7.10.3077"
-        SchemaVersion = "2.0"
-        ProjectGuid = "{4327B7E9-B631-479B-8419-BCE37C986360}"
-    >
-        <Build>
-            <Settings
-                ApplicationIcon = "App.ico"
-                AssemblyKeyContainerName = ""
-                AssemblyName = "ModelConverter"
-                AssemblyOriginatorKeyFile = ""
-                DefaultClientScript = "JScript"
-                DefaultHTMLPageLayout = "Grid"
-                DefaultTargetSchema = "IE50"
-                DelaySign = "false"
-                OutputType = "Exe"
-                PreBuildEvent = ""
-                PostBuildEvent = ""
-                RootNamespace = "ModelConverter"
-                RunPostBuildEvent = "OnBuildSuccess"
-                StartupObject = ""
-            >
-                <Config
-                    Name = "Debug"
-                    AllowUnsafeBlocks = "false"
-                    BaseAddress = "285212672"
-                    CheckForOverflowUnderflow = "false"
-                    ConfigurationOverrideFile = ""
-                    DefineConstants = "DEBUG;TRACE"
-                    DocumentationFile = ""
-                    DebugSymbols = "true"
-                    FileAlignment = "4096"
-                    IncrementalBuild = "false"
-                    NoStdLib = "false"
-                    NoWarn = ""
-                    Optimize = "false"
-                    OutputPath = "bin\Debug\"
-                    RegisterForComInterop = "false"
-                    RemoveIntegerChecks = "false"
-                    TreatWarningsAsErrors = "false"
-                    WarningLevel = "4"
-                />
-                <Config
-                    Name = "Release"
-                    AllowUnsafeBlocks = "false"
-                    BaseAddress = "285212672"
-                    CheckForOverflowUnderflow = "false"
-                    ConfigurationOverrideFile = ""
-                    DefineConstants = "TRACE"
-                    DocumentationFile = ""
-                    DebugSymbols = "false"
-                    FileAlignment = "4096"
-                    IncrementalBuild = "false"
-                    NoStdLib = "false"
-                    NoWarn = ""
-                    Optimize = "true"
-                    OutputPath = "bin\Release\"
-                    RegisterForComInterop = "false"
-                    RemoveIntegerChecks = "false"
-                    TreatWarningsAsErrors = "false"
-                    WarningLevel = "4"
-                />
-            </Settings>
-            <References>
-                <Reference
-                    Name = "System"
-                    AssemblyName = "System"
-                    HintPath = "..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
-                />
-                <Reference
-                    Name = "System.Data"
-                    AssemblyName = "System.Data"
-                    HintPath = "..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
-                />
-                <Reference
-                    Name = "System.XML"
-                    AssemblyName = "System.XML"
-                    HintPath = "..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
-                />
-            </References>
-        </Build>
-        <Files>
-            <Include>
-                <File
-                    RelPath = "App.ico"
-                    BuildAction = "Content"
-                />
-                <File
-                    RelPath = "AssemblyInfo.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "Model.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "ModelLoader.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "ModelWriter.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "MS3DLoader.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "OAMLoader.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "OAMWriter.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-                <File
-                    RelPath = "Startup.cs"
-                    SubType = "Code"
-                    BuildAction = "Compile"
-                />
-            </Include>
-        </Files>
-    </CSHARP>
-</VisualStudioProject>
-
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{4327B7E9-B631-479B-8419-BCE37C986360}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>App.ico</ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>ModelConverter</AssemblyName>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>ModelConverter</RootNamespace>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <StartupObject>
+    </StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>full</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System">
+      <Name>System</Name>
+    </Reference>
+    <Reference Include="System.Data">
+      <Name>System.Data</Name>
+    </Reference>
+    <Reference Include="System.XML">
+      <Name>System.XML</Name>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="App.ico" />
+    <Compile Include="AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Model.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ModelLoader.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ModelWriter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="MS3DLoader.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="OAMLoader.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="OAMWriter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Startup.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/oa.vcproj b/oa.vcproj
index 5fa5719..309928f 100644
--- a/oa.vcproj
+++ b/oa.vcproj
@@ -1,41 +1,76 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="7.10"
+	Version="8.00"
 	Name="oa"
 	ProjectGUID="{6F5D0FF6-A032-4356-932E-865B601E0DD4}"
-	SccProjectName=""
-	SccLocalPath="">
+	RootNamespace="oa"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Release|Win32"
 			OutputDirectory=".\OpenArena"
 			IntermediateDirectory=".\Release"
 			ConfigurationType="1"
+			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/oa.tlb"
+			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\include"
 				PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS"
-				StringPooling="TRUE"
-				RuntimeLibrary="4"
-				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="2"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile=".\Release/oa.pch"
 				AssemblerListingLocation=".\"
 				ObjectFile=".\"
 				ProgramDataBaseFileName=".\"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"/>
+				SuppressStartupBanner="true"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
@@ -43,99 +78,127 @@
 				OutputFile=".\OpenArena\oa.exe"
 				Version="0.1.0-alpha"
 				LinkIncremental="1"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\lib"
 				ProgramDatabaseFile=".\Release/oa.pdb"
-				SubSystem="2"/>
+				SubSystem="2"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/oa.tlb"/>
+				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="1"
+			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/oa.tlb"
+			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS"
+				PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,USE_WGL"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
-				UsePrecompiledHeader="2"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="0"
 				PrecompiledHeaderFile=".\Debug/oa.pch"
 				AssemblerListingLocation=".\Debug/"
 				ObjectFile=".\Debug/"
 				ProgramDataBaseFileName=".\Debug/"
 				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				DebugInformationFormat="4"/>
+				SuppressStartupBanner="true"
+				DebugInformationFormat="4"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
 				OutputFile=".\Debug\oa.exe"
 				LinkIncremental="2"
-				SuppressStartupBanner="TRUE"
+				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories=".\lib"
-				GenerateDebugInformation="TRUE"
+				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/oa.pdb"
-				SubSystem="2"/>
+				SubSystem="2"
+			/>
 			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="TRUE"
-				SuppressStartupBanner="TRUE"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/oa.tlb"/>
+				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>
@@ -143,217 +206,313 @@
 	<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=".\src\bmp.cpp">
+				RelativePath=".\src\bmp.cpp"
+				>
 			</File>
 			<File
-				RelativePath="src\camera.cpp">
+				RelativePath=".\src\camera.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\src\ctrls.cpp">
+				RelativePath=".\src\ctrls.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\src\keys.cpp">
+				RelativePath=".\src\keys.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\src\Level.cpp">
+				RelativePath=".\src\level.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\src\linux.cpp">
+				RelativePath=".\src\linux.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\src\mygl.cpp">
+				RelativePath=".\src\macosx.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\src\myglFont.cpp">
+				RelativePath=".\src\mygl.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\src\myglTexture.cpp">
+				RelativePath=".\src\myglFont.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\src\physics.cpp">
+				RelativePath=".\src\myglTexture.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\src\Player.cpp">
+				RelativePath=".\src\NullVideoPlugin.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\src\screen.cpp">
+				RelativePath=".\src\player.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\src\strmanip.cpp">
+				RelativePath=".\src\PluginManager.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\src\tga.cpp">
+				RelativePath=".\src\screen.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\src\vector.cpp">
+				RelativePath=".\src\strmanip.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\src\window.cpp">
+				RelativePath=".\src\tga.cpp"
+				>
 			</File>
 			<File
-				RelativePath=".\src\windows.cpp">
+				RelativePath=".\src\vector.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\window.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\windows.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\src\WindowsLogger.cpp"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
+			Filter="h;hpp;hxx;hm;inl"
+			>
 			<File
-				RelativePath=".\Include\bass.h">
+				RelativePath=".\src\bmp.h"
+				>
 			</File>
 			<File
-				RelativePath=".\Include\bmp.h">
+				RelativePath=".\src\camera.h"
+				>
 			</File>
 			<File
-				RelativePath=".\Include\camera.h">
+				RelativePath=".\src\ctrls.h"
+				>
 			</File>
 			<File
-				RelativePath=".\Include\critter.h">
+				RelativePath=".\src\datatypes.h"
+				>
 			</File>
 			<File
-				RelativePath=".\Include\ctrls.h">
+				RelativePath=".\src\entities.h"
+				>
 			</File>
 			<File
-				RelativePath=".\Include\datatypes.h">
+				RelativePath=".\src\entity.h"
+				>
 			</File>
 			<File
-				RelativePath=".\Include\entities.h">
+				RelativePath=".\src\geometry.h"
+				>
 			</File>
 			<File
-				RelativePath=".\Include\entity.h">
+				RelativePath=".\src\image.h"
+				>
 			</File>
 			<File
-				RelativePath=".\Include\geometry.h">
+				RelativePath=".\src\keys.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\keys.h">
+				RelativePath=".\src\level.h"
+				>
 			</File>
 			<File
-				RelativePath=".\Include\Level.h">
+				RelativePath=".\src\list.h"
+				>
 			</File>
 			<File
-				RelativePath=".\Include\list.h">
+				RelativePath=".\src\Logger.h"
+				>
 			</File>
 			<File
-				RelativePath=".\Include\Main.h">
+				RelativePath=".\src\main.h"
+				>
 			</File>
 			<File
-				RelativePath=".\Include\mydefs.h">
+				RelativePath=".\src\mydefs.h"
+				>
 			</File>
 			<File
-				RelativePath=".\Include\mygl.h">
+				RelativePath=".\src\mygl.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\myglFont.h">
+				RelativePath=".\src\myglFont.h"
+				>
 			</File>
 			<File
-				RelativePath=".\Include\myglTexture.h">
+				RelativePath=".\src\myglTexture.h"
+				>
 			</File>
 			<File
-				RelativePath=".\Include\opengl.h">
+				RelativePath=".\src\NullVideoPlugin.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\physics.h">
+				RelativePath=".\src\physics.h"
+				>
 			</File>
 			<File
-				RelativePath=".\Include\Player.h">
+				RelativePath=".\src\player.h"
+				>
 			</File>
 			<File
-				RelativePath=".\Include\screen.h">
+				RelativePath=".\src\Plugin.h"
+				>
 			</File>
 			<File
-				RelativePath=".\Include\strmanip.h">
+				RelativePath=".\src\PluginManager.h"
+				>
 			</File>
 			<File
-				RelativePath=".\Include\texture.h">
+				RelativePath=".\src\screen.h"
+				>
 			</File>
 			<File
-				RelativePath=".\Include\tga.h">
+				RelativePath=".\src\strmanip.h"
+				>
 			</File>
 			<File
-				RelativePath=".\Include\vector.h">
+				RelativePath=".\src\texture.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\version.h">
+				RelativePath=".\src\tga.h"
+				>
 			</File>
 			<File
-				RelativePath=".\include\window.h">
+				RelativePath=".\src\vector.h"
+				>
 			</File>
 			<File
-				RelativePath=".\Include\WorldDefs.h">
+				RelativePath=".\src\version.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\VideoPlugin.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\window.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\WindowsLogger.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\worlddefs.h"
+				>
 			</File>
 		</Filter>
 		<Filter
 			Name="oa"
-			Filter="">
+			>
 			<Filter
 				Name="maps"
-				Filter=".map, .lit">
+				Filter=".map, .lit"
+				>
 				<File
-					RelativePath=".\OpenArena\oa\maps\intro.map">
+					RelativePath=".\OpenArena\oa\maps\intro.map"
+					>
 				</File>
 				<File
-					RelativePath=".\OpenArena\oa\maps\oamap1.map">
+					RelativePath=".\OpenArena\oa\maps\oamap1.map"
+					>
 				</File>
 			</Filter>
 			<Filter
 				Name="textures"
-				Filter=".bmp, .jpg, .tga, .png">
+				Filter=".bmp, .jpg, .tga, .png"
+				>
 				<File
-					RelativePath="OpenArena\oa\textures\groundc.tga">
+					RelativePath="OpenArena\oa\textures\groundc.tga"
+					>
 				</File>
 				<File
-					RelativePath="OpenArena\oa\textures\moonc.tga">
+					RelativePath="OpenArena\oa\textures\moonc.tga"
+					>
 				</File>
 				<File
-					RelativePath="OpenArena\oa\textures\nightSkyc.tga">
+					RelativePath="OpenArena\oa\textures\nightSkyc.tga"
+					>
 				</File>
 				<Filter
 					Name="menu"
-					Filter="">
+					>
 					<File
-						RelativePath=".\OpenArena\oa\textures\menu\con_back.bmp">
+						RelativePath=".\OpenArena\oa\textures\menu\con_back.bmp"
+						>
 					</File>
 					<File
-						RelativePath=".\OpenArena\oa\textures\menu\con_back.tga">
+						RelativePath=".\OpenArena\oa\textures\menu\con_back.tga"
+						>
 					</File>
 					<File
-						RelativePath="OpenArena\oa\textures\menu\font.bmp">
+						RelativePath="OpenArena\oa\textures\menu\font.bmp"
+						>
 					</File>
 				</Filter>
 			</Filter>
 			<Filter
 				Name="config"
-				Filter=".cfg">
+				Filter=".cfg"
+				>
 				<File
-					RelativePath="OpenArena\oa\config\G2k.cfg">
+					RelativePath="OpenArena\oa\config\G2k.cfg"
+					>
 				</File>
 				<File
-					RelativePath="OpenArena\oa\config\My.cfg">
+					RelativePath="OpenArena\oa\config\My.cfg"
+					>
 				</File>
 			</Filter>
 			<Filter
 				Name="music"
-				Filter="">
+				>
 				<Filter
 					Name="bgm"
-					Filter="">
+					>
 					<File
-						RelativePath="OpenArena\oa\music\bgm\bgm1.mp3">
+						RelativePath="OpenArena\oa\music\bgm\bgm1.mp3"
+						>
 					</File>
 					<File
-						RelativePath="OpenArena\oa\music\bgm\bgm2.mp3">
+						RelativePath="OpenArena\oa\music\bgm\bgm2.mp3"
+						>
 					</File>
 				</Filter>
 			</Filter>
 		</Filter>
 		<Filter
 			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
 		</Filter>
 		<File
-			RelativePath=".\heading.txt">
+			RelativePath=".\Doxyfile.doxygen"
+			>
+		</File>
+		<File
+			RelativePath=".\heading.txt"
+			>
 		</File>
 	</Files>
 	<Globals>