diff --git a/Redcraft.Utility/Source/Private/Numeric/Random.cpp b/Redcraft.Utility/Source/Private/Numeric/Random.cpp
index 8ac6567..b231d9a 100644
--- a/Redcraft.Utility/Source/Private/Numeric/Random.cpp
+++ b/Redcraft.Utility/Source/Private/Numeric/Random.cpp
@@ -1,4 +1,4 @@
-#include "Numeric/Random.h"
+#include "Numerics/Random.h"
 
 #include "Templates/Atomic.h"
 
diff --git a/Redcraft.Utility/Source/Private/Testing/Iterator.cpp b/Redcraft.Utility/Source/Private/Testing/Iterators.cpp
similarity index 99%
rename from Redcraft.Utility/Source/Private/Testing/Iterator.cpp
rename to Redcraft.Utility/Source/Private/Testing/Iterators.cpp
index 4f3a783..08f1b77 100644
--- a/Redcraft.Utility/Source/Private/Testing/Iterator.cpp
+++ b/Redcraft.Utility/Source/Private/Testing/Iterators.cpp
@@ -1,6 +1,6 @@
 #include "Testing/Testing.h"
 
-#include "Iterator/Iterator.h"
+#include "Iterators/Iterators.h"
 #include "Containers/List.h"
 #include "Miscellaneous/AssertionMacros.h"
 
diff --git a/Redcraft.Utility/Source/Private/Testing/Numeric.cpp b/Redcraft.Utility/Source/Private/Testing/Numerics.cpp
similarity index 99%
rename from Redcraft.Utility/Source/Private/Testing/Numeric.cpp
rename to Redcraft.Utility/Source/Private/Testing/Numerics.cpp
index 9e898d7..de1f7e6 100644
--- a/Redcraft.Utility/Source/Private/Testing/Numeric.cpp
+++ b/Redcraft.Utility/Source/Private/Testing/Numerics.cpp
@@ -1,6 +1,6 @@
 #include "Testing/Testing.h"
 
-#include "Numeric/Numeric.h"
+#include "Numerics/Numerics.h"
 #include "Miscellaneous/AssertionMacros.h"
 
 NAMESPACE_REDCRAFT_BEGIN
diff --git a/Redcraft.Utility/Source/Private/Testing/Range.cpp b/Redcraft.Utility/Source/Private/Testing/Ranges.cpp
similarity index 99%
rename from Redcraft.Utility/Source/Private/Testing/Range.cpp
rename to Redcraft.Utility/Source/Private/Testing/Ranges.cpp
index 953e30c..a39e2fa 100644
--- a/Redcraft.Utility/Source/Private/Testing/Range.cpp
+++ b/Redcraft.Utility/Source/Private/Testing/Ranges.cpp
@@ -1,6 +1,6 @@
 #include "Testing/Testing.h"
 
-#include "Range/Range.h"
+#include "Ranges/Ranges.h"
 #include "Containers/Array.h"
 #include "Containers/List.h"
 #include "Miscellaneous/AssertionMacros.h"
diff --git a/Redcraft.Utility/Source/Private/Testing/String.cpp b/Redcraft.Utility/Source/Private/Testing/Strings.cpp
similarity index 99%
rename from Redcraft.Utility/Source/Private/Testing/String.cpp
rename to Redcraft.Utility/Source/Private/Testing/Strings.cpp
index 56c6b40..285779e 100644
--- a/Redcraft.Utility/Source/Private/Testing/String.cpp
+++ b/Redcraft.Utility/Source/Private/Testing/Strings.cpp
@@ -1,10 +1,10 @@
 #include "Testing/Testing.h"
 
-#include "String/Char.h"
+#include "Strings/Char.h"
 #include "Memory/Memory.h"
-#include "String/String.h"
-#include "Numeric/Numeric.h"
-#include "String/StringView.h"
+#include "Strings/String.h"
+#include "Numerics/Numerics.h"
+#include "Strings/StringView.h"
 #include "Miscellaneous/AssertionMacros.h"
 
 NAMESPACE_REDCRAFT_BEGIN
diff --git a/Redcraft.Utility/Source/Public/Containers/Array.h b/Redcraft.Utility/Source/Public/Containers/Array.h
index 99092d1..2b83d1b 100644
--- a/Redcraft.Utility/Source/Public/Containers/Array.h
+++ b/Redcraft.Utility/Source/Public/Containers/Array.h
@@ -6,12 +6,12 @@
 #include "Templates/TypeHash.h"
 #include "Memory/Allocator.h"
 #include "Memory/MemoryOperator.h"
-#include "Iterator/Utility.h"
-#include "Iterator/BasicIterator.h"
-#include "Iterator/Sentinel.h"
-#include "Iterator/ReverseIterator.h"
-#include "Range/Utility.h"
-#include "Range/Factory.h"
+#include "Iterators/Utility.h"
+#include "Iterators/BasicIterator.h"
+#include "Iterators/Sentinel.h"
+#include "Iterators/ReverseIterator.h"
+#include "Ranges/Utility.h"
+#include "Ranges/Factory.h"
 #include "Miscellaneous/Compare.h"
 #include "Miscellaneous/AssertionMacros.h"
 
