diff --git a/Content/Content.contentproj b/Content/Content.contentproj
new file mode 100644
index 0000000..85513d0
--- /dev/null
+++ b/Content/Content.contentproj
@@ -0,0 +1,43 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectGuid>6ee65cf8-1a2e-4570-bc9a-8c6b403154be</ProjectGuid>
+    <ProjectTypeGuids>{96E2B04D-8817-42c6-938A-82C39BA4D311};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <XnaFrameworkVersion>v2.0</XnaFrameworkVersion>
+    <PlatformTarget>x86</PlatformTarget>
+    <OutputPath>bin\$(Platform)\$(Configuration)</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <XnaPlatform>Windows</XnaPlatform>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <XnaPlatform>Windows</XnaPlatform>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.Xna.Framework.Content.Pipeline.EffectImporter, Version=2.0.0.0, Culture=neutral, PublicKeyToken=6d5c3888ef60e27d, processorArchitecture=MSIL">
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.Xna.Framework.Content.Pipeline.FBXImporter, Version=2.0.0.0, Culture=neutral, PublicKeyToken=6d5c3888ef60e27d, processorArchitecture=MSIL">
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.Xna.Framework.Content.Pipeline.TextureImporter, Version=2.0.0.0, Culture=neutral, PublicKeyToken=6d5c3888ef60e27d, processorArchitecture=MSIL">
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.Xna.Framework.Content.Pipeline.XImporter, Version=2.0.0.0, Culture=neutral, PublicKeyToken=6d5c3888ef60e27d, processorArchitecture=MSIL">
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\v2.0\Microsoft.Xna.GameStudio.ContentPipeline.targets" />
+
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+
+</Project>
diff --git a/Nuclex.Support.txt b/Documents/Nuclex.Support.txt
similarity index 100%
rename from Nuclex.Support.txt
rename to Documents/Nuclex.Support.txt
diff --git a/Nuclex.Support (PC).csproj b/Nuclex.Support (PC).csproj
deleted file mode 100644
index af6d34b..0000000
--- a/Nuclex.Support (PC).csproj	
+++ /dev/null
@@ -1,335 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{A696702E-AFAD-45E7-88FA-1E2520E5E746}</ProjectGuid>
-    <ProjectTypeGuids>{9F340DF3-2AED-4330-AC16-78AC2D9B4738};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Nuclex.Support</RootNamespace>
-    <AssemblyName>Nuclex.Support</AssemblyName>
-    <XnaFrameworkVersion>v1.0</XnaFrameworkVersion>
-    <XnaPlatform>Windows</XnaPlatform>
-    <XNAGlobalContentPipelineAssemblies>Microsoft.Xna.Framework.Content.Pipeline.EffectImporter.dll;Microsoft.Xna.Framework.Content.Pipeline.FBXImporter.dll;Microsoft.Xna.Framework.Content.Pipeline.TextureImporter.dll;Microsoft.Xna.Framework.Content.Pipeline.XImporter.dll</XNAGlobalContentPipelineAssemblies>
-    <XNAProjectContentPipelineAssemblies>
-    </XNAProjectContentPipelineAssemblies>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\x86\Debug</OutputPath>
-    <DefineConstants>TRACE;DEBUG;UNITTEST</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <NoStdLib>true</NoStdLib>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <PlatformTarget>x86</PlatformTarget>
-    <DocumentationFile>Documents\Nuclex.Support.xml</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\x86\Release</OutputPath>
-    <DefineConstants>TRACE;UNITTEST</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <NoStdLib>true</NoStdLib>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <PlatformTarget>x86</PlatformTarget>
-    <DocumentationFile>Documents\Nuclex.Support.xml</DocumentationFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.Xna.Framework">
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.Xna.Framework.Game">
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="mscorlib">
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="NMock2, Version=1.0.2657.18750, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\References\nmock\net-2.0\NMock2.dll</HintPath>
-    </Reference>
-    <Reference Include="nunit.framework, Version=2.4.3.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\References\nunit\net-2.0\nunit.framework.dll</HintPath>
-    </Reference>
-    <Reference Include="System">
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Source\Collections\ItemEventArgs.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>ItemEventArgs</Name>
-    </Compile>
-    <Compile Include="Source\Collections\ObservableCollection.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>ObservableCollection</Name>
-    </Compile>
-    <Compile Include="Source\Collections\ObservableCollection.Test.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>ObservableCollection.Test</Name>
-      <DependentUpon>ObservableCollection.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Collections\PriorityItemPair.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>PriorityItemPair</Name>
-    </Compile>
-    <Compile Include="Source\Collections\TransformingReadOnlyCollection.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>TransformingReadOnlyCollection</Name>
-    </Compile>
-    <Compile Include="Source\Collections\TransformingReadOnlyCollection.Interfaces.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>TransformingReadOnlyCollection.Interfaces</Name>
-      <DependentUpon>TransformingReadOnlyCollection.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Collections\PairPriorityQueue.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>PairPriorityQueue</Name>
-    </Compile>
-    <Compile Include="Source\Collections\Parentable.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>Parentable</Name>
-    </Compile>
-    <Compile Include="Source\Collections\ParentingCollection.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>ParentingCollection</Name>
-    </Compile>
-    <Compile Include="Source\Collections\PriorityQueue.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>PriorityQueue</Name>
-    </Compile>
-    <Compile Include="Source\Collections\PriorityQueue.Test.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>PriorityQueue.Test</Name>
-      <DependentUpon>PriorityQueue.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Collections\RingMemoryStream.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>RingMemoryStream</Name>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>AssemblyInfo</Name>
-    </Compile>
-    <Compile Include="Source\Collections\RingMemoryStream.Test.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>RingMemoryStream.Test</Name>
-      <DependentUpon>RingMemoryStream.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Collections\PairPriorityQueue.Test.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>PairPriorityQueue.Test</Name>
-      <DependentUpon>PairPriorityQueue.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Licensing\LicenseKey.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>LicenseKey</Name>
-    </Compile>
-    <Compile Include="Source\Licensing\LicenseKey.Test.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>LicenseKey.Test</Name>
-      <DependentUpon>LicenseKey.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Packing\ArevaloRectanglePacker.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>ArevaloRectanglePacker</Name>
-    </Compile>
-    <Compile Include="Source\Packing\ArevaloRectanglePacker.Test.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>ArevaloRectanglePacker.Test</Name>
-      <DependentUpon>ArevaloRectanglePacker.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Packing\CygonRectanglePacker.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>CygonRectanglePacker</Name>
-    </Compile>
-    <Compile Include="Source\Packing\CygonRectanglePacker.Test.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>CygonRectanglePacker.Test</Name>
-      <DependentUpon>CygonRectanglePacker.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Packing\OutOfSpaceException.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>OutOfSpaceException</Name>
-    </Compile>
-    <Compile Include="Source\Packing\RectanglePacker.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>RectanglePacker</Name>
-    </Compile>
-    <Compile Include="Source\Packing\RectanglePacker.Test.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>RectanglePacker.Test</Name>
-      <DependentUpon>RectanglePacker.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Packing\SimpleRectanglePacker.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>SimpleRectanglePacker</Name>
-    </Compile>
-    <Compile Include="Source\Packing\SimpleRectanglePacker.Test.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>SimpleRectanglePacker.Test</Name>
-      <DependentUpon>SimpleRectanglePacker.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Parsing\CommandLineParser.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>CommandLineParser</Name>
-    </Compile>
-    <Compile Include="Source\Parsing\CommandLineParser.Test.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>CommandLineParser.Test</Name>
-      <DependentUpon>CommandLineParser.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\PathHelper.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>PathHelper</Name>
-    </Compile>
-    <Compile Include="Source\PathHelper.Test.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>PathHelper.Test</Name>
-      <DependentUpon>PathHelper.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Scheduling\AbortedException.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>AbortedException</Name>
-    </Compile>
-    <Compile Include="Source\Scheduling\QueueOperation.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>QueueOperation</Name>
-    </Compile>
-    <Compile Include="Source\Scheduling\QueueOperation.Test.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>QueueOperation.Test</Name>
-      <DependentUpon>QueueOperation.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Scheduling\ThreadOperation.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>ThreadOperation</Name>
-    </Compile>
-    <Compile Include="Source\Serialization\BinarySerializer.Test.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>BinarySerializer.Test</Name>
-      <DependentUpon>BinarySerializer.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Serialization\IBinarySerializable.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>IBinarySerializable</Name>
-    </Compile>
-    <Compile Include="Source\Serialization\BinarySerializer.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>BinarySerializer</Name>
-    </Compile>
-    <Compile Include="Source\Scheduling\IAbortable.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>IAbortable</Name>
-    </Compile>
-    <Compile Include="Source\SpatialPartitioning\BoundingRectangle.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>BoundingRectangle</Name>
-    </Compile>
-    <Compile Include="Source\SpatialPartitioning\RTree2.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>RTree2</Name>
-    </Compile>
-    <Compile Include="Source\SpatialPartitioning\RTreeLeaf2.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>RTreeLeaf2</Name>
-    </Compile>
-    <Compile Include="Source\SpatialPartitioning\RTreeNode2.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>RTreeNode2</Name>
-    </Compile>
-    <Compile Include="Source\SpatialPartitioning\SpatialIndex2.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>SpatialIndex2</Name>
-    </Compile>
-    <Compile Include="Source\Tracking\IdleStateEventArgs.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>IdleStateEventArgs</Name>
-    </Compile>
-    <Compile Include="Source\Tracking\Internal\ObservedWeightedProgression.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>ObservedWeightedProgression</Name>
-    </Compile>
-    <Compile Include="Source\Tracking\IStatusReporter.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>IStatusReporter</Name>
-    </Compile>
-    <Compile Include="Source\Tracking\ProgressionTracker.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>ProgressionTracker</Name>
-    </Compile>
-    <Compile Include="Source\Tracking\ProgressionTracker.Test.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>ProgressionTracker.Test</Name>
-      <DependentUpon>ProgressionTracker.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Tracking\SetProgression.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>SetProgression</Name>
-    </Compile>
-    <Compile Include="Source\Scheduling\Operation.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>Operation</Name>
-    </Compile>
-    <Compile Include="Source\Tracking\Progression.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>Progression</Name>
-    </Compile>
-    <Compile Include="Source\Tracking\ProgressUpdateEventArgs.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>ProgressUpdateEventArgs</Name>
-    </Compile>
-    <Compile Include="Source\Scheduling\ThreadCallbackOperation.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>ThreadCallbackOperation</Name>
-    </Compile>
-    <Compile Include="Source\Tracking\SetProgression.Test.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>SetProgression.Test</Name>
-      <DependentUpon>SetProgression.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Source\Tracking\StatusReportEventArgs.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>StatusReportEventArgs</Name>
-    </Compile>
-    <Compile Include="Source\Tracking\WeightedProgression.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>WeightedProgression</Name>
-    </Compile>
-    <Compile Include="Source\Tracking\Internal\WeightedProgressionWrapperCollection.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>WeightedProgressionWrapperCollection</Name>
-    </Compile>
-    <Compile Include="Source\WeakReference.cs">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>WeakReference</Name>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Nuclex.Support.txt">
-      <XNAUseContentPipeline>false</XNAUseContentPipeline>
-      <Name>Nuclex.Support</Name>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Documents\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA\Game Studio Express\v1.0\Microsoft.Xna.ContentPipeline.targets" />
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA\Game Studio Express\v1.0\Microsoft.Xna.Common.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/Nuclex.Support (x86).csproj b/Nuclex.Support (x86).csproj
new file mode 100644
index 0000000..b5ce502
--- /dev/null
+++ b/Nuclex.Support (x86).csproj	
@@ -0,0 +1,173 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectGuid>{471344D7-583D-4B40-BAC4-4E85E77441A9}</ProjectGuid>
+    <ProjectTypeGuids>{6D335F3A-9D43-41b4-9D22-F6F17C4BE596};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Nuclex.Support</RootNamespace>
+    <AssemblyName>Nuclex.Support</AssemblyName>
+    <XnaFrameworkVersion>v2.0</XnaFrameworkVersion>
+    <XnaPlatform>Windows</XnaPlatform>
+    <XnaCrossPlatformGroupID>900541a8-f81a-448e-b55d-0e89f7ce9166</XnaCrossPlatformGroupID>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\x86\Debug</OutputPath>
+    <DefineConstants>TRACE;DEBUG;UNITTEST</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoStdLib>true</NoStdLib>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <PlatformTarget>x86</PlatformTarget>
+    <DocumentationFile>Documents\Nuclex.Support.xml</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\x86\Release</OutputPath>
+    <DefineConstants>TRACE;UNITTEST</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoStdLib>true</NoStdLib>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <PlatformTarget>x86</PlatformTarget>
+    <DocumentationFile>Documents\Nuclex.Support.xml</DocumentationFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.Xna.Framework, Version=2.0.0.0, Culture=neutral, PublicKeyToken=6d5c3888ef60e27d, processorArchitecture=x86">
+      <Private>False</Private>
+      <SpecificVersion>True</SpecificVersion>
+    </Reference>
+    <Reference Include="Microsoft.Xna.Framework.Game, Version=2.0.0.0, Culture=neutral, PublicKeyToken=6d5c3888ef60e27d, processorArchitecture=MSIL">
+      <Private>False</Private>
+      <SpecificVersion>True</SpecificVersion>
+    </Reference>
+    <Reference Include="mscorlib">
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="NMock2, Version=1.0.2657.18750, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\References\nmock\net-2.0\NMock2.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.framework, Version=2.4.3.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\References\nunit\net-2.0\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="System">
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Source\Collections\ItemEventArgs.cs" />
+    <Compile Include="Source\Collections\ObservableCollection.cs" />
+    <Compile Include="Source\Collections\ObservableCollection.Test.cs">
+      <DependentUpon>ObservableCollection.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Source\Collections\PairPriorityQueue.cs" />
+    <Compile Include="Source\Collections\PairPriorityQueue.Test.cs">
+      <DependentUpon>PairPriorityQueue.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Source\Collections\Parentable.cs" />
+    <Compile Include="Source\Collections\ParentingCollection.cs" />
+    <Compile Include="Source\Collections\PriorityItemPair.cs" />
+    <Compile Include="Source\Collections\PriorityQueue.cs" />
+    <Compile Include="Source\Collections\PriorityQueue.Test.cs">
+      <DependentUpon>PriorityQueue.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Source\Collections\RingMemoryStream.cs" />
+    <Compile Include="Source\Collections\RingMemoryStream.Test.cs">
+      <DependentUpon>RingMemoryStream.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Source\Collections\TransformingReadOnlyCollection.cs" />
+    <Compile Include="Source\Collections\TransformingReadOnlyCollection.Interfaces.cs" />
+    <Compile Include="Source\Licensing\LicenseKey.cs" />
+    <Compile Include="Source\Licensing\LicenseKey.Test.cs">
+      <DependentUpon>LicenseKey.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Source\Packing\ArevaloRectanglePacker.cs" />
+    <Compile Include="Source\Packing\ArevaloRectanglePacker.Test.cs">
+      <DependentUpon>ArevaloRectanglePacker.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Source\Packing\CygonRectanglePacker.cs" />
+    <Compile Include="Source\Packing\CygonRectanglePacker.Test.cs">
+      <DependentUpon>CygonRectanglePacker.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Source\Packing\OutOfSpaceException.cs" />
+    <Compile Include="Source\Packing\RectanglePacker.cs" />
+    <Compile Include="Source\Packing\RectanglePacker.Test.cs">
+      <DependentUpon>RectanglePacker.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Source\Packing\SimpleRectanglePacker.cs" />
+    <Compile Include="Source\Packing\SimpleRectanglePacker.Test.cs">
+      <DependentUpon>SimpleRectanglePacker.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Source\Parsing\CommandLineParser.cs" />
+    <Compile Include="Source\Parsing\CommandLineParser.Test.cs">
+      <DependentUpon>CommandLineParser.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Source\PathHelper.cs" />
+    <Compile Include="Source\PathHelper.Test.cs">
+      <DependentUpon>PathHelper.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Source\Scheduling\AbortedException.cs" />
+    <Compile Include="Source\Scheduling\IAbortable.cs" />
+    <Compile Include="Source\Scheduling\Operation.cs" />
+    <Compile Include="Source\Scheduling\QueueOperation.cs" />
+    <Compile Include="Source\Scheduling\QueueOperation.Test.cs">
+      <DependentUpon>QueueOperation.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Source\Scheduling\ThreadCallbackOperation.cs" />
+    <Compile Include="Source\Scheduling\ThreadOperation.cs" />
+    <Compile Include="Source\Serialization\BinarySerializer.cs" />
+    <Compile Include="Source\Serialization\BinarySerializer.Test.cs">
+      <DependentUpon>BinarySerializer.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Source\Serialization\IBinarySerializable.cs" />
+    <Compile Include="Source\SpatialPartitioning\BoundingRectangle.cs" />
+    <Compile Include="Source\SpatialPartitioning\RTree2.cs" />
+    <Compile Include="Source\SpatialPartitioning\RTreeLeaf2.cs" />
+    <Compile Include="Source\SpatialPartitioning\RTreeNode2.cs" />
+    <Compile Include="Source\SpatialPartitioning\SpatialIndex2.cs" />
+    <Compile Include="Source\Tracking\IdleStateEventArgs.cs" />
+    <Compile Include="Source\Tracking\Internal\ObservedWeightedProgression.cs" />
+    <Compile Include="Source\Tracking\Internal\WeightedProgressionWrapperCollection.cs" />
+    <Compile Include="Source\Tracking\IStatusReporter.cs" />
+    <Compile Include="Source\Tracking\Progression.cs" />
+    <Compile Include="Source\Tracking\ProgressionTracker.cs" />
+    <Compile Include="Source\Tracking\ProgressionTracker.Test.cs">
+      <DependentUpon>ProgressionTracker.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Source\Tracking\ProgressUpdateEventArgs.cs" />
+    <Compile Include="Source\Tracking\SetProgression.cs" />
+    <Compile Include="Source\Tracking\SetProgression.Test.cs">
+      <DependentUpon>ProgressionTracker.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Source\Tracking\StatusReportEventArgs.cs" />
+    <Compile Include="Source\Tracking\WeightedProgression.cs" />
+    <Compile Include="Source\WeakReference.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <NestedContentProject Include="Content\Content.contentproj">
+      <Project>6ee65cf8-1a2e-4570-bc9a-8c6b403154be</Project>
+      <Visible>False</Visible>
+    </NestedContentProject>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Documents\Nuclex.Support.txt" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\v2.0\Microsoft.Xna.GameStudio.Common.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\v2.0\Microsoft.Xna.GameStudio.NestedContent.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/Nuclex.Support.build b/Nuclex.Support.build
deleted file mode 100644
index 3c9f37c..0000000
--- a/Nuclex.Support.build
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-<project
-  xmlns="http://nant.sf.net/schemas/nant-0.85.win32.net-1.0.xsd"
-  name="Nuclex.Support"
-  default="compile"
->
-
-  <!--
-    This property can be overriden on the command line and controls whether
-    we build in debug or release mode
-  -->
-  <property overwrite="false" name="configuration" value="release" />
-
-  <!--
-    Set Optimization flags depending on the selected build configuration
-  -->
-  <property if="${configuration == 'release'}" name="optimize" value="true" />
-  <property if="${configuration == 'debug'}" name="optimize" value="false" />
-
-  <!--
-    Enable or disable debug informations depending on the selected build configuration
-  -->
-  <property if="${configuration == 'release'}" name="debug" value="None" />
-  <property if="${configuration == 'debug'}" name="debug" value="Full" />
-
-  <!--
-    Compile the sources to an assembly
-  -->
-  <target name="compile" description="Compile the assembly">
-
-    <!-- Display the exactt build configuration we're using for this compile -->
-    <echo message="optimization enabled: ${optimize}" />
-    <echo message="debugging informations: ${debug}" />
-
-    <!-- Create the output directory if it doesn't exist yet -->
-    <mkdir dir="bin/${configuration}" />
-
-    <!-- The compiling itself -->
-    <csc
-      target="library" 
-      output="bin/${configuration}/Nuclex.Support.dll" 
-      doc="bin/${configuration}/Nuclex.Support.xml"
-      optimize="${optimize}"
-      debug="${debug}"
-    >
-      <references>
-        <include
-          asis="true"
-          name="References/nunit/${nant.settings.currentframework}/nunit.framework.dll"
-        />
-        <!--
-        <include
-          asis="true"
-          name="../Nuclex.Math/bin/${configuration}/Nuclex.Math.dll"
-        />
-        -->
-        <include
-          asis="true"
-          name="../xna/Microsoft.Xna.Framework.dll"
-        />
-      </references>
-      <sources>
-        <include name="Source/**/*.cs" />
-      </sources>
-    </csc>
-
-  </target>
-
-  <!--
-    Removes all intermediate files created by the build process
-  -->
-  <target name="clean" description="Remove intermediate files">
-
-    <delete dir="bin" />
-    <delete dir="obj" />
-
-  </target>
-
-</project>
-
diff --git a/Source/PathHelper.cs b/Source/PathHelper.cs
index 5b38e13..8521fd6 100644
--- a/Source/PathHelper.cs
+++ b/Source/PathHelper.cs
@@ -39,13 +39,13 @@ namespace Nuclex.Support {
       // Calculate the required length for the StrinBuilder to be slightly more
       // friendly in terms of memory usage.
       int requiredLength = (baseDirectories.Length - (lastCommonRoot + 1)) * 3;
-      for(int index = lastCommonRoot + 1; index < absoluteDirectories.Length; index++)
+      for(int index = lastCommonRoot + 1; index < absoluteDirectories.Length; ++index)
         requiredLength += absoluteDirectories[index].Length + 1;
 
       StringBuilder relativePath = new StringBuilder(requiredLength);
 
       // Go to the common path by adding .. until we're where we want to be
-      for(int index = lastCommonRoot + 1; index < baseDirectories.Length; index++) {
+      for(int index = lastCommonRoot + 1; index < baseDirectories.Length; ++index) {
         if(baseDirectories[index].Length > 0) {
           if(relativePath.Length > 0) // We don't want the path to start with a slash
             relativePath.Append(Path.DirectorySeparatorChar);