diff --git a/src/Numerics/Numerics.csproj b/src/Numerics/Numerics.csproj
index 9249bd1a..b44a866c 100644
--- a/src/Numerics/Numerics.csproj
+++ b/src/Numerics/Numerics.csproj
@@ -109,6 +109,8 @@
     <Compile Include="Financial\AbsoluteRiskMeasures.cs" />
     <Compile Include="LinearAlgebra\Generic\Matrix.BCL.cs" />
     <Compile Include="LinearAlgebra\Generic\Vector.BCL.cs" />
+    <Compile Include="RootFinding\BrentRootFinder.cs" />
+    <Compile Include="RootFinding\RootFinder.cs" />
     <Compile Include="SpecialFunctions\Evaluate.cs" />
     <Compile Include="SpecialFunctions\ModifiedStruve.cs" />
     <Compile Include="SpecialFunctions\ModifiedBessel.cs" />
diff --git a/src/Numerics/RootFinders/BrentRootFinder.cs b/src/Numerics/RootFinding/BrentRootFinder.cs
similarity index 98%
rename from src/Numerics/RootFinders/BrentRootFinder.cs
rename to src/Numerics/RootFinding/BrentRootFinder.cs
index 06c926c6..82ec8b2d 100644
--- a/src/Numerics/RootFinders/BrentRootFinder.cs
+++ b/src/Numerics/RootFinding/BrentRootFinder.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace MathNet.Numerics.RootFinders
+namespace MathNet.Numerics.RootFinding
 {
 	public class BrentRootFinder : RootFinder
 	{
diff --git a/src/Numerics/RootFinders/RootFinder.cs b/src/Numerics/RootFinding/RootFinder.cs
similarity index 99%
rename from src/Numerics/RootFinders/RootFinder.cs
rename to src/Numerics/RootFinding/RootFinder.cs
index 4ee24498..94115c6f 100644
--- a/src/Numerics/RootFinders/RootFinder.cs
+++ b/src/Numerics/RootFinding/RootFinder.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace MathNet.Numerics.RootFinders
+namespace MathNet.Numerics.RootFinding
 {
     public struct Range
     {
diff --git a/src/Numerics/RootFinders/RootFinderTest.cs b/src/UnitTests/RootFindingTests/BrentRootFinderTest.cs
similarity index 50%
rename from src/Numerics/RootFinders/RootFinderTest.cs
rename to src/UnitTests/RootFindingTests/BrentRootFinderTest.cs
index 02f731de..9c00ee76 100644
--- a/src/Numerics/RootFinders/RootFinderTest.cs
+++ b/src/UnitTests/RootFindingTests/BrentRootFinderTest.cs
@@ -1,15 +1,13 @@
-namespace MathNet.Numerics.RootFinders
-{
-    using System;
-    using System.Collections.Generic;
-    using MbUnit.Framework;
-    using Gallio.Framework;
-    using SuntrustPortfolio.Numerics;
+using MathNet.Numerics.RootFinding;
+using NUnit.Framework;
+using System;
 
+namespace MathNet.Numerics.UnitTests.RootFindingTests
+{
     [TestFixture]
-    public class RootFinderTest
+    public class BrentRootFinderTest
     {
-        BrentRootFinder _solver = new BrentRootFinder(100, 1e-14);
+        readonly BrentRootFinder _solver = new BrentRootFinder(100, 1e-14);
 
         [Test]
         public void MultipleRoots()
diff --git a/src/UnitTests/UnitTests.csproj b/src/UnitTests/UnitTests.csproj
index 1307db01..552e2bef 100644
--- a/src/UnitTests/UnitTests.csproj
+++ b/src/UnitTests/UnitTests.csproj
@@ -770,6 +770,7 @@
     <Compile Include="Random\WH1982Tests.cs" />
     <Compile Include="Random\WH2006Tests.cs" />
     <Compile Include="Random\XorshiftTests.cs" />
+    <Compile Include="RootFindingTests\BrentRootFinderTest.cs" />
     <Compile Include="SortingTests.cs" />
     <Compile Include="SpecialFunctionsTests\ModifiedStruveTests.cs" />
     <Compile Include="SpecialFunctionsTests\ModifiedBesselTests.cs" />