diff --git a/Redcraft.Utility/Source/Public/Containers/ArrayView.h b/Redcraft.Utility/Source/Public/Containers/ArrayView.h
index 6b8c79c..970155d 100644
--- a/Redcraft.Utility/Source/Public/Containers/ArrayView.h
+++ b/Redcraft.Utility/Source/Public/Containers/ArrayView.h
@@ -4,10 +4,10 @@
 #include "TypeTraits/TypeTraits.h"
 #include "Templates/Utility.h"
 #include "Templates/TypeHash.h"
-#include "Iterator/Utility.h"
-#include "Iterator/BasicIterator.h"
-#include "Iterator/Sentinel.h"
-#include "Iterator/ReverseIterator.h"
+#include "Iterators/Utility.h"
+#include "Iterators/BasicIterator.h"
+#include "Iterators/Sentinel.h"
+#include "Iterators/ReverseIterator.h"
 #include "Containers/Array.h"
 #include "Containers/StaticArray.h"
 #include "Miscellaneous/Compare.h"
diff --git a/Redcraft.Utility/Source/Public/Containers/Bitset.h b/Redcraft.Utility/Source/Public/Containers/Bitset.h
index 7c0bcd0..e251b55 100644
--- a/Redcraft.Utility/Source/Public/Containers/Bitset.h
+++ b/Redcraft.Utility/Source/Public/Containers/Bitset.h
@@ -6,11 +6,11 @@
 #include "Templates/TypeHash.h"
 #include "Templates/Noncopyable.h"
 #include "Memory/Allocator.h"
-#include "Iterator/Utility.h"
-#include "Iterator/BasicIterator.h"
-#include "Iterator/Sentinel.h"
-#include "Iterator/ReverseIterator.h"
-#include "Range/Utility.h"
+#include "Iterators/Utility.h"
+#include "Iterators/BasicIterator.h"
+#include "Iterators/Sentinel.h"
+#include "Iterators/ReverseIterator.h"
+#include "Ranges/Utility.h"
 #include "Miscellaneous/Compare.h"
 #include "Miscellaneous/AssertionMacros.h"
 
diff --git a/Redcraft.Utility/Source/Public/Containers/List.h b/Redcraft.Utility/Source/Public/Containers/List.h
index ef38759..5ef2161 100644
--- a/Redcraft.Utility/Source/Public/Containers/List.h
+++ b/Redcraft.Utility/Source/Public/Containers/List.h
@@ -6,12 +6,12 @@
 #include "Templates/TypeHash.h"
 #include "Memory/Allocator.h"
 #include "Memory/MemoryOperator.h"
-#include "Iterator/Utility.h"
-#include "Iterator/BasicIterator.h"
-#include "Iterator/Sentinel.h"
-#include "Iterator/ReverseIterator.h"
-#include "Range/Utility.h"
-#include "Range/Factory.h"
+#include "Iterators/Utility.h"
+#include "Iterators/BasicIterator.h"
+#include "Iterators/Sentinel.h"
+#include "Iterators/ReverseIterator.h"
+#include "Ranges/Utility.h"
+#include "Ranges/Factory.h"
 #include "Miscellaneous/Compare.h"
 #include "Miscellaneous/AssertionMacros.h"
 
diff --git a/Redcraft.Utility/Source/Public/Containers/StaticArray.h b/Redcraft.Utility/Source/Public/Containers/StaticArray.h
index d89fd2d..4b3b623 100644
--- a/Redcraft.Utility/Source/Public/Containers/StaticArray.h
+++ b/Redcraft.Utility/Source/Public/Containers/StaticArray.h
@@ -5,9 +5,9 @@
 #include "Templates/Utility.h"
 #include "Templates/Meta.h"
 #include "Templates/TypeHash.h"
-#include "Iterator/Utility.h"
-#include "Iterator/BasicIterator.h"
-#include "Iterator/ReverseIterator.h"
+#include "Iterators/Utility.h"
+#include "Iterators/BasicIterator.h"
+#include "Iterators/ReverseIterator.h"
 #include "Miscellaneous/Compare.h"
 #include "Miscellaneous/AssertionMacros.h"
 
diff --git a/Redcraft.Utility/Source/Public/Containers/StaticBitset.h b/Redcraft.Utility/Source/Public/Containers/StaticBitset.h
index 08d6771..76501c0 100644
--- a/Redcraft.Utility/Source/Public/Containers/StaticBitset.h
+++ b/Redcraft.Utility/Source/Public/Containers/StaticBitset.h
@@ -5,9 +5,9 @@
 #include "Templates/Utility.h"
 #include "Templates/TypeHash.h"
 #include "Templates/Noncopyable.h"
-#include "Iterator/Utility.h"
-#include "Iterator/BasicIterator.h"
-#include "Iterator/ReverseIterator.h"
+#include "Iterators/Utility.h"
+#include "Iterators/BasicIterator.h"
+#include "Iterators/ReverseIterator.h"
 #include "Miscellaneous/Compare.h"
 #include "Miscellaneous/AssertionMacros.h"
 
