diff --git a/FastRng/Distributions.Double/Exponential.cs b/FastRng/Double/Distributions/Exponential.cs
similarity index 95%
rename from FastRng/Distributions.Double/Exponential.cs
rename to FastRng/Double/Distributions/Exponential.cs
index 99a5027..21cc899 100644
--- a/FastRng/Distributions.Double/Exponential.cs
+++ b/FastRng/Double/Distributions/Exponential.cs
@@ -2,7 +2,7 @@ using System;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace FastRng.Distributions.Double
+namespace FastRng.Double.Distributions
 {
     public sealed class Exponential : IDistribution
     {
diff --git a/FastRng/Distributions.Double/Gamma.cs b/FastRng/Double/Distributions/Gamma.cs
similarity index 98%
rename from FastRng/Distributions.Double/Gamma.cs
rename to FastRng/Double/Distributions/Gamma.cs
index 0731f95..017cd12 100644
--- a/FastRng/Distributions.Double/Gamma.cs
+++ b/FastRng/Double/Distributions/Gamma.cs
@@ -2,7 +2,7 @@ using System;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace FastRng.Distributions.Double
+namespace FastRng.Double.Distributions
 {
     public sealed class Gamma : IDistribution
     {
diff --git a/FastRng/Distributions.Double/IDistribution.cs b/FastRng/Double/Distributions/IDistribution.cs
similarity index 84%
rename from FastRng/Distributions.Double/IDistribution.cs
rename to FastRng/Double/Distributions/IDistribution.cs
index 2931866..8cd4d75 100644
--- a/FastRng/Distributions.Double/IDistribution.cs
+++ b/FastRng/Double/Distributions/IDistribution.cs
@@ -1,7 +1,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace FastRng.Distributions.Double
+namespace FastRng.Double.Distributions
 {
     public interface IDistribution
     {
diff --git a/FastRng/Distributions.Double/Normal.cs b/FastRng/Double/Distributions/Normal.cs
similarity index 96%
rename from FastRng/Distributions.Double/Normal.cs
rename to FastRng/Double/Distributions/Normal.cs
index 0a63bba..b2238bb 100644
--- a/FastRng/Distributions.Double/Normal.cs
+++ b/FastRng/Double/Distributions/Normal.cs
@@ -2,7 +2,7 @@ using System;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace FastRng.Distributions.Double
+namespace FastRng.Double.Distributions
 {
     public sealed class Normal : IDistribution
     {
diff --git a/FastRng/Distributions.Double/Uniform.cs b/FastRng/Double/Distributions/Uniform.cs
similarity index 89%
rename from FastRng/Distributions.Double/Uniform.cs
rename to FastRng/Double/Distributions/Uniform.cs
index 6fe5453..3dc852f 100644
--- a/FastRng/Distributions.Double/Uniform.cs
+++ b/FastRng/Double/Distributions/Uniform.cs
@@ -1,7 +1,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace FastRng.Distributions.Double
+namespace FastRng.Double.Distributions
 {
     public sealed class Uniform : IDistribution
     {
diff --git a/FastRng/IRandom.cs b/FastRng/Double/IRandom.cs
similarity index 90%
rename from FastRng/IRandom.cs
rename to FastRng/Double/IRandom.cs
index b7e80bb..e832403 100644
--- a/FastRng/IRandom.cs
+++ b/FastRng/Double/IRandom.cs
@@ -1,9 +1,8 @@
-using System;
 using System.Threading;
 using System.Threading.Tasks;
-using FastRng.Distributions.Double;
+using FastRng.Double.Distributions;
 
-namespace FastRng
+namespace FastRng.Double
 {
     public interface IRandom
     {
diff --git a/FastRng/MultiThreadedRng.cs b/FastRng/Double/MultiThreadedRng.cs
similarity index 99%
rename from FastRng/MultiThreadedRng.cs
rename to FastRng/Double/MultiThreadedRng.cs
index a756866..d85655d 100644
--- a/FastRng/MultiThreadedRng.cs
+++ b/FastRng/Double/MultiThreadedRng.cs
@@ -3,9 +3,9 @@ using System.Diagnostics.CodeAnalysis;
 using System.Threading;
 using System.Threading.Channels;
 using System.Threading.Tasks;
-using FastRng.Distributions.Double;
+using FastRng.Double.Distributions;
 
-namespace FastRng
+namespace FastRng.Double
 {
     /// <summary>
     /// This class uses the George Marsaglia's MWC algorithm. The algorithm's implementation based loosely on John D.
diff --git a/FastRngTests/MultiThreadedRngTests.cs b/FastRngTests/MultiThreadedRngTests.cs
index 443e43a..747a794 100644
--- a/FastRngTests/MultiThreadedRngTests.cs
+++ b/FastRngTests/MultiThreadedRngTests.cs
@@ -2,9 +2,8 @@ using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Threading.Tasks;
-using FastRng;
-using FastRng.Distributions;
-using FastRng.Distributions.Double;
+using FastRng.Double;
+using FastRng.Double.Distributions;
 using NUnit.Framework;
 
 namespace FastRngTests