diff --git a/Nuclex.Support (net-4.0).csproj b/Nuclex.Support (net-4.0).csproj
index 650c1f5..2ce6430 100644
--- a/Nuclex.Support (net-4.0).csproj	
+++ b/Nuclex.Support (net-4.0).csproj	
@@ -251,10 +251,6 @@
     <Compile Include="Source\Parsing\CommandLine.Parser.cs">
       <DependentUpon>CommandLine.cs</DependentUpon>
     </Compile>
-    <Compile Include="Source\ParallelBackgroundWorker.cs" />
-    <Compile Include="Source\ParallelBackgroundWorker.Test.cs">
-      <DependentUpon>ParallelBackgroundWorker.cs</DependentUpon>
-    </Compile>
     <Compile Include="Source\Parsing\ParserHelper.cs" />
     <Compile Include="Source\Parsing\ParserHelper.Test.cs">
       <DependentUpon>ParserHelper.cs</DependentUpon>
@@ -263,10 +259,6 @@
     <Compile Include="Source\PropertyChangedEventArgsHelper.Test.cs">
       <DependentUpon>PropertyChangedEventArgsHelper.cs</DependentUpon>
     </Compile>
-    <Compile Include="Source\AffineThreadPool.cs" />
-    <Compile Include="Source\AffineThreadPool.Test.cs">
-      <DependentUpon>AffineThreadPool.cs</DependentUpon>
-    </Compile>
     <Compile Include="Source\EnumHelper.cs" />
     <Compile Include="Source\EnumHelper.Test.cs">
       <DependentUpon>EnumHelper.cs</DependentUpon>
@@ -279,6 +271,14 @@
     <Compile Include="Source\ObservableHelper.Test.cs">
       <DependentUpon>ObservableHelper.cs</DependentUpon>
     </Compile>
+    <Compile Include="Source\Threading\AffineThreadPool.cs" />
+    <Compile Include="Source\Threading\AffineThreadPool.Test.cs">
+      <DependentUpon>AffineThreadPool.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Source\Threading\ParallelBackgroundWorker.cs" />
+    <Compile Include="Source\Threading\ParallelBackgroundWorker.Test.cs">
+      <DependentUpon>ParallelBackgroundWorker.cs</DependentUpon>
+    </Compile>
     <Compile Include="Source\TypeHelper.cs" />
     <Compile Include="Source\TypeHelper.Test.cs">
       <DependentUpon>TypeHelper.cs</DependentUpon>
@@ -331,11 +331,11 @@
     <Content Include="Documents\Request Framework.txt" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.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>