diff --git a/Redcraft.Utility/Source/Public/Iterator/Iterator.h b/Redcraft.Utility/Source/Public/Iterator/Iterator.h
deleted file mode 100644
index 4573cb6..0000000
--- a/Redcraft.Utility/Source/Public/Iterator/Iterator.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-#include "CoreTypes.h"
-#include "Iterator/Utility.h"
-#include "Iterator/Sentinel.h"
-#include "Iterator/BasicIterator.h"
-#include "Iterator/ReverseIterator.h"
-#include "Iterator/MoveIterator.h"
-#include "Iterator/CountedIterator.h"
-#include "Iterator/InsertIterator.h"
diff --git a/Redcraft.Utility/Source/Public/Iterator/BasicIterator.h b/Redcraft.Utility/Source/Public/Iterators/BasicIterator.h
similarity index 99%
rename from Redcraft.Utility/Source/Public/Iterator/BasicIterator.h
rename to Redcraft.Utility/Source/Public/Iterators/BasicIterator.h
index 656b04c..adc4e1b 100644
--- a/Redcraft.Utility/Source/Public/Iterator/BasicIterator.h
+++ b/Redcraft.Utility/Source/Public/Iterators/BasicIterator.h
@@ -2,8 +2,8 @@
 
 #include "CoreTypes.h"
 #include "Memory/Address.h"
-#include "Iterator/Utility.h"
-#include "Iterator/Sentinel.h"
+#include "Iterators/Utility.h"
+#include "Iterators/Sentinel.h"
 #include "Miscellaneous/Compare.h"
 #include "TypeTraits/TypeTraits.h"
 
diff --git a/Redcraft.Utility/Source/Public/Iterator/CountedIterator.h b/Redcraft.Utility/Source/Public/Iterators/CountedIterator.h
similarity index 98%
rename from Redcraft.Utility/Source/Public/Iterator/CountedIterator.h
rename to Redcraft.Utility/Source/Public/Iterators/CountedIterator.h
index e467639..0f79735 100644
--- a/Redcraft.Utility/Source/Public/Iterator/CountedIterator.h
+++ b/Redcraft.Utility/Source/Public/Iterators/CountedIterator.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include "CoreTypes.h"
-#include "Iterator/Utility.h"
-#include "Iterator/Sentinel.h"
-#include "Iterator/BasicIterator.h"
+#include "Iterators/Utility.h"
+#include "Iterators/Sentinel.h"
+#include "Iterators/BasicIterator.h"
 #include "Miscellaneous/AssertionMacros.h"
 #include "Miscellaneous/Compare.h"
 #include "TypeTraits/TypeTraits.h"
diff --git a/Redcraft.Utility/Source/Public/Iterator/InsertIterator.h b/Redcraft.Utility/Source/Public/Iterators/InsertIterator.h
similarity index 99%
rename from Redcraft.Utility/Source/Public/Iterator/InsertIterator.h
rename to Redcraft.Utility/Source/Public/Iterators/InsertIterator.h
index 3c2f0cd..3494c57 100644
--- a/Redcraft.Utility/Source/Public/Iterator/InsertIterator.h
+++ b/Redcraft.Utility/Source/Public/Iterators/InsertIterator.h
@@ -2,7 +2,7 @@
 
 #include "CoreTypes.h"
 #include "TypeTraits/TypeTraits.h"
-#include "Iterator/Utility.h"
+#include "Iterators/Utility.h"
 #include "Templates/Utility.h"
 #include "Templates/Noncopyable.h"
 #include "Templates/Invoke.h"
diff --git a/Redcraft.Utility/Source/Public/Iterators/Iterators.h b/Redcraft.Utility/Source/Public/Iterators/Iterators.h
new file mode 100644
index 0000000..5690804
--- /dev/null
+++ b/Redcraft.Utility/Source/Public/Iterators/Iterators.h
@@ -0,0 +1,10 @@
+#pragma once
+
+#include "CoreTypes.h"
+#include "Iterators/Utility.h"
+#include "Iterators/Sentinel.h"
+#include "Iterators/BasicIterator.h"
+#include "Iterators/ReverseIterator.h"
+#include "Iterators/MoveIterator.h"
+#include "Iterators/CountedIterator.h"
+#include "Iterators/InsertIterator.h"
diff --git a/Redcraft.Utility/Source/Public/Iterator/MoveIterator.h b/Redcraft.Utility/Source/Public/Iterators/MoveIterator.h
similarity index 98%
rename from Redcraft.Utility/Source/Public/Iterator/MoveIterator.h
rename to Redcraft.Utility/Source/Public/Iterators/MoveIterator.h
index 39fe2c6..92c8a25 100644
--- a/Redcraft.Utility/Source/Public/Iterator/MoveIterator.h
+++ b/Redcraft.Utility/Source/Public/Iterators/MoveIterator.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include "CoreTypes.h"
-#include "Iterator/Utility.h"
-#include "Iterator/Sentinel.h"
-#include "Iterator/BasicIterator.h"
+#include "Iterators/Utility.h"
+#include "Iterators/Sentinel.h"
+#include "Iterators/BasicIterator.h"
 #include "Miscellaneous/Compare.h"
 #include "TypeTraits/TypeTraits.h"
 #include "Templates/Utility.h"
