diff --git a/FastRng/Float/Distributions/BetaA2B2.cs b/FastRng/Distributions/BetaA2B2.cs
similarity index 91%
rename from FastRng/Float/Distributions/BetaA2B2.cs
rename to FastRng/Distributions/BetaA2B2.cs
index 4b32c56..a2cbcc3 100644
--- a/FastRng/Float/Distributions/BetaA2B2.cs
+++ b/FastRng/Distributions/BetaA2B2.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace FastRng.Float.Distributions
+namespace FastRng.Distributions
 {
     public sealed class BetaA2B2 : Distribution
     {
diff --git a/FastRng/Float/Distributions/BetaA2B5.cs b/FastRng/Distributions/BetaA2B5.cs
similarity index 91%
rename from FastRng/Float/Distributions/BetaA2B5.cs
rename to FastRng/Distributions/BetaA2B5.cs
index d3a2e5e..5fcfbcc 100644
--- a/FastRng/Float/Distributions/BetaA2B5.cs
+++ b/FastRng/Distributions/BetaA2B5.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace FastRng.Float.Distributions
+namespace FastRng.Distributions
 {
     public sealed class BetaA2B5 : Distribution
     {
diff --git a/FastRng/Float/Distributions/BetaA5B2.cs b/FastRng/Distributions/BetaA5B2.cs
similarity index 91%
rename from FastRng/Float/Distributions/BetaA5B2.cs
rename to FastRng/Distributions/BetaA5B2.cs
index e0ce271..68f0ded 100644
--- a/FastRng/Float/Distributions/BetaA5B2.cs
+++ b/FastRng/Distributions/BetaA5B2.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace FastRng.Float.Distributions
+namespace FastRng.Distributions
 {
     public sealed class BetaA5B2 : Distribution
     {
diff --git a/FastRng/Float/Distributions/CauchyLorentzX0.cs b/FastRng/Distributions/CauchyLorentzX0.cs
similarity index 92%
rename from FastRng/Float/Distributions/CauchyLorentzX0.cs
rename to FastRng/Distributions/CauchyLorentzX0.cs
index 9eb5a56..d0a4139 100644
--- a/FastRng/Float/Distributions/CauchyLorentzX0.cs
+++ b/FastRng/Distributions/CauchyLorentzX0.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace FastRng.Float.Distributions
+namespace FastRng.Distributions
 {
     public sealed class CauchyLorentzX0 : Distribution
     {
diff --git a/FastRng/Float/Distributions/CauchyLorentzX1.cs b/FastRng/Distributions/CauchyLorentzX1.cs
similarity index 92%
rename from FastRng/Float/Distributions/CauchyLorentzX1.cs
rename to FastRng/Distributions/CauchyLorentzX1.cs
index 12e2467..3fd831c 100644
--- a/FastRng/Float/Distributions/CauchyLorentzX1.cs
+++ b/FastRng/Distributions/CauchyLorentzX1.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace FastRng.Float.Distributions
+namespace FastRng.Distributions
 {
     public sealed class CauchyLorentzX1 : Distribution
     {
diff --git a/FastRng/Float/Distributions/ChiSquareK1.cs b/FastRng/Distributions/ChiSquareK1.cs
similarity index 95%
rename from FastRng/Float/Distributions/ChiSquareK1.cs
rename to FastRng/Distributions/ChiSquareK1.cs
index dc013e2..cdf5f6c 100644
--- a/FastRng/Float/Distributions/ChiSquareK1.cs
+++ b/FastRng/Distributions/ChiSquareK1.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace FastRng.Float.Distributions
+namespace FastRng.Distributions
 {
     public sealed class ChiSquareK1 : Distribution
     {
diff --git a/FastRng/Float/Distributions/ChiSquareK10.cs b/FastRng/Distributions/ChiSquareK10.cs
similarity index 95%
rename from FastRng/Float/Distributions/ChiSquareK10.cs
rename to FastRng/Distributions/ChiSquareK10.cs
index 77e1d83..ecbc065 100644
--- a/FastRng/Float/Distributions/ChiSquareK10.cs
+++ b/FastRng/Distributions/ChiSquareK10.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace FastRng.Float.Distributions
+namespace FastRng.Distributions
 {
     public sealed class ChiSquareK10 : Distribution
     {
diff --git a/FastRng/Float/Distributions/ChiSquareK4.cs b/FastRng/Distributions/ChiSquareK4.cs
similarity index 95%
rename from FastRng/Float/Distributions/ChiSquareK4.cs
rename to FastRng/Distributions/ChiSquareK4.cs
index 5d4142d..7187b25 100644
--- a/FastRng/Float/Distributions/ChiSquareK4.cs
+++ b/FastRng/Distributions/ChiSquareK4.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace FastRng.Float.Distributions
+namespace FastRng.Distributions
 {
     public sealed class ChiSquareK4 : Distribution
     {
diff --git a/FastRng/Float/Distributions/Distribution.cs b/FastRng/Distributions/Distribution.cs
similarity index 98%
rename from FastRng/Float/Distributions/Distribution.cs
rename to FastRng/Distributions/Distribution.cs
index 70b2a0e..9014e33 100644
--- a/FastRng/Float/Distributions/Distribution.cs
+++ b/FastRng/Distributions/Distribution.cs
@@ -2,7 +2,7 @@ using System;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace FastRng.Float.Distributions
+namespace FastRng.Distributions
 {
     public abstract class Distribution : IDistribution
     {
diff --git a/FastRng/Float/Distributions/ExponentialLa10.cs b/FastRng/Distributions/ExponentialLa10.cs
similarity index 90%
rename from FastRng/Float/Distributions/ExponentialLa10.cs
rename to FastRng/Distributions/ExponentialLa10.cs
index ae9a4de..776a5af 100644
--- a/FastRng/Float/Distributions/ExponentialLa10.cs
+++ b/FastRng/Distributions/ExponentialLa10.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace FastRng.Float.Distributions
+namespace FastRng.Distributions
 {
     public sealed class ExponentialLa10 : Distribution
     {
diff --git a/FastRng/Float/Distributions/ExponentialLa5.cs b/FastRng/Distributions/ExponentialLa5.cs
similarity index 90%
rename from FastRng/Float/Distributions/ExponentialLa5.cs
rename to FastRng/Distributions/ExponentialLa5.cs
index c289f35..c3f8804 100644
--- a/FastRng/Float/Distributions/ExponentialLa5.cs
+++ b/FastRng/Distributions/ExponentialLa5.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace FastRng.Float.Distributions
+namespace FastRng.Distributions
 {
     public sealed class ExponentialLa5 : Distribution
     {
diff --git a/FastRng/Float/Distributions/GammaA5B15.cs b/FastRng/Distributions/GammaA5B15.cs
similarity index 94%
rename from FastRng/Float/Distributions/GammaA5B15.cs
rename to FastRng/Distributions/GammaA5B15.cs
index e0667e2..52201e4 100644
--- a/FastRng/Float/Distributions/GammaA5B15.cs
+++ b/FastRng/Distributions/GammaA5B15.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace FastRng.Float.Distributions
+namespace FastRng.Distributions
 {
     public sealed class GammaA5B15 : Distribution
     {
diff --git a/FastRng/Float/Distributions/IDistribution.cs b/FastRng/Distributions/IDistribution.cs
similarity index 95%
rename from FastRng/Float/Distributions/IDistribution.cs
rename to FastRng/Distributions/IDistribution.cs
index 150080e..867975a 100644
--- a/FastRng/Float/Distributions/IDistribution.cs
+++ b/FastRng/Distributions/IDistribution.cs
@@ -1,7 +1,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace FastRng.Float.Distributions
+namespace FastRng.Distributions
 {
     public interface IDistribution
     {
diff --git a/FastRng/Float/Distributions/InverseExponentialLa10.cs b/FastRng/Distributions/InverseExponentialLa10.cs
similarity index 90%
rename from FastRng/Float/Distributions/InverseExponentialLa10.cs
rename to FastRng/Distributions/InverseExponentialLa10.cs
index 51a2785..3201af6 100644
--- a/FastRng/Float/Distributions/InverseExponentialLa10.cs
+++ b/FastRng/Distributions/InverseExponentialLa10.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace FastRng.Float.Distributions
+namespace FastRng.Distributions
 {
     public sealed class InverseExponentialLa10 : Distribution
     {
diff --git a/FastRng/Float/Distributions/InverseExponentialLa5.cs b/FastRng/Distributions/InverseExponentialLa5.cs
similarity index 90%
rename from FastRng/Float/Distributions/InverseExponentialLa5.cs
rename to FastRng/Distributions/InverseExponentialLa5.cs
index 1a988b2..400d102 100644
--- a/FastRng/Float/Distributions/InverseExponentialLa5.cs
+++ b/FastRng/Distributions/InverseExponentialLa5.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace FastRng.Float.Distributions
+namespace FastRng.Distributions
 {
     public sealed class InverseExponentialLa5 : Distribution
     {
diff --git a/FastRng/Float/Distributions/InverseGammaA3B05.cs b/FastRng/Distributions/InverseGammaA3B05.cs
similarity index 95%
rename from FastRng/Float/Distributions/InverseGammaA3B05.cs
rename to FastRng/Distributions/InverseGammaA3B05.cs
index 50fe1cd..e51048e 100644
--- a/FastRng/Float/Distributions/InverseGammaA3B05.cs
+++ b/FastRng/Distributions/InverseGammaA3B05.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace FastRng.Float.Distributions
+namespace FastRng.Distributions
 {
     public sealed class InverseGammaA3B05 : Distribution
     {
diff --git a/FastRng/Float/Distributions/LaplaceB01M0.cs b/FastRng/Distributions/LaplaceB01M0.cs
similarity index 93%
rename from FastRng/Float/Distributions/LaplaceB01M0.cs
rename to FastRng/Distributions/LaplaceB01M0.cs
index bdecca0..96ce19b 100644
--- a/FastRng/Float/Distributions/LaplaceB01M0.cs
+++ b/FastRng/Distributions/LaplaceB01M0.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace FastRng.Float.Distributions
+namespace FastRng.Distributions
 {
     public sealed class LaplaceB01M0 : Distribution
     {
diff --git a/FastRng/Float/Distributions/LaplaceB01M05.cs b/FastRng/Distributions/LaplaceB01M05.cs
similarity index 93%
rename from FastRng/Float/Distributions/LaplaceB01M05.cs
rename to FastRng/Distributions/LaplaceB01M05.cs
index 505a2ee..3ca0e6a 100644
--- a/FastRng/Float/Distributions/LaplaceB01M05.cs
+++ b/FastRng/Distributions/LaplaceB01M05.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace FastRng.Float.Distributions
+namespace FastRng.Distributions
 {
     public sealed class LaplaceB01M05 : Distribution
     {
diff --git a/FastRng/Float/Distributions/LogNormalS1M0.cs b/FastRng/Distributions/LogNormalS1M0.cs
similarity index 94%
rename from FastRng/Float/Distributions/LogNormalS1M0.cs
rename to FastRng/Distributions/LogNormalS1M0.cs
index b6c1cb8..c318e0c 100644
--- a/FastRng/Float/Distributions/LogNormalS1M0.cs
+++ b/FastRng/Distributions/LogNormalS1M0.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace FastRng.Float.Distributions
+namespace FastRng.Distributions
 {
     public sealed class LogNormalS1M0 : Distribution
     {
diff --git a/FastRng/Float/Distributions/NormalS02M05.cs b/FastRng/Distributions/NormalS02M05.cs
similarity index 91%
rename from FastRng/Float/Distributions/NormalS02M05.cs
rename to FastRng/Distributions/NormalS02M05.cs
index b1f52a4..c3baa5a 100644
--- a/FastRng/Float/Distributions/NormalS02M05.cs
+++ b/FastRng/Distributions/NormalS02M05.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace FastRng.Float.Distributions
+namespace FastRng.Distributions
 {
     public sealed class NormalS02M05 : Distribution
     {
diff --git a/FastRng/Float/Distributions/StudentTNu1.cs b/FastRng/Distributions/StudentTNu1.cs
similarity index 95%
rename from FastRng/Float/Distributions/StudentTNu1.cs
rename to FastRng/Distributions/StudentTNu1.cs
index 6e4e38f..8349b76 100644
--- a/FastRng/Float/Distributions/StudentTNu1.cs
+++ b/FastRng/Distributions/StudentTNu1.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace FastRng.Float.Distributions
+namespace FastRng.Distributions
 {
     public sealed class StudentTNu1 : Distribution
     {
diff --git a/FastRng/Float/Distributions/Uniform.cs b/FastRng/Distributions/Uniform.cs
similarity index 98%
rename from FastRng/Float/Distributions/Uniform.cs
rename to FastRng/Distributions/Uniform.cs
index 8149f6e..0c9920b 100644
--- a/FastRng/Float/Distributions/Uniform.cs
+++ b/FastRng/Distributions/Uniform.cs
@@ -2,7 +2,7 @@ using System;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace FastRng.Float.Distributions
+namespace FastRng.Distributions
 {
     public sealed class Uniform : IDistribution
     {
diff --git a/FastRng/Float/Distributions/WeibullK05La1.cs b/FastRng/Distributions/WeibullK05La1.cs
similarity index 92%
rename from FastRng/Float/Distributions/WeibullK05La1.cs
rename to FastRng/Distributions/WeibullK05La1.cs
index 612e5f5..75a41ea 100644
--- a/FastRng/Float/Distributions/WeibullK05La1.cs
+++ b/FastRng/Distributions/WeibullK05La1.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace FastRng.Float.Distributions
+namespace FastRng.Distributions
 {
     public sealed class WeibullK05La1 : Distribution
     {
diff --git a/FastRng/FastRng.csproj b/FastRng/FastRng.csproj
index 7a6afc2..9e56609 100644
--- a/FastRng/FastRng.csproj
+++ b/FastRng/FastRng.csproj
@@ -21,4 +21,5 @@
       <DocumentationFile>bin\Release\ExaArray.xml</DocumentationFile>
     </PropertyGroup>
 
+
 </Project>
diff --git a/FastRng/Float/IRandom.cs b/FastRng/IRandom.cs
similarity index 92%
rename from FastRng/Float/IRandom.cs
rename to FastRng/IRandom.cs
index 893f170..265b8e6 100644
--- a/FastRng/Float/IRandom.cs
+++ b/FastRng/IRandom.cs
@@ -1,9 +1,8 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using FastRng.Float.Distributions;
 
-namespace FastRng.Float
+namespace FastRng
 {
     /// <summary>
     /// Interface for random number generators.
diff --git a/FastRng/Float/MathTools.cs b/FastRng/MathTools.cs
similarity index 99%
rename from FastRng/Float/MathTools.cs
rename to FastRng/MathTools.cs
index eb3e5ae..f94c891 100644
--- a/FastRng/Float/MathTools.cs
+++ b/FastRng/MathTools.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace FastRng.Float
+namespace FastRng
 {
     /// <summary>
     /// Provides some mathematical function, which are not available within in the .NET framework.
diff --git a/FastRng/Float/MultiThreadedRng.cs b/FastRng/MultiThreadedRng.cs
similarity index 99%
rename from FastRng/Float/MultiThreadedRng.cs
rename to FastRng/MultiThreadedRng.cs
index b6e9b1e..f2a76c5 100644
--- a/FastRng/Float/MultiThreadedRng.cs
+++ b/FastRng/MultiThreadedRng.cs
@@ -3,9 +3,8 @@ using System.Collections.Concurrent;
 using System.Diagnostics.CodeAnalysis;
 using System.Threading;
 using System.Threading.Tasks;
-using FastRng.Float.Distributions;
 
-namespace FastRng.Float
+namespace FastRng
 {
     /// <summary>
     /// A fast multi-threaded pseudo random number generator.
diff --git a/FastRng/Float/ShapeFitter.cs b/FastRng/ShapeFitter.cs
similarity index 97%
rename from FastRng/Float/ShapeFitter.cs
rename to FastRng/ShapeFitter.cs
index d17cedd..8c45da4 100644
--- a/FastRng/Float/ShapeFitter.cs
+++ b/FastRng/ShapeFitter.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
-using FastRng.Float.Distributions;
+using FastRng.Distributions;
 
-namespace FastRng.Float
+namespace FastRng
 {
     /// <summary>
     /// ShapeFitter is a rejection sampler, cf. https://en.wikipedia.org/wiki/Rejection_sampling
diff --git a/FastRngTests/Float/DecisionTester.cs b/FastRngTests/DecisionTester.cs
similarity index 89%
rename from FastRngTests/Float/DecisionTester.cs
rename to FastRngTests/DecisionTester.cs
index 88001b5..cddccf4 100644
--- a/FastRngTests/Float/DecisionTester.cs
+++ b/FastRngTests/DecisionTester.cs
@@ -1,14 +1,12 @@
-using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Threading.Tasks;
-using FastRng.Float;
-using FastRng.Float.Distributions;
-using FastRngTests.Float.Distributions;
+using FastRng;
 using NUnit.Framework;
-using Uniform = FastRng.Float.Distributions.Uniform;
+using Uniform = FastRng.Distributions.Uniform;
+using WeibullK05La1 = FastRng.Distributions.WeibullK05La1;
 
-namespace FastRngTests.Float
+namespace FastRngTests
 {
     [ExcludeFromCodeCoverage]
     public class DecisionTester
@@ -43,7 +41,7 @@ namespace FastRngTests.Float
         public async Task DecisionWeibull01()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.WeibullK05La1(rng);
+            var dist = new WeibullK05La1(rng);
 
             var neededCoinTossesA = 0;
             var neededCoinTossesB = 0;
diff --git a/FastRngTests/Float/Distributions/BetaA2B2.cs b/FastRngTests/Distributions/BetaA2B2.cs
similarity index 89%
rename from FastRngTests/Float/Distributions/BetaA2B2.cs
rename to FastRngTests/Distributions/BetaA2B2.cs
index 44ec472..28d8e9f 100644
--- a/FastRngTests/Float/Distributions/BetaA2B2.cs
+++ b/FastRngTests/Distributions/BetaA2B2.cs
@@ -2,10 +2,10 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Threading.Tasks;
-using FastRng.Float;
+using FastRng;
 using NUnit.Framework;
 
-namespace FastRngTests.Float.Distributions
+namespace FastRngTests.Distributions
 {
     [ExcludeFromCodeCoverage]
     public class BetaA2B2
@@ -16,8 +16,8 @@ namespace FastRngTests.Float.Distributions
         public async Task TestBetaDistribution01()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.BetaA2B2(rng);
-            var fqa = new Float.FrequencyAnalysis();
+            var dist = new FastRng.Distributions.BetaA2B2(rng);
+            var fqa = new FrequencyAnalysis();
 
             for (var n = 0; n < 100_000; n++)
                 fqa.CountThis(await dist.NextNumber());
@@ -50,7 +50,7 @@ namespace FastRngTests.Float.Distributions
         {
             using var rng = new MultiThreadedRng();
             var samples = new float[1_000];
-            var dist = new FastRng.Float.Distributions.BetaA2B2(rng);
+            var dist = new FastRng.Distributions.BetaA2B2(rng);
             for (var n = 0; n < samples.Length; n++)
                 samples[n] = await dist.NextNumber(-1.0f, 1.0f);
 
@@ -65,7 +65,7 @@ namespace FastRngTests.Float.Distributions
         {
             using var rng = new MultiThreadedRng();
             var samples = new float[1_000];
-            var dist = new FastRng.Float.Distributions.BetaA2B2(rng);
+            var dist = new FastRng.Distributions.BetaA2B2(rng);
             for (var n = 0; n < samples.Length; n++)
                 samples[n] = await dist.NextNumber(0.0f, 1.0f);
             
@@ -78,7 +78,7 @@ namespace FastRngTests.Float.Distributions
         [Category(TestCategories.NORMAL)]
         public void NoRandomNumberGenerator01()
         {
-            Assert.Throws<ArgumentNullException>(() => new FastRng.Float.Distributions.BetaA2B2(null));
+            Assert.Throws<ArgumentNullException>(() => new FastRng.Distributions.BetaA2B2(null));
         }
     }
 }
\ No newline at end of file
diff --git a/FastRngTests/Float/Distributions/BetaA2B5.cs b/FastRngTests/Distributions/BetaA2B5.cs
similarity index 89%
rename from FastRngTests/Float/Distributions/BetaA2B5.cs
rename to FastRngTests/Distributions/BetaA2B5.cs
index b88bba0..bf681c9 100644
--- a/FastRngTests/Float/Distributions/BetaA2B5.cs
+++ b/FastRngTests/Distributions/BetaA2B5.cs
@@ -2,10 +2,10 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Threading.Tasks;
-using FastRng.Float;
+using FastRng;
 using NUnit.Framework;
 
-namespace FastRngTests.Float.Distributions
+namespace FastRngTests.Distributions
 {
     [ExcludeFromCodeCoverage]
     public class BetaA2B5
@@ -16,8 +16,8 @@ namespace FastRngTests.Float.Distributions
         public async Task TestBetaDistribution01()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.BetaA2B5(rng);
-            var fqa = new Float.FrequencyAnalysis();
+            var dist = new FastRng.Distributions.BetaA2B5(rng);
+            var fqa = new FrequencyAnalysis();
 
             for (var n = 0; n < 100_000; n++)
                 fqa.CountThis(await dist.NextNumber());
@@ -50,7 +50,7 @@ namespace FastRngTests.Float.Distributions
         {
             using var rng = new MultiThreadedRng();
             var samples = new float[1_000];
-            var dist = new FastRng.Float.Distributions.BetaA2B5(rng);
+            var dist = new FastRng.Distributions.BetaA2B5(rng);
             for (var n = 0; n < samples.Length; n++)
                 samples[n] = await dist.NextNumber(-1.0f, 1.0f);
 
@@ -65,7 +65,7 @@ namespace FastRngTests.Float.Distributions
         {
             using var rng = new MultiThreadedRng();
             var samples = new float[1_000];
-            var dist = new FastRng.Float.Distributions.BetaA2B5(rng);
+            var dist = new FastRng.Distributions.BetaA2B5(rng);
             for (var n = 0; n < samples.Length; n++)
                 samples[n] = await dist.NextNumber(0.0f, 1.0f);
             
@@ -78,7 +78,7 @@ namespace FastRngTests.Float.Distributions
         [Category(TestCategories.NORMAL)]
         public void NoRandomNumberGenerator01()
         {
-            Assert.Throws<ArgumentNullException>(() => new FastRng.Float.Distributions.BetaA2B5(null));
+            Assert.Throws<ArgumentNullException>(() => new FastRng.Distributions.BetaA2B5(null));
         }
     }
 }
\ No newline at end of file
diff --git a/FastRngTests/Float/Distributions/BetaA5B2.cs b/FastRngTests/Distributions/BetaA5B2.cs
similarity index 90%
rename from FastRngTests/Float/Distributions/BetaA5B2.cs
rename to FastRngTests/Distributions/BetaA5B2.cs
index 306c504..3bfe6fc 100644
--- a/FastRngTests/Float/Distributions/BetaA5B2.cs
+++ b/FastRngTests/Distributions/BetaA5B2.cs
@@ -2,10 +2,10 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Threading.Tasks;
-using FastRng.Float;
+using FastRng;
 using NUnit.Framework;
 
-namespace FastRngTests.Float.Distributions
+namespace FastRngTests.Distributions
 {
     [ExcludeFromCodeCoverage]
     public class BetaA5B2
@@ -16,7 +16,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestBetaDistribution01()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.BetaA5B2(rng);
+            var dist = new FastRng.Distributions.BetaA5B2(rng);
             var fqa = new FrequencyAnalysis();
 
             for (var n = 0; n < 100_000; n++)
@@ -50,7 +50,7 @@ namespace FastRngTests.Float.Distributions
         {
             using var rng = new MultiThreadedRng();
             var samples = new float[1_000];
-            var dist = new FastRng.Float.Distributions.BetaA5B2(rng);
+            var dist = new FastRng.Distributions.BetaA5B2(rng);
             for (var n = 0; n < samples.Length; n++)
                 samples[n] = await dist.NextNumber(-1.0f, 1.0f);
 
@@ -65,7 +65,7 @@ namespace FastRngTests.Float.Distributions
         {
             using var rng = new MultiThreadedRng();
             var samples = new float[1_000];
-            var dist = new FastRng.Float.Distributions.BetaA5B2(rng);
+            var dist = new FastRng.Distributions.BetaA5B2(rng);
             for (var n = 0; n < samples.Length; n++)
                 samples[n] = await dist.NextNumber(0.0f, 1.0f);
             
@@ -78,7 +78,7 @@ namespace FastRngTests.Float.Distributions
         [Category(TestCategories.NORMAL)]
         public void NoRandomNumberGenerator01()
         {
-            Assert.Throws<ArgumentNullException>(() => new FastRng.Float.Distributions.BetaA5B2(null));
+            Assert.Throws<ArgumentNullException>(() => new FastRng.Distributions.BetaA5B2(null));
         }
     }
 }
\ No newline at end of file
diff --git a/FastRngTests/Float/Distributions/CauchyLorentzX0.cs b/FastRngTests/Distributions/CauchyLorentzX0.cs
similarity index 90%
rename from FastRngTests/Float/Distributions/CauchyLorentzX0.cs
rename to FastRngTests/Distributions/CauchyLorentzX0.cs
index 0b0d2b6..daf47a3 100644
--- a/FastRngTests/Float/Distributions/CauchyLorentzX0.cs
+++ b/FastRngTests/Distributions/CauchyLorentzX0.cs
@@ -2,10 +2,10 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Threading.Tasks;
-using FastRng.Float;
+using FastRng;
 using NUnit.Framework;
 
-namespace FastRngTests.Float.Distributions
+namespace FastRngTests.Distributions
 {
     [ExcludeFromCodeCoverage]
     public class CauchyLorentzX0
@@ -19,7 +19,7 @@ namespace FastRngTests.Float.Distributions
             // cf. https://en.wikipedia.org/wiki/Cauchy_distribution#Explanation_of_undefined_moments
             
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.CauchyLorentzX0(rng);
+            var dist = new FastRng.Distributions.CauchyLorentzX0(rng);
             var fqa = new FrequencyAnalysis();
 
             for (var n = 0; n < 100_000; n++)
@@ -52,7 +52,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestCauchyGeneratorWithRange01()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.CauchyLorentzX0(rng);
+            var dist = new FastRng.Distributions.CauchyLorentzX0(rng);
             var samples = new float[1_000];
             for (var n = 0; n < samples.Length; n++)
                 samples[n] = await dist.NextNumber(-1.0f, 1.0f);
@@ -67,7 +67,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestCauchyGeneratorWithRange02()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.CauchyLorentzX0(rng);
+            var dist = new FastRng.Distributions.CauchyLorentzX0(rng);
             var samples = new float[1_000];
             for (var n = 0; n < samples.Length; n++)
                 samples[n] = await dist.NextNumber(0.0f, 1.0f);
@@ -81,7 +81,7 @@ namespace FastRngTests.Float.Distributions
         [Category(TestCategories.NORMAL)]
         public void NoRandomNumberGenerator01()
         {
-            Assert.Throws<ArgumentNullException>(() => new FastRng.Float.Distributions.CauchyLorentzX0(null));
+            Assert.Throws<ArgumentNullException>(() => new FastRng.Distributions.CauchyLorentzX0(null));
         }
     }
 }
\ No newline at end of file
diff --git a/FastRngTests/Float/Distributions/CauchyLorentzX1.cs b/FastRngTests/Distributions/CauchyLorentzX1.cs
similarity index 90%
rename from FastRngTests/Float/Distributions/CauchyLorentzX1.cs
rename to FastRngTests/Distributions/CauchyLorentzX1.cs
index 70b63f3..6d92b05 100644
--- a/FastRngTests/Float/Distributions/CauchyLorentzX1.cs
+++ b/FastRngTests/Distributions/CauchyLorentzX1.cs
@@ -2,10 +2,10 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Threading.Tasks;
-using FastRng.Float;
+using FastRng;
 using NUnit.Framework;
 
-namespace FastRngTests.Float.Distributions
+namespace FastRngTests.Distributions
 {
     [ExcludeFromCodeCoverage]
     public class CauchyLorentzX1
@@ -19,7 +19,7 @@ namespace FastRngTests.Float.Distributions
             // cf. https://en.wikipedia.org/wiki/Cauchy_distribution#Explanation_of_undefined_moments
             
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.CauchyLorentzX1(rng);
+            var dist = new FastRng.Distributions.CauchyLorentzX1(rng);
             var fqa = new FrequencyAnalysis();
 
             for (var n = 0; n < 100_000; n++)
@@ -52,7 +52,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestCauchyGeneratorWithRange01()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.CauchyLorentzX0(rng);
+            var dist = new FastRng.Distributions.CauchyLorentzX0(rng);
             var samples = new float[1_000];
             for (var n = 0; n < samples.Length; n++)
                 samples[n] = await dist.NextNumber(-1.0f, 1.0f);
@@ -67,7 +67,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestCauchyGeneratorWithRange02()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.CauchyLorentzX0(rng);
+            var dist = new FastRng.Distributions.CauchyLorentzX0(rng);
             var samples = new float[1_000];
             for (var n = 0; n < samples.Length; n++)
                 samples[n] = await dist.NextNumber(0.0f, 1.0f);
@@ -81,7 +81,7 @@ namespace FastRngTests.Float.Distributions
         [Category(TestCategories.NORMAL)]
         public void NoRandomNumberGenerator01()
         {
-            Assert.Throws<ArgumentNullException>(() => new FastRng.Float.Distributions.CauchyLorentzX1(null));
+            Assert.Throws<ArgumentNullException>(() => new FastRng.Distributions.CauchyLorentzX1(null));
         }
     }
 }
\ No newline at end of file
diff --git a/FastRngTests/Float/Distributions/ChiSquareK1.cs b/FastRngTests/Distributions/ChiSquareK1.cs
similarity index 90%
rename from FastRngTests/Float/Distributions/ChiSquareK1.cs
rename to FastRngTests/Distributions/ChiSquareK1.cs
index d29d32b..24c89e6 100644
--- a/FastRngTests/Float/Distributions/ChiSquareK1.cs
+++ b/FastRngTests/Distributions/ChiSquareK1.cs
@@ -2,10 +2,10 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Threading.Tasks;
-using FastRng.Float;
+using FastRng;
 using NUnit.Framework;
 
-namespace FastRngTests.Float.Distributions
+namespace FastRngTests.Distributions
 {
     [ExcludeFromCodeCoverage]
     public class ChiSquareK1
@@ -16,7 +16,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestChiSquareDistribution01()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.ChiSquareK1(rng);
+            var dist = new FastRng.Distributions.ChiSquareK1(rng);
             var fqa = new FrequencyAnalysis();
 
             for (var n = 0; n < 100_000; n++)
@@ -52,7 +52,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestChiSquareGeneratorWithRange01()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.ChiSquareK1(rng);
+            var dist = new FastRng.Distributions.ChiSquareK1(rng);
             var samples = new float[1_000];
             for (var n = 0; n < samples.Length; n++)
                 samples[n] = await dist.NextNumber(-1.0f, 1.0f);
@@ -67,7 +67,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestChiSquareGeneratorWithRange02()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.ChiSquareK1(rng);
+            var dist = new FastRng.Distributions.ChiSquareK1(rng);
             var samples = new float[1_000];
             for (var n = 0; n < samples.Length; n++)
                 samples[n] = await dist.NextNumber(0.0f, 1.0f);
@@ -81,7 +81,7 @@ namespace FastRngTests.Float.Distributions
         [Category(TestCategories.NORMAL)]
         public void NoRandomNumberGenerator01()
         {
-            Assert.Throws<ArgumentNullException>(() => new FastRng.Float.Distributions.ChiSquareK1(null));
+            Assert.Throws<ArgumentNullException>(() => new FastRng.Distributions.ChiSquareK1(null));
         }
     }
 }
\ No newline at end of file
diff --git a/FastRngTests/Float/Distributions/ChiSquareK10.cs b/FastRngTests/Distributions/ChiSquareK10.cs
similarity index 90%
rename from FastRngTests/Float/Distributions/ChiSquareK10.cs
rename to FastRngTests/Distributions/ChiSquareK10.cs
index 304ca89..c7961fe 100644
--- a/FastRngTests/Float/Distributions/ChiSquareK10.cs
+++ b/FastRngTests/Distributions/ChiSquareK10.cs
@@ -2,10 +2,10 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Threading.Tasks;
-using FastRng.Float;
+using FastRng;
 using NUnit.Framework;
 
-namespace FastRngTests.Float.Distributions
+namespace FastRngTests.Distributions
 {
     [ExcludeFromCodeCoverage]
     public class ChiSquareK10
@@ -16,7 +16,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestChiSquareDistribution01()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.ChiSquareK10(rng);
+            var dist = new FastRng.Distributions.ChiSquareK10(rng);
             var fqa = new FrequencyAnalysis();
 
             for (var n = 0; n < 100_000; n++)
@@ -52,7 +52,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestChiSquareGeneratorWithRange01()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.ChiSquareK10(rng);
+            var dist = new FastRng.Distributions.ChiSquareK10(rng);
             var samples = new float[1_000];
             for (var n = 0; n < samples.Length; n++)
                 samples[n] = await dist.NextNumber(-1.0f, 1.0f);
@@ -67,7 +67,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestChiSquareGeneratorWithRange02()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.ChiSquareK10(rng);
+            var dist = new FastRng.Distributions.ChiSquareK10(rng);
             var samples = new float[1_000];
             for (var n = 0; n < samples.Length; n++)
                 samples[n] = await dist.NextNumber(0.0f, 1.0f);
@@ -81,7 +81,7 @@ namespace FastRngTests.Float.Distributions
         [Category(TestCategories.NORMAL)]
         public void NoRandomNumberGenerator01()
         {
-            Assert.Throws<ArgumentNullException>(() => new FastRng.Float.Distributions.ChiSquareK10(null));
+            Assert.Throws<ArgumentNullException>(() => new FastRng.Distributions.ChiSquareK10(null));
         }
     }
 }
\ No newline at end of file
diff --git a/FastRngTests/Float/Distributions/ChiSquareK4.cs b/FastRngTests/Distributions/ChiSquareK4.cs
similarity index 90%
rename from FastRngTests/Float/Distributions/ChiSquareK4.cs
rename to FastRngTests/Distributions/ChiSquareK4.cs
index 05ae266..ca68aba 100644
--- a/FastRngTests/Float/Distributions/ChiSquareK4.cs
+++ b/FastRngTests/Distributions/ChiSquareK4.cs
@@ -2,10 +2,10 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Threading.Tasks;
-using FastRng.Float;
+using FastRng;
 using NUnit.Framework;
 
-namespace FastRngTests.Float.Distributions
+namespace FastRngTests.Distributions
 {
     [ExcludeFromCodeCoverage]
     public class ChiSquareK4
@@ -16,7 +16,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestChiSquareDistribution01()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.ChiSquareK4(rng);
+            var dist = new FastRng.Distributions.ChiSquareK4(rng);
             var fqa = new FrequencyAnalysis();
 
             for (var n = 0; n < 100_000; n++)
@@ -49,7 +49,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestChiSquareGeneratorWithRange01()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.ChiSquareK4(rng);
+            var dist = new FastRng.Distributions.ChiSquareK4(rng);
             var samples = new float[1_000];
             for (var n = 0; n < samples.Length; n++)
                 samples[n] = await dist.NextNumber(-1.0f, 1.0f);
@@ -64,7 +64,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestChiSquareGeneratorWithRange02()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.ChiSquareK4(rng);
+            var dist = new FastRng.Distributions.ChiSquareK4(rng);
             var samples = new float[1_000];
             for (var n = 0; n < samples.Length; n++)
                 samples[n] = await dist.NextNumber(0.0f, 1.0f);
@@ -78,7 +78,7 @@ namespace FastRngTests.Float.Distributions
         [Category(TestCategories.NORMAL)]
         public void NoRandomNumberGenerator01()
         {
-            Assert.Throws<ArgumentNullException>(() => new FastRng.Float.Distributions.ChiSquareK4(null));
+            Assert.Throws<ArgumentNullException>(() => new FastRng.Distributions.ChiSquareK4(null));
         }
     }
 }
\ No newline at end of file
diff --git a/FastRngTests/Float/Distributions/ExponentialLa10.cs b/FastRngTests/Distributions/ExponentialLa10.cs
similarity index 90%
rename from FastRngTests/Float/Distributions/ExponentialLa10.cs
rename to FastRngTests/Distributions/ExponentialLa10.cs
index 919cf44..06fd9e4 100644
--- a/FastRngTests/Float/Distributions/ExponentialLa10.cs
+++ b/FastRngTests/Distributions/ExponentialLa10.cs
@@ -2,10 +2,10 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Threading.Tasks;
-using FastRng.Float;
+using FastRng;
 using NUnit.Framework;
 
-namespace FastRngTests.Float.Distributions
+namespace FastRngTests.Distributions
 {
     [ExcludeFromCodeCoverage]
     public class ExponentialLa10
@@ -16,7 +16,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestExponentialDistribution01()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.ExponentialLa10(rng);
+            var dist = new FastRng.Distributions.ExponentialLa10(rng);
             var fqa = new FrequencyAnalysis();
             
             for (var n = 0; n < 100_000; n++)
@@ -49,7 +49,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestExponentialGeneratorWithRange01()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.ExponentialLa10(rng);
+            var dist = new FastRng.Distributions.ExponentialLa10(rng);
             var samples = new float[1_000];
             for (var n = 0; n < samples.Length; n++)
                 samples[n] = await dist.NextNumber(-1.0f, 1.0f);
@@ -64,7 +64,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestExponentialGeneratorWithRange02()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.ExponentialLa10(rng);
+            var dist = new FastRng.Distributions.ExponentialLa10(rng);
             var samples = new float[1_000];
             for (var n = 0; n < samples.Length; n++)
                 samples[n] = await dist.NextNumber(0.0f, 1.0f);
@@ -78,7 +78,7 @@ namespace FastRngTests.Float.Distributions
         [Category(TestCategories.NORMAL)]
         public void NoRandomNumberGenerator01()
         {
-            Assert.Throws<ArgumentNullException>(() => new FastRng.Float.Distributions.ExponentialLa10(null));
+            Assert.Throws<ArgumentNullException>(() => new FastRng.Distributions.ExponentialLa10(null));
         }
     }
 }
\ No newline at end of file
diff --git a/FastRngTests/Float/Distributions/ExponentialLa5.cs b/FastRngTests/Distributions/ExponentialLa5.cs
similarity index 90%
rename from FastRngTests/Float/Distributions/ExponentialLa5.cs
rename to FastRngTests/Distributions/ExponentialLa5.cs
index ad4b41b..f325605 100644
--- a/FastRngTests/Float/Distributions/ExponentialLa5.cs
+++ b/FastRngTests/Distributions/ExponentialLa5.cs
@@ -2,10 +2,10 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Threading.Tasks;
-using FastRng.Float;
+using FastRng;
 using NUnit.Framework;
 
-namespace FastRngTests.Float.Distributions
+namespace FastRngTests.Distributions
 {
     [ExcludeFromCodeCoverage]
     public class ExponentialLa5
@@ -16,7 +16,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestExponentialDistribution01()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.ExponentialLa5(rng);
+            var dist = new FastRng.Distributions.ExponentialLa5(rng);
             var fqa = new FrequencyAnalysis();
 
             for (var n = 0; n < 100_000; n++)
@@ -49,7 +49,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestExponentialGeneratorWithRange01()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.ExponentialLa5(rng);
+            var dist = new FastRng.Distributions.ExponentialLa5(rng);
             var samples = new float[1_000];
             for (var n = 0; n < samples.Length; n++)
                 samples[n] = await dist.NextNumber(-1.0f, 1.0f);
@@ -64,7 +64,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestExponentialGeneratorWithRange02()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.ExponentialLa5(rng);
+            var dist = new FastRng.Distributions.ExponentialLa5(rng);
             var samples = new float[1_000];
             for (var n = 0; n < samples.Length; n++)
                 samples[n] = await dist.NextNumber(0.0f, 1.0f);
@@ -78,7 +78,7 @@ namespace FastRngTests.Float.Distributions
         [Category(TestCategories.NORMAL)]
         public void NoRandomNumberGenerator01()
         {
-            Assert.Throws<ArgumentNullException>(() => new FastRng.Float.Distributions.ExponentialLa5(null));
+            Assert.Throws<ArgumentNullException>(() => new FastRng.Distributions.ExponentialLa5(null));
         }
     }
 }
\ No newline at end of file
diff --git a/FastRngTests/Float/Distributions/GammaA5B15.cs b/FastRngTests/Distributions/GammaA5B15.cs
similarity index 90%
rename from FastRngTests/Float/Distributions/GammaA5B15.cs
rename to FastRngTests/Distributions/GammaA5B15.cs
index 76e536a..9fee43c 100644
--- a/FastRngTests/Float/Distributions/GammaA5B15.cs
+++ b/FastRngTests/Distributions/GammaA5B15.cs
@@ -2,10 +2,10 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Threading.Tasks;
-using FastRng.Float;
+using FastRng;
 using NUnit.Framework;
 
-namespace FastRngTests.Float.Distributions
+namespace FastRngTests.Distributions
 {
     [ExcludeFromCodeCoverage]
     public class GammaA5B15
@@ -16,7 +16,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestGammaDistribution01()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.GammaA5B15(rng);
+            var dist = new FastRng.Distributions.GammaA5B15(rng);
             var fra = new FrequencyAnalysis();
             
             for (var n = 0; n < 100_000; n++)
@@ -49,7 +49,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestGammaGeneratorWithRange01()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.GammaA5B15(rng);
+            var dist = new FastRng.Distributions.GammaA5B15(rng);
             var samples = new float[1_000];
             for (var n = 0; n < samples.Length; n++)
                 samples[n] = await dist.NextNumber(-1.0f, 1.0f);
@@ -64,7 +64,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestGammaGeneratorWithRange02()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.GammaA5B15(rng);
+            var dist = new FastRng.Distributions.GammaA5B15(rng);
             var samples = new float[1_000];
             for (var n = 0; n < samples.Length; n++)
                 samples[n] = await dist.NextNumber(0.0f, 1.0f);
@@ -78,7 +78,7 @@ namespace FastRngTests.Float.Distributions
         [Category(TestCategories.NORMAL)]
         public void NoRandomNumberGenerator01()
         {
-            Assert.Throws<ArgumentNullException>(() => new FastRng.Float.Distributions.GammaA5B15(null));
+            Assert.Throws<ArgumentNullException>(() => new FastRng.Distributions.GammaA5B15(null));
         }
     }
 }
\ No newline at end of file
diff --git a/FastRngTests/Float/Distributions/InverseExponentialLa10.cs b/FastRngTests/Distributions/InverseExponentialLa10.cs
similarity index 89%
rename from FastRngTests/Float/Distributions/InverseExponentialLa10.cs
rename to FastRngTests/Distributions/InverseExponentialLa10.cs
index b6ac2d5..dc7c7ed 100644
--- a/FastRngTests/Float/Distributions/InverseExponentialLa10.cs
+++ b/FastRngTests/Distributions/InverseExponentialLa10.cs
@@ -2,10 +2,10 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Threading.Tasks;
-using FastRng.Float;
+using FastRng;
 using NUnit.Framework;
 
-namespace FastRngTests.Float.Distributions
+namespace FastRngTests.Distributions
 {
     [ExcludeFromCodeCoverage]
     public class InverseExponentialLa10
@@ -16,7 +16,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestExponentialDistribution01()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.InverseExponentialLa10(rng);
+            var dist = new FastRng.Distributions.InverseExponentialLa10(rng);
             var fqa = new FrequencyAnalysis();
             
             for (var n = 0; n < 100_000; n++)
@@ -49,7 +49,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestExponentialGeneratorWithRange01()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.InverseExponentialLa10(rng);
+            var dist = new FastRng.Distributions.InverseExponentialLa10(rng);
             var samples = new float[1_000];
             for (var n = 0; n < samples.Length; n++)
                 samples[n] = await dist.NextNumber(-1.0f, 1.0f);
@@ -64,7 +64,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestExponentialGeneratorWithRange02()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.InverseExponentialLa10(rng);
+            var dist = new FastRng.Distributions.InverseExponentialLa10(rng);
             var samples = new float[1_000];
             for (var n = 0; n < samples.Length; n++)
                 samples[n] = await dist.NextNumber(0.0f, 1.0f);
@@ -78,7 +78,7 @@ namespace FastRngTests.Float.Distributions
         [Category(TestCategories.NORMAL)]
         public void NoRandomNumberGenerator01()
         {
-            Assert.Throws<ArgumentNullException>(() => new FastRng.Float.Distributions.InverseExponentialLa10(null));
+            Assert.Throws<ArgumentNullException>(() => new FastRng.Distributions.InverseExponentialLa10(null));
         }
     }
 }
\ No newline at end of file
diff --git a/FastRngTests/Float/Distributions/InverseExponentialLa5.cs b/FastRngTests/Distributions/InverseExponentialLa5.cs
similarity index 89%
rename from FastRngTests/Float/Distributions/InverseExponentialLa5.cs
rename to FastRngTests/Distributions/InverseExponentialLa5.cs
index cb464e6..fec7db4 100644
--- a/FastRngTests/Float/Distributions/InverseExponentialLa5.cs
+++ b/FastRngTests/Distributions/InverseExponentialLa5.cs
@@ -2,10 +2,10 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Threading.Tasks;
-using FastRng.Float;
+using FastRng;
 using NUnit.Framework;
 
-namespace FastRngTests.Float.Distributions
+namespace FastRngTests.Distributions
 {
     [ExcludeFromCodeCoverage]
     public class InverseExponentialLa5
@@ -16,7 +16,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestExponentialDistribution01()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.InverseExponentialLa5(rng);
+            var dist = new FastRng.Distributions.InverseExponentialLa5(rng);
             var fqa = new FrequencyAnalysis();
             
             for (var n = 0; n < 100_000; n++)
@@ -49,7 +49,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestExponentialGeneratorWithRange01()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.InverseExponentialLa5(rng);
+            var dist = new FastRng.Distributions.InverseExponentialLa5(rng);
             var samples = new float[1_000];
             for (var n = 0; n < samples.Length; n++)
                 samples[n] = await dist.NextNumber(-1.0f, 1.0f);
@@ -64,7 +64,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestExponentialGeneratorWithRange02()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.InverseExponentialLa5(rng);
+            var dist = new FastRng.Distributions.InverseExponentialLa5(rng);
             var samples = new float[1_000];
             for (var n = 0; n < samples.Length; n++)
                 samples[n] = await dist.NextNumber(0.0f, 1.0f);
@@ -78,7 +78,7 @@ namespace FastRngTests.Float.Distributions
         [Category(TestCategories.NORMAL)]
         public void NoRandomNumberGenerator01()
         {
-            Assert.Throws<ArgumentNullException>(() => new FastRng.Float.Distributions.InverseExponentialLa5(null));
+            Assert.Throws<ArgumentNullException>(() => new FastRng.Distributions.InverseExponentialLa5(null));
         }
     }
 }
\ No newline at end of file
diff --git a/FastRngTests/Float/Distributions/InverseGammaA3B05.cs b/FastRngTests/Distributions/InverseGammaA3B05.cs
similarity index 90%
rename from FastRngTests/Float/Distributions/InverseGammaA3B05.cs
rename to FastRngTests/Distributions/InverseGammaA3B05.cs
index 5bdcba9..b3667da 100644
--- a/FastRngTests/Float/Distributions/InverseGammaA3B05.cs
+++ b/FastRngTests/Distributions/InverseGammaA3B05.cs
@@ -2,10 +2,10 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Threading.Tasks;
-using FastRng.Float;
+using FastRng;
 using NUnit.Framework;
 
-namespace FastRngTests.Float.Distributions
+namespace FastRngTests.Distributions
 {
     [ExcludeFromCodeCoverage]
     public class InverseGammaA3B05
@@ -16,7 +16,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestInverseGammaDistribution01()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.InverseGammaA3B05(rng);
+            var dist = new FastRng.Distributions.InverseGammaA3B05(rng);
             var fra = new FrequencyAnalysis();
             
             for (var n = 0; n < 100_000; n++)
@@ -49,7 +49,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestInverseGammaGeneratorWithRange01()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.InverseGammaA3B05(rng);
+            var dist = new FastRng.Distributions.InverseGammaA3B05(rng);
             var samples = new float[1_000];
             for (var n = 0; n < samples.Length; n++)
                 samples[n] = await dist.NextNumber(-1.0f, 1.0f);
@@ -64,7 +64,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestInverseGammaGeneratorWithRange02()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.InverseGammaA3B05(rng);
+            var dist = new FastRng.Distributions.InverseGammaA3B05(rng);
             var samples = new float[1_000];
             for (var n = 0; n < samples.Length; n++)
                 samples[n] = await dist.NextNumber(0.0f, 1.0f);
@@ -78,7 +78,7 @@ namespace FastRngTests.Float.Distributions
         [Category(TestCategories.NORMAL)]
         public void NoRandomNumberGenerator01()
         {
-            Assert.Throws<ArgumentNullException>(() => new FastRng.Float.Distributions.InverseGammaA3B05(null));
+            Assert.Throws<ArgumentNullException>(() => new FastRng.Distributions.InverseGammaA3B05(null));
         }
     }
 }
\ No newline at end of file
diff --git a/FastRngTests/Float/Distributions/LaplaceB01M0.cs b/FastRngTests/Distributions/LaplaceB01M0.cs
similarity index 90%
rename from FastRngTests/Float/Distributions/LaplaceB01M0.cs
rename to FastRngTests/Distributions/LaplaceB01M0.cs
index c08295a..5629338 100644
--- a/FastRngTests/Float/Distributions/LaplaceB01M0.cs
+++ b/FastRngTests/Distributions/LaplaceB01M0.cs
@@ -2,10 +2,10 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Threading.Tasks;
-using FastRng.Float;
+using FastRng;
 using NUnit.Framework;
 
-namespace FastRngTests.Float.Distributions
+namespace FastRngTests.Distributions
 {
     [ExcludeFromCodeCoverage]
     public class LaplaceB01M0
@@ -16,7 +16,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestLaplaceDistribution01()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.LaplaceB01M0(rng);
+            var dist = new FastRng.Distributions.LaplaceB01M0(rng);
             var fra = new FrequencyAnalysis();
             
             for (var n = 0; n < 100_000; n++)
@@ -49,7 +49,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestLaplaceGeneratorWithRange01()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.LaplaceB01M0(rng);
+            var dist = new FastRng.Distributions.LaplaceB01M0(rng);
             var samples = new float[1_000];
             for (var n = 0; n < samples.Length; n++)
                 samples[n] = await dist.NextNumber(-1.0f, 1.0f);
@@ -64,7 +64,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestLaplaceGeneratorWithRange02()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.LaplaceB01M0(rng);
+            var dist = new FastRng.Distributions.LaplaceB01M0(rng);
             var samples = new float[1_000];
             for (var n = 0; n < samples.Length; n++)
                 samples[n] = await dist.NextNumber(0.0f, 1.0f);
@@ -78,7 +78,7 @@ namespace FastRngTests.Float.Distributions
         [Category(TestCategories.NORMAL)]
         public void NoRandomNumberGenerator01()
         {
-            Assert.Throws<ArgumentNullException>(() => new FastRng.Float.Distributions.LaplaceB01M0(null));
+            Assert.Throws<ArgumentNullException>(() => new FastRng.Distributions.LaplaceB01M0(null));
         }
     }
 }
\ No newline at end of file
diff --git a/FastRngTests/Float/Distributions/LaplaceB01M05.cs b/FastRngTests/Distributions/LaplaceB01M05.cs
similarity index 90%
rename from FastRngTests/Float/Distributions/LaplaceB01M05.cs
rename to FastRngTests/Distributions/LaplaceB01M05.cs
index 50ca09e..0acfdde 100644
--- a/FastRngTests/Float/Distributions/LaplaceB01M05.cs
+++ b/FastRngTests/Distributions/LaplaceB01M05.cs
@@ -2,10 +2,10 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Threading.Tasks;
-using FastRng.Float;
+using FastRng;
 using NUnit.Framework;
 
-namespace FastRngTests.Float.Distributions
+namespace FastRngTests.Distributions
 {
     [ExcludeFromCodeCoverage]
     public class LaplaceB01M05
@@ -16,7 +16,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestLaplaceDistribution01()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.LaplaceB01M05(rng);
+            var dist = new FastRng.Distributions.LaplaceB01M05(rng);
             var fra = new FrequencyAnalysis();
             
             for (var n = 0; n < 100_000; n++)
@@ -49,7 +49,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestLaplaceGeneratorWithRange01()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.LaplaceB01M05(rng);
+            var dist = new FastRng.Distributions.LaplaceB01M05(rng);
             var samples = new float[1_000];
             for (var n = 0; n < samples.Length; n++)
                 samples[n] = await dist.NextNumber(-1.0f, 1.0f);
@@ -64,7 +64,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestLaplaceGeneratorWithRange02()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.LaplaceB01M05(rng);
+            var dist = new FastRng.Distributions.LaplaceB01M05(rng);
             var samples = new float[1_000];
             for (var n = 0; n < samples.Length; n++)
                 samples[n] = await dist.NextNumber(0.0f, 1.0f);
@@ -78,7 +78,7 @@ namespace FastRngTests.Float.Distributions
         [Category(TestCategories.NORMAL)]
         public void NoRandomNumberGenerator01()
         {
-            Assert.Throws<ArgumentNullException>(() => new FastRng.Float.Distributions.LaplaceB01M05(null));
+            Assert.Throws<ArgumentNullException>(() => new FastRng.Distributions.LaplaceB01M05(null));
         }
     }
 }
\ No newline at end of file
diff --git a/FastRngTests/Float/Distributions/LogNormalS1M0.cs b/FastRngTests/Distributions/LogNormalS1M0.cs
similarity index 90%
rename from FastRngTests/Float/Distributions/LogNormalS1M0.cs
rename to FastRngTests/Distributions/LogNormalS1M0.cs
index c578a71..c47f506 100644
--- a/FastRngTests/Float/Distributions/LogNormalS1M0.cs
+++ b/FastRngTests/Distributions/LogNormalS1M0.cs
@@ -2,10 +2,10 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Threading.Tasks;
-using FastRng.Float;
+using FastRng;
 using NUnit.Framework;
 
-namespace FastRngTests.Float.Distributions
+namespace FastRngTests.Distributions
 {
     [ExcludeFromCodeCoverage]
     public class LogNormalS1M0
@@ -16,7 +16,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestLogNormalDistribution01()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.LogNormalS1M0(rng);
+            var dist = new FastRng.Distributions.LogNormalS1M0(rng);
             var fra = new FrequencyAnalysis();
             
             for (var n = 0; n < 100_000; n++)
@@ -49,7 +49,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestLogNormalGeneratorWithRange01()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.LogNormalS1M0(rng);
+            var dist = new FastRng.Distributions.LogNormalS1M0(rng);
             var samples = new float[1_000];
             for (var n = 0; n < samples.Length; n++)
                 samples[n] = await dist.NextNumber(-1.0f, 1.0f);
@@ -64,7 +64,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestLogNormalGeneratorWithRange02()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.LogNormalS1M0(rng);
+            var dist = new FastRng.Distributions.LogNormalS1M0(rng);
             var samples = new float[1_000];
             for (var n = 0; n < samples.Length; n++)
                 samples[n] = await dist.NextNumber(0.0f, 1.0f);
@@ -78,7 +78,7 @@ namespace FastRngTests.Float.Distributions
         [Category(TestCategories.NORMAL)]
         public void NoRandomNumberGenerator01()
         {
-            Assert.Throws<ArgumentNullException>(() => new FastRng.Float.Distributions.LogNormalS1M0(null));
+            Assert.Throws<ArgumentNullException>(() => new FastRng.Distributions.LogNormalS1M0(null));
         }
     }
 }
\ No newline at end of file
diff --git a/FastRngTests/Float/Distributions/NormalS02M05.cs b/FastRngTests/Distributions/NormalS02M05.cs
similarity index 89%
rename from FastRngTests/Float/Distributions/NormalS02M05.cs
rename to FastRngTests/Distributions/NormalS02M05.cs
index 75a0274..877c8ea 100644
--- a/FastRngTests/Float/Distributions/NormalS02M05.cs
+++ b/FastRngTests/Distributions/NormalS02M05.cs
@@ -2,10 +2,10 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Threading.Tasks;
-using FastRng.Float;
+using FastRng;
 using NUnit.Framework;
 
-namespace FastRngTests.Float.Distributions
+namespace FastRngTests.Distributions
 {
     [ExcludeFromCodeCoverage]
     public class NormalS02M05
@@ -19,7 +19,7 @@ namespace FastRngTests.Float.Distributions
             const float STANDARD_DEVIATION = 0.2f;
 
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.NormalS02M05(rng);
+            var dist = new FastRng.Distributions.NormalS02M05(rng);
             var stats = new RunningStatistics();
             var fra = new FrequencyAnalysis();
 
@@ -46,7 +46,7 @@ namespace FastRngTests.Float.Distributions
         {
             using var rng = new MultiThreadedRng();
             var samples = new float[1_000];
-            var dist = new FastRng.Float.Distributions.NormalS02M05(rng);
+            var dist = new FastRng.Distributions.NormalS02M05(rng);
             for (var n = 0; n < samples.Length; n++)
                 samples[n] = await dist.NextNumber(-1.0f, 1.0f);
             
@@ -61,7 +61,7 @@ namespace FastRngTests.Float.Distributions
         {
             using var rng = new MultiThreadedRng();
             var samples = new float[1_000];
-            var dist = new FastRng.Float.Distributions.NormalS02M05(rng);
+            var dist = new FastRng.Distributions.NormalS02M05(rng);
             for (var n = 0; n < samples.Length; n++)
                 samples[n] = await dist.NextNumber(0.0f, 1.0f);
             
@@ -74,7 +74,7 @@ namespace FastRngTests.Float.Distributions
         [Category(TestCategories.NORMAL)]
         public void NoRandomNumberGenerator01()
         {
-            Assert.Throws<ArgumentNullException>(() => new FastRng.Float.Distributions.NormalS02M05(null));
+            Assert.Throws<ArgumentNullException>(() => new FastRng.Distributions.NormalS02M05(null));
         }
     }
 }
\ No newline at end of file
diff --git a/FastRngTests/Float/Distributions/StudentTNu1.cs b/FastRngTests/Distributions/StudentTNu1.cs
similarity index 90%
rename from FastRngTests/Float/Distributions/StudentTNu1.cs
rename to FastRngTests/Distributions/StudentTNu1.cs
index 215add9..cfce282 100644
--- a/FastRngTests/Float/Distributions/StudentTNu1.cs
+++ b/FastRngTests/Distributions/StudentTNu1.cs
@@ -2,10 +2,10 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Threading.Tasks;
-using FastRng.Float;
+using FastRng;
 using NUnit.Framework;
 
-namespace FastRngTests.Float.Distributions
+namespace FastRngTests.Distributions
 {
     [ExcludeFromCodeCoverage]
     public class StudentTNu1
@@ -16,7 +16,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestStudentTDistribution01()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.StudentTNu1(rng);
+            var dist = new FastRng.Distributions.StudentTNu1(rng);
             var fra = new FrequencyAnalysis();
 
             for (var n = 0; n < 100_000; n++)
@@ -49,7 +49,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestStudentTGeneratorWithRange01()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.StudentTNu1(rng);
+            var dist = new FastRng.Distributions.StudentTNu1(rng);
             var samples = new float[1_000];
             for (var n = 0; n < samples.Length; n++)
                 samples[n] = await dist.NextNumber(-1.0f, 1.0f);
@@ -64,7 +64,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestStudentTGeneratorWithRange02()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.StudentTNu1(rng);
+            var dist = new FastRng.Distributions.StudentTNu1(rng);
             var samples = new float[1_000];
             for (var n = 0; n < samples.Length; n++)
                 samples[n] = await dist.NextNumber(0.0f, 1.0f);
@@ -78,7 +78,7 @@ namespace FastRngTests.Float.Distributions
         [Category(TestCategories.NORMAL)]
         public void NoRandomNumberGenerator01()
         {
-            Assert.Throws<ArgumentNullException>(() => new FastRng.Float.Distributions.StudentTNu1(null));
+            Assert.Throws<ArgumentNullException>(() => new FastRng.Distributions.StudentTNu1(null));
         }
     }
 }
\ No newline at end of file
diff --git a/FastRngTests/Float/Distributions/Uniform.cs b/FastRngTests/Distributions/Uniform.cs
similarity index 92%
rename from FastRngTests/Float/Distributions/Uniform.cs
rename to FastRngTests/Distributions/Uniform.cs
index 62a9cc1..4a603ea 100644
--- a/FastRngTests/Float/Distributions/Uniform.cs
+++ b/FastRngTests/Distributions/Uniform.cs
@@ -2,10 +2,10 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Threading.Tasks;
-using FastRng.Float;
+using FastRng;
 using NUnit.Framework;
 
-namespace FastRngTests.Float.Distributions
+namespace FastRngTests.Distributions
 {
     [ExcludeFromCodeCoverage]
     public class Uniform
@@ -117,7 +117,7 @@ namespace FastRngTests.Float.Distributions
         {
             using var rng = new MultiThreadedRng();
             var samples = new float[1_000];
-            var dist = new FastRng.Float.Distributions.Uniform(rng);
+            var dist = new FastRng.Distributions.Uniform(rng);
             for (var n = 0; n < samples.Length; n++)
                 samples[n] = await dist.NextNumber(-1.0f, 1.0f);
             
@@ -132,7 +132,7 @@ namespace FastRngTests.Float.Distributions
         {
             using var rng = new MultiThreadedRng();
             var samples = new float[1_000];
-            var dist = new FastRng.Float.Distributions.Uniform(rng);
+            var dist = new FastRng.Distributions.Uniform(rng);
             for (var n = 0; n < samples.Length; n++)
                 samples[n] = await dist.NextNumber(0.0f, 1.0f);
             
@@ -160,7 +160,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestRange05Uint()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.Uniform(rng);
+            var dist = new FastRng.Distributions.Uniform(rng);
             var distribution = new uint[101];
             var runs = 1_000_000;
             for (var n = 0; n < runs; n++)
@@ -176,7 +176,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestRange05Ulong()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.Uniform(rng);
+            var dist = new FastRng.Distributions.Uniform(rng);
             var distribution = new uint[101];
             var runs = 1_000_000;
             for (var n = 0; n < runs; n++)
@@ -192,7 +192,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestRange05Float()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.Uniform(rng);
+            var dist = new FastRng.Distributions.Uniform(rng);
             var distribution = new uint[101];
             var runs = 1_000_000;
             for (var n = 0; n < runs; n++)
@@ -207,7 +207,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestDistribution001Uint()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.Uniform(rng);
+            var dist = new FastRng.Distributions.Uniform(rng);
             var distribution = new uint[101];
             var runs = 1_000_000;
             for (var n = 0; n < runs; n++)
@@ -221,7 +221,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestDistribution001Ulong()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.Uniform(rng);
+            var dist = new FastRng.Distributions.Uniform(rng);
             var distribution = new uint[101];
             var runs = 1_000_000;
             for (var n = 0; n < runs; n++)
@@ -235,7 +235,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestDistribution001Float()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.Uniform(rng);
+            var dist = new FastRng.Distributions.Uniform(rng);
             var distribution = new uint[101];
             var runs = 1_000_000;
             for (var n = 0; n < runs; n++)
@@ -249,7 +249,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestDistribution002Uint()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.Uniform(rng);
+            var dist = new FastRng.Distributions.Uniform(rng);
             var distribution = new uint[101];
             var runs = 100_000_000;
             for (var n = 0; n < runs; n++)
@@ -263,7 +263,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestDistribution002Ulong()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.Uniform(rng);
+            var dist = new FastRng.Distributions.Uniform(rng);
             var distribution = new uint[101];
             var runs = 100_000_000;
             for (var n = 0; n < runs; n++)
@@ -277,7 +277,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestDistribution002Float()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.Uniform(rng);
+            var dist = new FastRng.Distributions.Uniform(rng);
             var distribution = new uint[101];
             var runs = 100_000_000;
             for (var n = 0; n < runs; n++)
@@ -291,7 +291,7 @@ namespace FastRngTests.Float.Distributions
         [Category(TestCategories.NORMAL)]
         public void NoRandomNumberGenerator01()
         {
-            Assert.Throws<ArgumentNullException>(() => new FastRng.Float.Distributions.Uniform(null));
+            Assert.Throws<ArgumentNullException>(() => new FastRng.Distributions.Uniform(null));
         }
     }
 }
\ No newline at end of file
diff --git a/FastRngTests/Float/Distributions/WeibullK05La1.cs b/FastRngTests/Distributions/WeibullK05La1.cs
similarity index 90%
rename from FastRngTests/Float/Distributions/WeibullK05La1.cs
rename to FastRngTests/Distributions/WeibullK05La1.cs
index a4db6d7..06fca55 100644
--- a/FastRngTests/Float/Distributions/WeibullK05La1.cs
+++ b/FastRngTests/Distributions/WeibullK05La1.cs
@@ -2,10 +2,10 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Threading.Tasks;
-using FastRng.Float;
+using FastRng;
 using NUnit.Framework;
 
-namespace FastRngTests.Float.Distributions
+namespace FastRngTests.Distributions
 {
     [ExcludeFromCodeCoverage]
     public class WeibullK05La1
@@ -16,7 +16,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestWeibullDistribution01()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.WeibullK05La1(rng);
+            var dist = new FastRng.Distributions.WeibullK05La1(rng);
             var fra = new FrequencyAnalysis();
             
             for (var n = 0; n < 100_000; n++)
@@ -49,7 +49,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestWeibullGeneratorWithRange01()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.WeibullK05La1(rng);
+            var dist = new FastRng.Distributions.WeibullK05La1(rng);
             var samples = new float[1_000];
             for (var n = 0; n < samples.Length; n++)
                 samples[n] = await dist.NextNumber(-1.0f, 1.0f);
@@ -64,7 +64,7 @@ namespace FastRngTests.Float.Distributions
         public async Task TestWeibullGeneratorWithRange02()
         {
             using var rng = new MultiThreadedRng();
-            var dist = new FastRng.Float.Distributions.WeibullK05La1(rng);
+            var dist = new FastRng.Distributions.WeibullK05La1(rng);
             var samples = new float[1_000];
             for (var n = 0; n < samples.Length; n++)
                 samples[n] = await dist.NextNumber(0.0f, 1.0f);
@@ -78,7 +78,7 @@ namespace FastRngTests.Float.Distributions
         [Category(TestCategories.NORMAL)]
         public void NoRandomNumberGenerator01()
         {
-            Assert.Throws<ArgumentNullException>(() => new FastRng.Float.Distributions.WeibullK05La1(null));
+            Assert.Throws<ArgumentNullException>(() => new FastRng.Distributions.WeibullK05La1(null));
         }
     }
 }
\ No newline at end of file
diff --git a/FastRngTests/FastRngTests.csproj b/FastRngTests/FastRngTests.csproj
index 4c3d64a..07d3755 100644
--- a/FastRngTests/FastRngTests.csproj
+++ b/FastRngTests/FastRngTests.csproj
@@ -19,4 +19,5 @@
       <ProjectReference Include="..\FastRng\FastRng.csproj" />
     </ItemGroup>
 
+
 </Project>
diff --git a/FastRngTests/Float/FrequencyAnalysis.cs b/FastRngTests/FrequencyAnalysis.cs
similarity index 98%
rename from FastRngTests/Float/FrequencyAnalysis.cs
rename to FastRngTests/FrequencyAnalysis.cs
index 5166275..e0b4e7a 100644
--- a/FastRngTests/Float/FrequencyAnalysis.cs
+++ b/FastRngTests/FrequencyAnalysis.cs
@@ -3,7 +3,7 @@ using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Text;
 
-namespace FastRngTests.Float
+namespace FastRngTests
 {
     [ExcludeFromCodeCoverage]
     public sealed class FrequencyAnalysis
diff --git a/FastRngTests/Float/MathToolsTests.cs b/FastRngTests/MathToolsTests.cs
similarity index 99%
rename from FastRngTests/Float/MathToolsTests.cs
rename to FastRngTests/MathToolsTests.cs
index 778647d..f32b25b 100644
--- a/FastRngTests/Float/MathToolsTests.cs
+++ b/FastRngTests/MathToolsTests.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
-using FastRng.Float;
+using FastRng;
 using NUnit.Framework;
 
-namespace FastRngTests.Float
+namespace FastRngTests
 {
     [ExcludeFromCodeCoverage]
     public class MathToolsTests
diff --git a/FastRngTests/Float/MultiThreadedRngTests.cs b/FastRngTests/MultiThreadedRngTests.cs
similarity index 99%
rename from FastRngTests/Float/MultiThreadedRngTests.cs
rename to FastRngTests/MultiThreadedRngTests.cs
index f4f706c..8924fd3 100644
--- a/FastRngTests/Float/MultiThreadedRngTests.cs
+++ b/FastRngTests/MultiThreadedRngTests.cs
@@ -2,11 +2,11 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Threading;
 using System.Threading.Tasks;
-using FastRng.Float;
-using FastRng.Float.Distributions;
+using FastRng;
+using FastRng.Distributions;
 using NUnit.Framework;
 
-namespace FastRngTests.Float
+namespace FastRngTests
 {
     [ExcludeFromCodeCoverage]
     public class MultiThreadedRngTests
@@ -172,7 +172,7 @@ namespace FastRngTests.Float
 
             for (int i = 0; i < 100_000_000; i++)
             {
-                var rngValue = await rng.GetUniform();
+                var rngValue = await this.rng.GetUniform();
                 var uniform = await distUniform.NextNumber();
                 var lorentz = await distLorentz.NextNumber();
 
diff --git a/FastRngTests/Float/PerformanceTests.cs b/FastRngTests/PerformanceTests.cs
similarity index 98%
rename from FastRngTests/Float/PerformanceTests.cs
rename to FastRngTests/PerformanceTests.cs
index bf99a11..f086117 100644
--- a/FastRngTests/Float/PerformanceTests.cs
+++ b/FastRngTests/PerformanceTests.cs
@@ -3,13 +3,13 @@ using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Threading;
 using System.Threading.Tasks;
-using FastRng.Float;
-using FastRng.Float.Distributions;
+using FastRng;
+using FastRng.Distributions;
 using MathNet.Numerics.Distributions;
 using MathNet.Numerics.Random;
 using NUnit.Framework;
 
-namespace FastRngTests.Float
+namespace FastRngTests
 {
     [ExcludeFromCodeCoverage]
     public class PerformanceTests
diff --git a/FastRngTests/Float/RunningStatistics.cs b/FastRngTests/RunningStatistics.cs
similarity index 97%
rename from FastRngTests/Float/RunningStatistics.cs
rename to FastRngTests/RunningStatistics.cs
index 13be97e..afe9626 100644
--- a/FastRngTests/Float/RunningStatistics.cs
+++ b/FastRngTests/RunningStatistics.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 
-namespace FastRngTests.Float
+namespace FastRngTests
 {
     [ExcludeFromCodeCoverage]
     internal sealed class RunningStatistics