diff --git a/src/Numerics/LinearAlgebra/Complex/Solvers/StopCriterium/DivergenceStopCriterium.cs b/src/Numerics/LinearAlgebra/Complex/Solvers/StopCriterium/DivergenceStopCriterium.cs
index 543a8f17..b742400e 100644
--- a/src/Numerics/LinearAlgebra/Complex/Solvers/StopCriterium/DivergenceStopCriterium.cs
+++ b/src/Numerics/LinearAlgebra/Complex/Solvers/StopCriterium/DivergenceStopCriterium.cs
@@ -28,8 +28,8 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 // </copyright>
 
+using MathNet.Numerics.LinearAlgebra.Solvers;
 using MathNet.Numerics.LinearAlgebra.Solvers.Status;
-using MathNet.Numerics.LinearAlgebra.Solvers.StopCriterium;
 using System;
 using System.Diagnostics;
 
@@ -366,7 +366,7 @@ namespace MathNet.Numerics.LinearAlgebra.Complex.Solvers.StopCriterium
         /// Gets the <see cref="StopLevel"/> which indicates what sort of stop criterium this
         /// <see cref="IIterationStopCriterium{T}"/> monitors.
         /// </summary>
-        /// <value>Returns <see cref="LinearAlgebra.Solvers.StopCriterium.StopLevel.Divergence"/>.</value>
+        /// <value>Returns <see cref="LinearAlgebra.Solvers.StopLevel.Divergence"/>.</value>
         public StopLevel StopLevel
         {
             [DebuggerStepThrough]
diff --git a/src/Numerics/LinearAlgebra/Complex/Solvers/StopCriterium/FailureStopCriterium.cs b/src/Numerics/LinearAlgebra/Complex/Solvers/StopCriterium/FailureStopCriterium.cs
index d908bf53..e578ec20 100644
--- a/src/Numerics/LinearAlgebra/Complex/Solvers/StopCriterium/FailureStopCriterium.cs
+++ b/src/Numerics/LinearAlgebra/Complex/Solvers/StopCriterium/FailureStopCriterium.cs
@@ -28,8 +28,8 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 // </copyright>
 
+using MathNet.Numerics.LinearAlgebra.Solvers;
 using MathNet.Numerics.LinearAlgebra.Solvers.Status;
-using MathNet.Numerics.LinearAlgebra.Solvers.StopCriterium;
 using MathNet.Numerics.Properties;
 using System;
 using System.Diagnostics;
diff --git a/src/Numerics/LinearAlgebra/Complex/Solvers/StopCriterium/ResidualStopCriterium.cs b/src/Numerics/LinearAlgebra/Complex/Solvers/StopCriterium/ResidualStopCriterium.cs
index 30098520..a1f386ae 100644
--- a/src/Numerics/LinearAlgebra/Complex/Solvers/StopCriterium/ResidualStopCriterium.cs
+++ b/src/Numerics/LinearAlgebra/Complex/Solvers/StopCriterium/ResidualStopCriterium.cs
@@ -28,8 +28,8 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 // </copyright>
 
+using MathNet.Numerics.LinearAlgebra.Solvers;
 using MathNet.Numerics.LinearAlgebra.Solvers.Status;
-using MathNet.Numerics.LinearAlgebra.Solvers.StopCriterium;
 using MathNet.Numerics.Properties;
 using System;
 using System.Diagnostics;
diff --git a/src/Numerics/LinearAlgebra/Complex32/Solvers/StopCriterium/DivergenceStopCriterium.cs b/src/Numerics/LinearAlgebra/Complex32/Solvers/StopCriterium/DivergenceStopCriterium.cs
index 58a00ab4..45a55e18 100644
--- a/src/Numerics/LinearAlgebra/Complex32/Solvers/StopCriterium/DivergenceStopCriterium.cs
+++ b/src/Numerics/LinearAlgebra/Complex32/Solvers/StopCriterium/DivergenceStopCriterium.cs
@@ -28,8 +28,8 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 // </copyright>
 
+using MathNet.Numerics.LinearAlgebra.Solvers;
 using MathNet.Numerics.LinearAlgebra.Solvers.Status;
-using MathNet.Numerics.LinearAlgebra.Solvers.StopCriterium;
 using System;
 using System.Diagnostics;
 
@@ -361,7 +361,7 @@ namespace MathNet.Numerics.LinearAlgebra.Complex32.Solvers.StopCriterium
         /// Gets the <see cref="StopLevel"/> which indicates what sort of stop criterium this
         /// <see cref="IIterationStopCriterium{T}"/> monitors.
         /// </summary>
-        /// <value>Returns <see cref="LinearAlgebra.Solvers.StopCriterium.StopLevel.Divergence"/>.</value>
+        /// <value>Returns <see cref="LinearAlgebra.Solvers.StopLevel.Divergence"/>.</value>
         public StopLevel StopLevel
         {
             [DebuggerStepThrough]
diff --git a/src/Numerics/LinearAlgebra/Complex32/Solvers/StopCriterium/FailureStopCriterium.cs b/src/Numerics/LinearAlgebra/Complex32/Solvers/StopCriterium/FailureStopCriterium.cs
index 1a1379e3..ffd59193 100644
--- a/src/Numerics/LinearAlgebra/Complex32/Solvers/StopCriterium/FailureStopCriterium.cs
+++ b/src/Numerics/LinearAlgebra/Complex32/Solvers/StopCriterium/FailureStopCriterium.cs
@@ -28,8 +28,8 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 // </copyright>
 
+using MathNet.Numerics.LinearAlgebra.Solvers;
 using MathNet.Numerics.LinearAlgebra.Solvers.Status;
-using MathNet.Numerics.LinearAlgebra.Solvers.StopCriterium;
 using MathNet.Numerics.Properties;
 using System;
 using System.Diagnostics;
diff --git a/src/Numerics/LinearAlgebra/Complex32/Solvers/StopCriterium/ResidualStopCriterium.cs b/src/Numerics/LinearAlgebra/Complex32/Solvers/StopCriterium/ResidualStopCriterium.cs
index 6bc9b862..6f3a0043 100644
--- a/src/Numerics/LinearAlgebra/Complex32/Solvers/StopCriterium/ResidualStopCriterium.cs
+++ b/src/Numerics/LinearAlgebra/Complex32/Solvers/StopCriterium/ResidualStopCriterium.cs
@@ -30,8 +30,8 @@
 
 using System;
 using System.Diagnostics;
+using MathNet.Numerics.LinearAlgebra.Solvers;
 using MathNet.Numerics.LinearAlgebra.Solvers.Status;
-using MathNet.Numerics.LinearAlgebra.Solvers.StopCriterium;
 using MathNet.Numerics.Properties;
 
 namespace MathNet.Numerics.LinearAlgebra.Complex32.Solvers.StopCriterium
diff --git a/src/Numerics/LinearAlgebra/Double/Solvers/StopCriterium/DivergenceStopCriterium.cs b/src/Numerics/LinearAlgebra/Double/Solvers/StopCriterium/DivergenceStopCriterium.cs
index 5571db5f..29beaba8 100644
--- a/src/Numerics/LinearAlgebra/Double/Solvers/StopCriterium/DivergenceStopCriterium.cs
+++ b/src/Numerics/LinearAlgebra/Double/Solvers/StopCriterium/DivergenceStopCriterium.cs
@@ -28,8 +28,8 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 // </copyright>
 
+using MathNet.Numerics.LinearAlgebra.Solvers;
 using MathNet.Numerics.LinearAlgebra.Solvers.Status;
-using MathNet.Numerics.LinearAlgebra.Solvers.StopCriterium;
 using System;
 using System.Diagnostics;
 
@@ -359,7 +359,7 @@ namespace MathNet.Numerics.LinearAlgebra.Double.Solvers.StopCriterium
         /// Gets the <see cref="StopLevel"/> which indicates what sort of stop criterium this
         /// <see cref="IIterationStopCriterium{T}"/> monitors.
         /// </summary>
-        /// <value>Returns <see cref="LinearAlgebra.Solvers.StopCriterium.StopLevel.Divergence"/>.</value>
+        /// <value>Returns <see cref="LinearAlgebra.Solvers.StopLevel.Divergence"/>.</value>
         public StopLevel StopLevel
         {
             [DebuggerStepThrough]
diff --git a/src/Numerics/LinearAlgebra/Double/Solvers/StopCriterium/FailureStopCriterium.cs b/src/Numerics/LinearAlgebra/Double/Solvers/StopCriterium/FailureStopCriterium.cs
index a638e255..a37934fb 100644
--- a/src/Numerics/LinearAlgebra/Double/Solvers/StopCriterium/FailureStopCriterium.cs
+++ b/src/Numerics/LinearAlgebra/Double/Solvers/StopCriterium/FailureStopCriterium.cs
@@ -28,8 +28,8 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 // </copyright>
 
+using MathNet.Numerics.LinearAlgebra.Solvers;
 using MathNet.Numerics.LinearAlgebra.Solvers.Status;
-using MathNet.Numerics.LinearAlgebra.Solvers.StopCriterium;
 using MathNet.Numerics.Properties;
 using System;
 using System.Diagnostics;
diff --git a/src/Numerics/LinearAlgebra/Double/Solvers/StopCriterium/ResidualStopCriterium.cs b/src/Numerics/LinearAlgebra/Double/Solvers/StopCriterium/ResidualStopCriterium.cs
index 38b2c6b2..11d03121 100644
--- a/src/Numerics/LinearAlgebra/Double/Solvers/StopCriterium/ResidualStopCriterium.cs
+++ b/src/Numerics/LinearAlgebra/Double/Solvers/StopCriterium/ResidualStopCriterium.cs
@@ -28,8 +28,8 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 // </copyright>
 
+using MathNet.Numerics.LinearAlgebra.Solvers;
 using MathNet.Numerics.LinearAlgebra.Solvers.Status;
-using MathNet.Numerics.LinearAlgebra.Solvers.StopCriterium;
 using MathNet.Numerics.Properties;
 using System;
 using System.Diagnostics;
diff --git a/src/Numerics/LinearAlgebra/Single/Solvers/StopCriterium/DivergenceStopCriterium.cs b/src/Numerics/LinearAlgebra/Single/Solvers/StopCriterium/DivergenceStopCriterium.cs
index 691bf3e0..2998f50e 100644
--- a/src/Numerics/LinearAlgebra/Single/Solvers/StopCriterium/DivergenceStopCriterium.cs
+++ b/src/Numerics/LinearAlgebra/Single/Solvers/StopCriterium/DivergenceStopCriterium.cs
@@ -28,8 +28,8 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 // </copyright>
 
+using MathNet.Numerics.LinearAlgebra.Solvers;
 using MathNet.Numerics.LinearAlgebra.Solvers.Status;
-using MathNet.Numerics.LinearAlgebra.Solvers.StopCriterium;
 using System;
 using System.Diagnostics;
 
@@ -359,7 +359,7 @@ namespace MathNet.Numerics.LinearAlgebra.Single.Solvers.StopCriterium
         /// Gets the <see cref="StopLevel"/> which indicates what sort of stop criterium this
         /// <see cref="IIterationStopCriterium{T}"/> monitors.
         /// </summary>
-        /// <value>Returns <see cref="LinearAlgebra.Solvers.StopCriterium.StopLevel.Divergence"/>.</value>
+        /// <value>Returns <see cref="LinearAlgebra.Solvers.StopLevel.Divergence"/>.</value>
         public StopLevel StopLevel
         {
             [DebuggerStepThrough]
diff --git a/src/Numerics/LinearAlgebra/Single/Solvers/StopCriterium/FailureStopCriterium.cs b/src/Numerics/LinearAlgebra/Single/Solvers/StopCriterium/FailureStopCriterium.cs
index 75dc39d5..75cf64b2 100644
--- a/src/Numerics/LinearAlgebra/Single/Solvers/StopCriterium/FailureStopCriterium.cs
+++ b/src/Numerics/LinearAlgebra/Single/Solvers/StopCriterium/FailureStopCriterium.cs
@@ -28,8 +28,8 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 // </copyright>
 
+using MathNet.Numerics.LinearAlgebra.Solvers;
 using MathNet.Numerics.LinearAlgebra.Solvers.Status;
-using MathNet.Numerics.LinearAlgebra.Solvers.StopCriterium;
 using MathNet.Numerics.Properties;
 using System;
 using System.Diagnostics;
diff --git a/src/Numerics/LinearAlgebra/Single/Solvers/StopCriterium/ResidualStopCriterium.cs b/src/Numerics/LinearAlgebra/Single/Solvers/StopCriterium/ResidualStopCriterium.cs
index 0f8303ae..b742745b 100644
--- a/src/Numerics/LinearAlgebra/Single/Solvers/StopCriterium/ResidualStopCriterium.cs
+++ b/src/Numerics/LinearAlgebra/Single/Solvers/StopCriterium/ResidualStopCriterium.cs
@@ -28,8 +28,8 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 // </copyright>
 
+using MathNet.Numerics.LinearAlgebra.Solvers;
 using MathNet.Numerics.LinearAlgebra.Solvers.Status;
-using MathNet.Numerics.LinearAlgebra.Solvers.StopCriterium;
 using MathNet.Numerics.Properties;
 using System;
 using System.Diagnostics;
diff --git a/src/Numerics/LinearAlgebra/Solvers/StopCriterium/IIterationStopCriterium.cs b/src/Numerics/LinearAlgebra/Solvers/IIterationStopCriterium.cs
similarity index 98%
rename from src/Numerics/LinearAlgebra/Solvers/StopCriterium/IIterationStopCriterium.cs
rename to src/Numerics/LinearAlgebra/Solvers/IIterationStopCriterium.cs
index b808e9b0..608cfa71 100644
--- a/src/Numerics/LinearAlgebra/Solvers/StopCriterium/IIterationStopCriterium.cs
+++ b/src/Numerics/LinearAlgebra/Solvers/IIterationStopCriterium.cs
@@ -31,7 +31,7 @@
 using System;
 using MathNet.Numerics.LinearAlgebra.Solvers.Status;
 
-namespace MathNet.Numerics.LinearAlgebra.Solvers.StopCriterium
+namespace MathNet.Numerics.LinearAlgebra.Solvers
 {
     /// <summary>
     /// The base interface for classes that provide stop criteria for iterative calculations. 
diff --git a/src/Numerics/LinearAlgebra/Solvers/StopCriterium/IterationCountStopCriterium.cs b/src/Numerics/LinearAlgebra/Solvers/IterationCountStopCriterium.cs
similarity index 100%
rename from src/Numerics/LinearAlgebra/Solvers/StopCriterium/IterationCountStopCriterium.cs
rename to src/Numerics/LinearAlgebra/Solvers/IterationCountStopCriterium.cs
diff --git a/src/Numerics/LinearAlgebra/Solvers/StopCriterium/StopLevel.cs b/src/Numerics/LinearAlgebra/Solvers/StopLevel.cs
similarity index 97%
rename from src/Numerics/LinearAlgebra/Solvers/StopCriterium/StopLevel.cs
rename to src/Numerics/LinearAlgebra/Solvers/StopLevel.cs
index 2bfb3cf0..294933b3 100644
--- a/src/Numerics/LinearAlgebra/Solvers/StopCriterium/StopLevel.cs
+++ b/src/Numerics/LinearAlgebra/Solvers/StopLevel.cs
@@ -28,7 +28,7 @@
 // OTHER DEALINGS IN THE SOFTWARE.
 // </copyright>
 
-namespace MathNet.Numerics.LinearAlgebra.Solvers.StopCriterium
+namespace MathNet.Numerics.LinearAlgebra.Solvers
 {
     /// <summary>
     /// Iteration stop criteria. 
diff --git a/src/Numerics/Numerics.csproj b/src/Numerics/Numerics.csproj
index 9aadcede..d0b55780 100644
--- a/src/Numerics/Numerics.csproj
+++ b/src/Numerics/Numerics.csproj
@@ -124,7 +124,7 @@
     <Compile Include="LinearAlgebra\Builder.cs" />
     <Compile Include="LinearAlgebra\Matrix.Factorization.cs" />
     <Compile Include="LinearAlgebra\Solvers\Iterator.cs" />
-    <Compile Include="LinearAlgebra\Solvers\StopCriterium\IterationCountStopCriterium.cs" />
+    <Compile Include="LinearAlgebra\Solvers\IterationCountStopCriterium.cs" />
     <Compile Include="Providers\LinearAlgebra\Acml\AcmlLinearAlgebraProvider.Complex.cs" />
     <Compile Include="Providers\LinearAlgebra\Acml\AcmlLinearAlgebraProvider.Complex32.cs" />
     <Compile Include="Providers\LinearAlgebra\Acml\AcmlLinearAlgebraProvider.Double.cs" />
@@ -220,7 +220,7 @@
     <Compile Include="LinearAlgebra\Solvers\IIterativeSolverSetup.cs" />
     <Compile Include="LinearAlgebra\Solvers\IIterator.cs" />
     <Compile Include="LinearAlgebra\Solvers\IPreConditioner.cs" />
-    <Compile Include="LinearAlgebra\Solvers\StopCriterium\IIterationStopCriterium.cs" />
+    <Compile Include="LinearAlgebra\Solvers\IIterationStopCriterium.cs" />
     <Compile Include="LinearAlgebra\Double\SparseMatrix.cs" />
     <Compile Include="LinearAlgebra\Double\Vector.cs" />
     <Compile Include="LinearAlgebra\Complex32\DenseVector.cs" />
@@ -360,7 +360,7 @@
     <Compile Include="LinearAlgebra\Double\Solvers\StopCriterium\DivergenceStopCriterium.cs" />
     <Compile Include="LinearAlgebra\Double\Solvers\StopCriterium\FailureStopCriterium.cs" />
     <Compile Include="LinearAlgebra\Double\Solvers\StopCriterium\ResidualStopCriterium.cs" />
-    <Compile Include="LinearAlgebra\Solvers\StopCriterium\StopLevel.cs" />
+    <Compile Include="LinearAlgebra\Solvers\StopLevel.cs" />
     <Compile Include="LinearAlgebra\Double\SparseVector.cs" />
     <Compile Include="LinearAlgebra\Matrix.Arithmetic.cs" />
     <Compile Include="LinearAlgebra\Matrix.cs" />