diff --git a/Redcraft.Utility/Source/Public/Iterator/ReverseIterator.h b/Redcraft.Utility/Source/Public/Iterators/ReverseIterator.h
similarity index 98%
rename from Redcraft.Utility/Source/Public/Iterator/ReverseIterator.h
rename to Redcraft.Utility/Source/Public/Iterators/ReverseIterator.h
index 1dc7c9f..7064381 100644
--- a/Redcraft.Utility/Source/Public/Iterator/ReverseIterator.h
+++ b/Redcraft.Utility/Source/Public/Iterators/ReverseIterator.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include "CoreTypes.h"
-#include "Iterator/Utility.h"
-#include "Iterator/Sentinel.h"
-#include "Iterator/BasicIterator.h"
+#include "Iterators/Utility.h"
+#include "Iterators/Sentinel.h"
+#include "Iterators/BasicIterator.h"
 #include "Miscellaneous/Compare.h"
 #include "TypeTraits/TypeTraits.h"
 #include "Templates/Utility.h"
diff --git a/Redcraft.Utility/Source/Public/Iterator/Sentinel.h b/Redcraft.Utility/Source/Public/Iterators/Sentinel.h
similarity index 99%
rename from Redcraft.Utility/Source/Public/Iterator/Sentinel.h
rename to Redcraft.Utility/Source/Public/Iterators/Sentinel.h
index a633ff1..99f8f24 100644
--- a/Redcraft.Utility/Source/Public/Iterator/Sentinel.h
+++ b/Redcraft.Utility/Source/Public/Iterators/Sentinel.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "CoreTypes.h"
-#include "Iterator/Utility.h"
+#include "Iterators/Utility.h"
 #include "TypeTraits/TypeTraits.h"
 
 NAMESPACE_REDCRAFT_BEGIN
diff --git a/Redcraft.Utility/Source/Public/Iterator/Utility.h b/Redcraft.Utility/Source/Public/Iterators/Utility.h
similarity index 100%
rename from Redcraft.Utility/Source/Public/Iterator/Utility.h
rename to Redcraft.Utility/Source/Public/Iterators/Utility.h
diff --git a/Redcraft.Utility/Source/Public/Numeric/Numeric.h b/Redcraft.Utility/Source/Public/Numeric/Numeric.h
deleted file mode 100644
index 3bc8003..0000000
--- a/Redcraft.Utility/Source/Public/Numeric/Numeric.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-#include "CoreTypes.h"
-#include "Numeric/Literal.h"
-#include "Numeric/Limits.h"
-#include "Numeric/Numbers.h"
-#include "Numeric/Bit.h"
-#include "Numeric/Math.h"
-#include "Numeric/Random.h"
diff --git a/Redcraft.Utility/Source/Public/Numeric/Bit.h b/Redcraft.Utility/Source/Public/Numerics/Bit.h
similarity index 99%
rename from Redcraft.Utility/Source/Public/Numeric/Bit.h
rename to Redcraft.Utility/Source/Public/Numerics/Bit.h
index 71dd486..7450758 100644
--- a/Redcraft.Utility/Source/Public/Numeric/Bit.h
+++ b/Redcraft.Utility/Source/Public/Numerics/Bit.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "CoreTypes.h"
-#include "Numeric/Limits.h"
-#include "Numeric/Literal.h"
+#include "Numerics/Limits.h"
+#include "Numerics/Literal.h"
 #include "TypeTraits/TypeTraits.h"
 
 #include <bit>
diff --git a/Redcraft.Utility/Source/Public/Numeric/Limits.h b/Redcraft.Utility/Source/Public/Numerics/Limits.h
similarity index 100%
rename from Redcraft.Utility/Source/Public/Numeric/Limits.h
rename to Redcraft.Utility/Source/Public/Numerics/Limits.h
diff --git a/Redcraft.Utility/Source/Public/Numeric/Literal.h b/Redcraft.Utility/Source/Public/Numerics/Literal.h
similarity index 100%
rename from Redcraft.Utility/Source/Public/Numeric/Literal.h
rename to Redcraft.Utility/Source/Public/Numerics/Literal.h
diff --git a/Redcraft.Utility/Source/Public/Numeric/Math.h b/Redcraft.Utility/Source/Public/Numerics/Math.h
similarity index 99%
rename from Redcraft.Utility/Source/Public/Numeric/Math.h
rename to Redcraft.Utility/Source/Public/Numerics/Math.h
index 0338225..d085412 100644
--- a/Redcraft.Utility/Source/Public/Numeric/Math.h
+++ b/Redcraft.Utility/Source/Public/Numerics/Math.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include "CoreTypes.h"
-#include "Numeric/Bit.h"
-#include "Numeric/Limits.h"
-#include "Numeric/Numbers.h"
+#include "Numerics/Bit.h"
+#include "Numerics/Limits.h"
+#include "Numerics/Numbers.h"
 #include "Templates/Tuple.h"
 #include "Templates/Utility.h"
 #include "TypeTraits/TypeTraits.h"
