diff --git a/src/CommonUtilities.FileSystem/src/Extensions/PathExtensions.cs b/src/CommonUtilities.FileSystem/src/Extensions/PathExtensions.cs
index c079a50..38c598e 100644
--- a/src/CommonUtilities.FileSystem/src/Extensions/PathExtensions.cs
+++ b/src/CommonUtilities.FileSystem/src/Extensions/PathExtensions.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using AnakinRaW.CommonUtilities.FileSystem.Normalization;
 
 namespace AnakinRaW.CommonUtilities.FileSystem;
 
diff --git a/src/CommonUtilities.FileSystem/src/DirectorySeparatorKind.cs b/src/CommonUtilities.FileSystem/src/Normalization/DirectorySeparatorKind.cs
similarity index 89%
rename from src/CommonUtilities.FileSystem/src/DirectorySeparatorKind.cs
rename to src/CommonUtilities.FileSystem/src/Normalization/DirectorySeparatorKind.cs
index 0dcb242..04ede58 100644
--- a/src/CommonUtilities.FileSystem/src/DirectorySeparatorKind.cs
+++ b/src/CommonUtilities.FileSystem/src/Normalization/DirectorySeparatorKind.cs
@@ -1,4 +1,4 @@
-namespace AnakinRaW.CommonUtilities.FileSystem;
+namespace AnakinRaW.CommonUtilities.FileSystem.Normalization;
 
 /// <summary>
 /// Determines which directory separator path normalization shall use.
diff --git a/src/CommonUtilities.FileSystem/src/Validation/CurrentSystemFileNameValidator.cs b/src/CommonUtilities.FileSystem/src/Validation/CurrentSystemFileNameValidator.cs
index 13f0029..0d2da5c 100644
--- a/src/CommonUtilities.FileSystem/src/Validation/CurrentSystemFileNameValidator.cs
+++ b/src/CommonUtilities.FileSystem/src/Validation/CurrentSystemFileNameValidator.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace AnakinRaW.CommonUtilities.FileSystem.Windows;
+namespace AnakinRaW.CommonUtilities.FileSystem.Validation;
 
 /// <summary>
 /// A file name validator for the current platform.
diff --git a/src/CommonUtilities.FileSystem/src/Validation/FileNameValidationResult.cs b/src/CommonUtilities.FileSystem/src/Validation/FileNameValidationResult.cs
index 6929c9d..a497fd5 100644
--- a/src/CommonUtilities.FileSystem/src/Validation/FileNameValidationResult.cs
+++ b/src/CommonUtilities.FileSystem/src/Validation/FileNameValidationResult.cs
@@ -1,4 +1,4 @@
-namespace AnakinRaW.CommonUtilities.FileSystem.Windows;
+namespace AnakinRaW.CommonUtilities.FileSystem.Validation;
 
 /// <summary>
 /// Indicates the status of a file name validation.
diff --git a/src/CommonUtilities.FileSystem/src/Validation/FileNameValidator.cs b/src/CommonUtilities.FileSystem/src/Validation/FileNameValidator.cs
index 40f1682..595de1c 100644
--- a/src/CommonUtilities.FileSystem/src/Validation/FileNameValidator.cs
+++ b/src/CommonUtilities.FileSystem/src/Validation/FileNameValidator.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace AnakinRaW.CommonUtilities.FileSystem.Windows;
+namespace AnakinRaW.CommonUtilities.FileSystem.Validation;
 
 /// <summary>
 /// Allows validation of file names.
diff --git a/src/CommonUtilities.FileSystem/src/Validation/LinuxFileNameValidator.cs b/src/CommonUtilities.FileSystem/src/Validation/LinuxFileNameValidator.cs
index f29e3fc..34e522d 100644
--- a/src/CommonUtilities.FileSystem/src/Validation/LinuxFileNameValidator.cs
+++ b/src/CommonUtilities.FileSystem/src/Validation/LinuxFileNameValidator.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.CompilerServices;
 
-namespace AnakinRaW.CommonUtilities.FileSystem.Windows;
+namespace AnakinRaW.CommonUtilities.FileSystem.Validation;
 
 /// <summary>
 /// A file name validator for the Linux-based systems.
diff --git a/src/CommonUtilities.FileSystem/src/Validation/WindowsFileNameValidator.cs b/src/CommonUtilities.FileSystem/src/Validation/WindowsFileNameValidator.cs
index a07f4bd..4997034 100644
--- a/src/CommonUtilities.FileSystem/src/Validation/WindowsFileNameValidator.cs
+++ b/src/CommonUtilities.FileSystem/src/Validation/WindowsFileNameValidator.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Text.RegularExpressions;
 
-namespace AnakinRaW.CommonUtilities.FileSystem.Windows;
+namespace AnakinRaW.CommonUtilities.FileSystem.Validation;
 
 /// <summary>
 /// A file name validator for the Windows.
diff --git a/src/CommonUtilities.FileSystem/test/Validation/LinuxFileNameValidatorTest.cs b/src/CommonUtilities.FileSystem/test/Validation/LinuxFileNameValidatorTest.cs
index 32e0eeb..3eec296 100644
--- a/src/CommonUtilities.FileSystem/test/Validation/LinuxFileNameValidatorTest.cs
+++ b/src/CommonUtilities.FileSystem/test/Validation/LinuxFileNameValidatorTest.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Runtime.InteropServices;
+using AnakinRaW.CommonUtilities.FileSystem.Validation;
 using Xunit;
 
 namespace AnakinRaW.CommonUtilities.FileSystem.Windows.Test;
diff --git a/src/CommonUtilities.FileSystem/test/Validation/WindowsFileNameValidatorTest.cs b/src/CommonUtilities.FileSystem/test/Validation/WindowsFileNameValidatorTest.cs
index a3b720c..600b749 100644
--- a/src/CommonUtilities.FileSystem/test/Validation/WindowsFileNameValidatorTest.cs
+++ b/src/CommonUtilities.FileSystem/test/Validation/WindowsFileNameValidatorTest.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Runtime.InteropServices;
+using AnakinRaW.CommonUtilities.FileSystem.Validation;
 using Xunit;
 
 namespace AnakinRaW.CommonUtilities.FileSystem.Windows.Test;