+  <!-- 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/Source/Observable.Test.cs b/Source/Observable.Test.cs
index 89f509a..eaa3a89 100644
--- a/Source/Observable.Test.cs
+++ b/Source/Observable.Test.cs
@@ -47,7 +47,9 @@ namespace Nuclex.Support {
 
       /// <summary>Fires the property changed event for the 'SomePropety' property</summary>
       public void FireSomePropertyChanged() {
+        #pragma warning disable 0618
         OnPropertyChanged(() => SomeProperty);
+        #pragma warning restore 0618
       }
 
       /// <summary>Example property that will be reported to have changed</summary>
diff --git a/Source/PropertyChangedEventArgsHelper.Test.cs b/Source/PropertyChangedEventArgsHelper.Test.cs
index 1d4dbed..a429ba6 100644
--- a/Source/PropertyChangedEventArgsHelper.Test.cs
+++ b/Source/PropertyChangedEventArgsHelper.Test.cs
@@ -50,7 +50,9 @@ namespace Nuclex.Support {
     [Test]
     public void MatchingPropertyChangeNotificationIsRecognized() {
       var arguments = new PropertyChangedEventArgs("SomeProperty");
+      #pragma warning disable 0618
       Assert.IsTrue(arguments.AreAffecting(() => ViewModel.SomeProperty));
+      #pragma warning restore 0618
       Assert.IsTrue(arguments.AreAffecting("SomeProperty"));
     }
 
@@ -61,7 +63,9 @@ namespace Nuclex.Support {
     [Test]
     public void MismatchingPropertyIsReportedAsUnaffected() {
       var arguments = new PropertyChangedEventArgs("AnotherProperty");
+      #pragma warning disable 0618
       Assert.IsFalse(arguments.AreAffecting(() => ViewModel.SomeProperty));
+      #pragma warning restore 0618
       Assert.IsFalse(arguments.AreAffecting("SomeProperty"));
     }
 
@@ -72,7 +76,9 @@ namespace Nuclex.Support {
     [Test]
     public void SpecificPropertyIsAffectedByNullWildcard() {
       var nullArguments = new PropertyChangedEventArgs(null);
+      #pragma warning disable 0618
       Assert.IsTrue(nullArguments.AreAffecting(() => ViewModel.SomeProperty));
+      #pragma warning restore 0618
       Assert.IsTrue(nullArguments.AreAffecting("SomeProperty"));
     }
 
@@ -83,7 +89,9 @@ namespace Nuclex.Support {
     [Test]
     public void SpecificPropertyIsAffectedByEmptyWildcard() {
       var emptyArguments = new PropertyChangedEventArgs(string.Empty);
+      #pragma warning disable 0618
       Assert.IsTrue(emptyArguments.AreAffecting(() => ViewModel.SomeProperty));
+      #pragma warning disable 0618
       Assert.IsTrue(emptyArguments.AreAffecting("SomeProperty"));
     }
 
diff --git a/Source/AffineThreadPool.Test.cs b/Source/Threading/AffineThreadPool.Test.cs
similarity index 96%
rename from Source/AffineThreadPool.Test.cs
rename to Source/Threading/AffineThreadPool.Test.cs
index 172428e..63547cc 100644
--- a/Source/AffineThreadPool.Test.cs
+++ b/Source/Threading/AffineThreadPool.Test.cs
@@ -26,7 +26,7 @@ using System.Threading;
 
 using NUnit.Framework;
 
-namespace Nuclex.Support {
+namespace Nuclex.Support.Threading {
 
   /// <summary>Unit Test for the CPU core-affine thread pool</summary>
   [TestFixture]
@@ -351,6 +351,6 @@ namespace Nuclex.Support {
 
   }
 
-} // namespace Nuclex.Support
+} // namespace Nuclex.Support.Threading
 
 #endif // UNITTEST
diff --git a/Source/AffineThreadPool.cs b/Source/Threading/AffineThreadPool.cs
similarity index 96%
rename from Source/AffineThreadPool.cs
rename to Source/Threading/AffineThreadPool.cs
index c1044b1..893e272 100644
--- a/Source/AffineThreadPool.cs
+++ b/Source/Threading/AffineThreadPool.cs
@@ -24,7 +24,7 @@ using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Threading;
 
-namespace Nuclex.Support {
+namespace Nuclex.Support.Threading {
 
   /// <summary>Alternative Thread pool providing one thread for each core</summary>
   /// <remarks>
@@ -293,4 +293,4 @@ namespace Nuclex.Support {
 
   }
 
-} // namespace Nuclex.Support
+} // namespace Nuclex.Support.Threading
diff --git a/Source/ParallelBackgroundWorker.Test.cs b/Source/Threading/ParallelBackgroundWorker.Test.cs
similarity index 96%
rename from Source/ParallelBackgroundWorker.Test.cs
rename to Source/Threading/ParallelBackgroundWorker.Test.cs
index 787d2a5..ce646cf 100644
--- a/Source/ParallelBackgroundWorker.Test.cs
+++ b/Source/Threading/ParallelBackgroundWorker.Test.cs
@@ -28,7 +28,7 @@ using System.Collections.Generic;
 
 using NUnit.Framework;
 
-namespace Nuclex.Support {
+namespace Nuclex.Support.Threading {
 
   /// <summary>Unit Test for the parallel background worker class</summary>
   [TestFixture]
@@ -249,7 +249,7 @@ namespace Nuclex.Support {
 
   }
 
-} // namespace Nuclex.Support
+} // namespace Nuclex.Support.Threading
 
 #endif // UNITTEST
 
diff --git a/Source/ParallelBackgroundWorker.cs b/Source/Threading/ParallelBackgroundWorker.cs
similarity index 96%
rename from Source/ParallelBackgroundWorker.cs
rename to Source/Threading/ParallelBackgroundWorker.cs
index f0fd7c6..2ed3ecc 100644
--- a/Source/ParallelBackgroundWorker.cs
+++ b/Source/Threading/ParallelBackgroundWorker.cs
@@ -26,7 +26,7 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Nuclex.Support {
+namespace Nuclex.Support.Threading {
 
   /// <summary>Processes tasks in parallel using many threads</summary>
   /// <typeparam name="TTask">Type of tasks the class will process</typeparam>
@@ -339,6 +339,6 @@ namespace Nuclex.Support {
 
   }
 
-} // namespace Nuclex.Support
+} // namespace Nuclex.Support.Threading
 
 #endif // !NO_CONCURRENT_COLLECTIONS