diff --git a/Redcraft.Utility/Source/Public/Numeric/Numbers.h b/Redcraft.Utility/Source/Public/Numerics/Numbers.h
similarity index 100%
rename from Redcraft.Utility/Source/Public/Numeric/Numbers.h
rename to Redcraft.Utility/Source/Public/Numerics/Numbers.h
diff --git a/Redcraft.Utility/Source/Public/Numerics/Numerics.h b/Redcraft.Utility/Source/Public/Numerics/Numerics.h
new file mode 100644
index 0000000..524def5
--- /dev/null
+++ b/Redcraft.Utility/Source/Public/Numerics/Numerics.h
@@ -0,0 +1,9 @@
+#pragma once
+
+#include "CoreTypes.h"
+#include "Numerics/Literal.h"
+#include "Numerics/Limits.h"
+#include "Numerics/Numbers.h"
+#include "Numerics/Bit.h"
+#include "Numerics/Math.h"
+#include "Numerics/Random.h"
diff --git a/Redcraft.Utility/Source/Public/Numeric/Random.h b/Redcraft.Utility/Source/Public/Numerics/Random.h
similarity index 97%
rename from Redcraft.Utility/Source/Public/Numeric/Random.h
rename to Redcraft.Utility/Source/Public/Numerics/Random.h
index 328d5e5..ea8b6ee 100644
--- a/Redcraft.Utility/Source/Public/Numeric/Random.h
+++ b/Redcraft.Utility/Source/Public/Numerics/Random.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "CoreTypes.h"
-#include "Numeric/Bit.h"
-#include "Numeric/Math.h"
+#include "Numerics/Bit.h"
+#include "Numerics/Math.h"
 
 NAMESPACE_REDCRAFT_BEGIN
 NAMESPACE_MODULE_BEGIN(Redcraft)
diff --git a/Redcraft.Utility/Source/Public/Range/Range.h b/Redcraft.Utility/Source/Public/Range/Range.h
deleted file mode 100644
index f823b08..0000000
--- a/Redcraft.Utility/Source/Public/Range/Range.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-#include "CoreTypes.h"
-#include "Range/Utility.h"
-#include "Range/View.h"
-#include "Range/Conversion.h"
-#include "Range/Factory.h"
-#include "Range/Pipe.h"
-#include "Range/AllView.h"
-#include "Range/MoveView.h"
-#include "Range/FilterView.h"
-#include "Range/TransformView.h"
-#include "Range/TakeView.h"
-#include "Range/TakeWhileView.h"
diff --git a/Redcraft.Utility/Source/Public/Range/AllView.h b/Redcraft.Utility/Source/Public/Ranges/AllView.h
similarity index 98%
rename from Redcraft.Utility/Source/Public/Range/AllView.h
rename to Redcraft.Utility/Source/Public/Ranges/AllView.h
index 2002b78..70441b1 100644
--- a/Redcraft.Utility/Source/Public/Range/AllView.h
+++ b/Redcraft.Utility/Source/Public/Ranges/AllView.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include "CoreTypes.h"
-#include "Range/View.h"
-#include "Range/Pipe.h"
-#include "Range/Utility.h"
+#include "Ranges/View.h"
+#include "Ranges/Pipe.h"
+#include "Ranges/Utility.h"
 #include "Templates/Utility.h"
 #include "TypeTraits/TypeTraits.h"
 
diff --git a/Redcraft.Utility/Source/Public/Range/Conversion.h b/Redcraft.Utility/Source/Public/Ranges/Conversion.h
similarity index 97%
rename from Redcraft.Utility/Source/Public/Range/Conversion.h
rename to Redcraft.Utility/Source/Public/Ranges/Conversion.h
index a2c301e..9b920d7 100644
--- a/Redcraft.Utility/Source/Public/Range/Conversion.h
+++ b/Redcraft.Utility/Source/Public/Ranges/Conversion.h
@@ -1,11 +1,11 @@
 #pragma once
 
 #include "CoreTypes.h"
-#include "Range/View.h"
-#include "Range/Utility.h"
-#include "Range/AllView.h"
+#include "Ranges/View.h"
+#include "Ranges/Utility.h"
+#include "Ranges/AllView.h"
 #include "Templates/Utility.h"
-#include "Range/TransformView.h"
+#include "Ranges/TransformView.h"
 #include "TypeTraits/TypeTraits.h"
 
 NAMESPACE_REDCRAFT_BEGIN
diff --git a/Redcraft.Utility/Source/Public/Range/Factory.h b/Redcraft.Utility/Source/Public/Ranges/Factory.h
similarity index 99%
rename from Redcraft.Utility/Source/Public/Range/Factory.h
rename to Redcraft.Utility/Source/Public/Ranges/Factory.h
index 284e207..7aea3ae 100644
--- a/Redcraft.Utility/Source/Public/Range/Factory.h
+++ b/Redcraft.Utility/Source/Public/Ranges/Factory.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "CoreTypes.h"
-#include "Range/View.h"
-#include "Range/Utility.h"
+#include "Ranges/View.h"
+#include "Ranges/Utility.h"
 #include "Memory/Address.h"
 #include "Templates/Utility.h"
 #include "TypeTraits/TypeTraits.h"
diff --git a/Redcraft.Utility/Source/Public/Range/FilterView.h b/Redcraft.Utility/Source/Public/Ranges/FilterView.h
similarity index 97%
rename from Redcraft.Utility/Source/Public/Range/FilterView.h
rename to Redcraft.Utility/Source/Public/Ranges/FilterView.h
index 7e3bc7c..9436786 100644
--- a/Redcraft.Utility/Source/Public/Range/FilterView.h
+++ b/Redcraft.Utility/Source/Public/Ranges/FilterView.h
@@ -4,13 +4,13 @@
 #include "TypeTraits/TypeTraits.h"
 #include "Templates/Utility.h"
 #include "Templates/Invoke.h"
-#include "Iterator/Utility.h"
-#include "Iterator/BasicIterator.h"
+#include "Iterators/Utility.h"
+#include "Iterators/BasicIterator.h"
 #include "Memory/Address.h"
-#include "Range/Utility.h"
-#include "Range/Pipe.h"
-#include "Range/View.h"
-#include "Range/AllView.h"
+#include "Ranges/Utility.h"
+#include "Ranges/Pipe.h"
+#include "Ranges/View.h"
+#include "Ranges/AllView.h"
 
 NAMESPACE_REDCRAFT_BEGIN
 NAMESPACE_MODULE_BEGIN(Redcraft)
diff --git a/Redcraft.Utility/Source/Public/Range/MoveView.h b/Redcraft.Utility/Source/Public/Ranges/MoveView.h
similarity index 94%
rename from Redcraft.Utility/Source/Public/Range/MoveView.h
rename to Redcraft.Utility/Source/Public/Ranges/MoveView.h
index 15d0e3f..556248b 100644
--- a/Redcraft.Utility/Source/Public/Range/MoveView.h
+++ b/Redcraft.Utility/Source/Public/Ranges/MoveView.h
@@ -3,13 +3,13 @@
 #include "CoreTypes.h"
 #include "TypeTraits/TypeTraits.h"
 #include "Templates/Utility.h"
-#include "Iterator/Utility.h"
-#include "Iterator/BasicIterator.h"
-#include "Iterator/MoveIterator.h"
-#include "Range/Utility.h"
-#include "Range/Pipe.h"
-#include "Range/View.h"
-#include "Range/AllView.h"
+#include "Iterators/Utility.h"
+#include "Iterators/BasicIterator.h"
+#include "Iterators/MoveIterator.h"
+#include "Ranges/Utility.h"
+#include "Ranges/Pipe.h"
+#include "Ranges/View.h"
+#include "Ranges/AllView.h"
 
 NAMESPACE_REDCRAFT_BEGIN
 NAMESPACE_MODULE_BEGIN(Redcraft)
diff --git a/Redcraft.Utility/Source/Public/Range/Pipe.h b/Redcraft.Utility/Source/Public/Ranges/Pipe.h
similarity index 99%
rename from Redcraft.Utility/Source/Public/Range/Pipe.h
rename to Redcraft.Utility/Source/Public/Ranges/Pipe.h
index 72d6834..96fd585 100644
--- a/Redcraft.Utility/Source/Public/Range/Pipe.h
+++ b/Redcraft.Utility/Source/Public/Ranges/Pipe.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "CoreTypes.h"
-#include "Range/Utility.h"
+#include "Ranges/Utility.h"
 #include "Templates/Tuple.h"
 #include "Templates/Invoke.h"
 #include "Templates/Utility.h"
diff --git a/Redcraft.Utility/Source/Public/Ranges/Ranges.h b/Redcraft.Utility/Source/Public/Ranges/Ranges.h
new file mode 100644
index 0000000..e50d58c
--- /dev/null
+++ b/Redcraft.Utility/Source/Public/Ranges/Ranges.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#include "CoreTypes.h"
+#include "Ranges/Utility.h"
+#include "Ranges/View.h"
+#include "Ranges/Conversion.h"
+#include "Ranges/Factory.h"
+#include "Ranges/Pipe.h"
+#include "Ranges/AllView.h"
+#include "Ranges/MoveView.h"
+#include "Ranges/FilterView.h"
+#include "Ranges/TransformView.h"
+#include "Ranges/TakeView.h"
+#include "Ranges/TakeWhileView.h"
diff --git a/Redcraft.Utility/Source/Public/Range/TakeView.h b/Redcraft.Utility/Source/Public/Ranges/TakeView.h
similarity index 95%
rename from Redcraft.Utility/Source/Public/Range/TakeView.h
rename to Redcraft.Utility/Source/Public/Ranges/TakeView.h
index 87dd8bd..3787c0c 100644
--- a/Redcraft.Utility/Source/Public/Range/TakeView.h
+++ b/Redcraft.Utility/Source/Public/Ranges/TakeView.h
@@ -3,14 +3,14 @@
 #include "CoreTypes.h"
 #include "TypeTraits/TypeTraits.h"
 #include "Templates/Utility.h"
-#include "Iterator/Utility.h"
-#include "Iterator/BasicIterator.h"
-#include "Iterator/CountedIterator.h"
-#include "Numeric/Math.h"
-#include "Range/Utility.h"
-#include "Range/Pipe.h"
-#include "Range/View.h"
-#include "Range/AllView.h"
+#include "Iterators/Utility.h"
+#include "Iterators/BasicIterator.h"
+#include "Iterators/CountedIterator.h"
+#include "Numerics/Math.h"
+#include "Ranges/Utility.h"
+#include "Ranges/Pipe.h"
+#include "Ranges/View.h"
+#include "Ranges/AllView.h"
 
 NAMESPACE_REDCRAFT_BEGIN
 NAMESPACE_MODULE_BEGIN(Redcraft)
diff --git a/Redcraft.Utility/Source/Public/Range/TakeWhileView.h b/Redcraft.Utility/Source/Public/Ranges/TakeWhileView.h
similarity index 95%
rename from Redcraft.Utility/Source/Public/Range/TakeWhileView.h
rename to Redcraft.Utility/Source/Public/Ranges/TakeWhileView.h
index bacb0a1..060a641 100644
--- a/Redcraft.Utility/Source/Public/Range/TakeWhileView.h
+++ b/Redcraft.Utility/Source/Public/Ranges/TakeWhileView.h
@@ -3,14 +3,14 @@
 #include "CoreTypes.h"
 #include "TypeTraits/TypeTraits.h"
 #include "Templates/Utility.h"
-#include "Iterator/Utility.h"
-#include "Iterator/BasicIterator.h"
-#include "Iterator/CountedIterator.h"
-#include "Numeric/Math.h"
-#include "Range/Utility.h"
-#include "Range/Pipe.h"
-#include "Range/View.h"
-#include "Range/AllView.h"
+#include "Iterators/Utility.h"
+#include "Iterators/BasicIterator.h"
+#include "Iterators/CountedIterator.h"
+#include "Numerics/Math.h"
+#include "Ranges/Utility.h"
+#include "Ranges/Pipe.h"
+#include "Ranges/View.h"
+#include "Ranges/AllView.h"
 
 NAMESPACE_REDCRAFT_BEGIN
 NAMESPACE_MODULE_BEGIN(Redcraft)
diff --git a/Redcraft.Utility/Source/Public/Range/TransformView.h b/Redcraft.Utility/Source/Public/Ranges/TransformView.h
similarity index 98%
rename from Redcraft.Utility/Source/Public/Range/TransformView.h
rename to Redcraft.Utility/Source/Public/Ranges/TransformView.h
index 288f250..8076aa5 100644
--- a/Redcraft.Utility/Source/Public/Range/TransformView.h
+++ b/Redcraft.Utility/Source/Public/Ranges/TransformView.h
@@ -1,10 +1,10 @@
 #pragma once
 
 #include "CoreTypes.h"
-#include "Range/View.h"
-#include "Range/Pipe.h"
-#include "Range/Utility.h"
-#include "Range/AllView.h"
+#include "Ranges/View.h"
+#include "Ranges/Pipe.h"
+#include "Ranges/Utility.h"
+#include "Ranges/AllView.h"
 #include "Templates/Invoke.h"
 #include "Templates/Utility.h"
 #include "TypeTraits/TypeTraits.h"
diff --git a/Redcraft.Utility/Source/Public/Range/Utility.h b/Redcraft.Utility/Source/Public/Ranges/Utility.h
similarity index 99%
rename from Redcraft.Utility/Source/Public/Range/Utility.h
rename to Redcraft.Utility/Source/Public/Ranges/Utility.h
index 46897ed..4bb2272 100644
--- a/Redcraft.Utility/Source/Public/Range/Utility.h
+++ b/Redcraft.Utility/Source/Public/Ranges/Utility.h
@@ -3,10 +3,10 @@
 #include "CoreTypes.h"
 #include "TypeTraits/TypeTraits.h"
 #include "Templates/Utility.h"
-#include "Iterator/Utility.h"
-#include "Iterator/BasicIterator.h"
-#include "Iterator/Sentinel.h"
-#include "Iterator/ReverseIterator.h"
+#include "Iterators/Utility.h"
+#include "Iterators/BasicIterator.h"
+#include "Iterators/Sentinel.h"
+#include "Iterators/ReverseIterator.h"
 
 NAMESPACE_REDCRAFT_BEGIN
 NAMESPACE_MODULE_BEGIN(Redcraft)
diff --git a/Redcraft.Utility/Source/Public/Range/View.h b/Redcraft.Utility/Source/Public/Ranges/View.h
similarity index 98%
rename from Redcraft.Utility/Source/Public/Range/View.h
rename to Redcraft.Utility/Source/Public/Ranges/View.h
index f290fcf..d64cfac 100644
--- a/Redcraft.Utility/Source/Public/Range/View.h
+++ b/Redcraft.Utility/Source/Public/Ranges/View.h
@@ -3,12 +3,12 @@
 #include "CoreTypes.h"
 #include "TypeTraits/TypeTraits.h"
 #include "Templates/Utility.h"
-#include "Iterator/Utility.h"
-#include "Iterator/Sentinel.h"
-#include "Iterator/BasicIterator.h"
-#include "Iterator/ReverseIterator.h"
+#include "Iterators/Utility.h"
+#include "Iterators/Sentinel.h"
+#include "Iterators/BasicIterator.h"
+#include "Iterators/ReverseIterator.h"
 #include "Memory/Address.h"
-#include "Range/Utility.h"
+#include "Ranges/Utility.h"
 
 NAMESPACE_REDCRAFT_BEGIN
 NAMESPACE_MODULE_BEGIN(Redcraft)
diff --git a/Redcraft.Utility/Source/Public/String/Char.h b/Redcraft.Utility/Source/Public/Strings/Char.h
similarity index 100%
rename from Redcraft.Utility/Source/Public/String/Char.h
rename to Redcraft.Utility/Source/Public/Strings/Char.h
diff --git a/Redcraft.Utility/Source/Public/String/Conversion.h.inl b/Redcraft.Utility/Source/Public/Strings/Conversion.h.inl
similarity index 100%
rename from Redcraft.Utility/Source/Public/String/Conversion.h.inl
rename to Redcraft.Utility/Source/Public/Strings/Conversion.h.inl
diff --git a/Redcraft.Utility/Source/Public/String/String.h b/Redcraft.Utility/Source/Public/Strings/String.h
similarity index 99%
rename from Redcraft.Utility/Source/Public/String/String.h
rename to Redcraft.Utility/Source/Public/Strings/String.h
index 9075d1b..f5dde0e 100644
--- a/Redcraft.Utility/Source/Public/String/String.h
+++ b/Redcraft.Utility/Source/Public/Strings/String.h
@@ -8,13 +8,13 @@
 #include "Memory/Allocator.h"
 #include "Containers/Array.h"
 #include "Containers/ArrayView.h"
-#include "Iterator/Utility.h"
-#include "Iterator/BasicIterator.h"
-#include "Iterator/Sentinel.h"
-#include "Range/Utility.h"
-#include "Range/Factory.h"
-#include "String/Char.h"
-#include "String/StringView.h"
+#include "Iterators/Utility.h"
+#include "Iterators/BasicIterator.h"
+#include "Iterators/Sentinel.h"
+#include "Ranges/Utility.h"
+#include "Ranges/Factory.h"
+#include "Strings/Char.h"
+#include "Strings/StringView.h"
 #include "Miscellaneous/AssertionMacros.h"
 
 #include <locale>
@@ -1466,4 +1466,4 @@ NAMESPACE_MODULE_END(Utility)
 NAMESPACE_MODULE_END(Redcraft)
 NAMESPACE_REDCRAFT_END
 
-#include "String/Conversion.h.inl"
+#include "Strings/Conversion.h.inl"
diff --git a/Redcraft.Utility/Source/Public/String/StringView.h b/Redcraft.Utility/Source/Public/Strings/StringView.h
similarity index 99%
rename from Redcraft.Utility/Source/Public/String/StringView.h
rename to Redcraft.Utility/Source/Public/Strings/StringView.h
index e11ed79..878ea2c 100644
--- a/Redcraft.Utility/Source/Public/String/StringView.h
+++ b/Redcraft.Utility/Source/Public/Strings/StringView.h
@@ -8,10 +8,10 @@
 #include "Memory/Allocator.h"
 #include "Memory/MemoryOperator.h"
 #include "Containers/ArrayView.h"
-#include "Iterator/Utility.h"
-#include "Iterator/BasicIterator.h"
-#include "Iterator/Sentinel.h"
-#include "String/Char.h"
+#include "Iterators/Utility.h"
+#include "Iterators/BasicIterator.h"
+#include "Iterators/Sentinel.h"
+#include "Strings/Char.h"
 #include "Miscellaneous/AssertionMacros.h"
 
 #include <cstring>
diff --git a/Redcraft.Utility/Source/Public/Templates/Variant.h b/Redcraft.Utility/Source/Public/Templates/Variant.h
index 6497513..8f20aef 100644
--- a/Redcraft.Utility/Source/Public/Templates/Variant.h
+++ b/Redcraft.Utility/Source/Public/Templates/Variant.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "CoreTypes.h"
-#include "Range/Utility.h"
+#include "Ranges/Utility.h"
 #include "Templates/Meta.h"
 #include "Templates/Invoke.h"
 #include "Templates/Utility.h"