refactor(*): refactor the tool library's parent folder to plural form

2024-12-20 17:31:52 +08:00 · 2024-12-20 17:31:52 +08:00 · 8c228fbf52
commit 8c228fbf52
parent a14fbd90db
46 changed files with 153 additions and 153 deletions
--- 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"

--- a/Redcraft.Utility/Source/Private/Testing/Iterators.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"

--- a/Redcraft.Utility/Source/Private/Testing/Numerics.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
--- a/Redcraft.Utility/Source/Private/Testing/Ranges.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"
--- a/Redcraft.Utility/Source/Private/Testing/Strings.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
--- 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"

--- 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"
--- 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"

--- 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"

--- 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"

--- 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"

--- a/Redcraft.Utility/Source/Public/Iterator/Iterator.h
+++ b/Redcraft.Utility/Source/Public/Iterator/Iterator.h
@ -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"
--- a/Redcraft.Utility/Source/Public/Iterators/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"

--- a/Redcraft.Utility/Source/Public/Iterators/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"
--- a/Redcraft.Utility/Source/Public/Iterators/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"
--- a/Redcraft.Utility/Source/Public/Iterators/Iterators.h
+++ 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"
--- a/Redcraft.Utility/Source/Public/Iterators/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"
--- a/Redcraft.Utility/Source/Public/Iterators/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"
--- a/Redcraft.Utility/Source/Public/Iterators/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
--- a/Redcraft.Utility/Source/Public/Iterators/Utility.h
+++ b/Redcraft.Utility/Source/Public/Iterators/Utility.h
--- a/Redcraft.Utility/Source/Public/Numeric/Numeric.h
+++ b/Redcraft.Utility/Source/Public/Numeric/Numeric.h
@ -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"
--- a/Redcraft.Utility/Source/Public/Numerics/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>
--- a/Redcraft.Utility/Source/Public/Numerics/Limits.h
+++ b/Redcraft.Utility/Source/Public/Numerics/Limits.h
--- a/Redcraft.Utility/Source/Public/Numerics/Literal.h
+++ b/Redcraft.Utility/Source/Public/Numerics/Literal.h
--- a/Redcraft.Utility/Source/Public/Numerics/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"
--- a/Redcraft.Utility/Source/Public/Numerics/Numbers.h
+++ b/Redcraft.Utility/Source/Public/Numerics/Numbers.h
--- a/Redcraft.Utility/Source/Public/Numerics/Numerics.h
+++ 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"
--- a/Redcraft.Utility/Source/Public/Numerics/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)
--- a/Redcraft.Utility/Source/Public/Range/Range.h
+++ b/Redcraft.Utility/Source/Public/Range/Range.h
@ -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"
--- a/Redcraft.Utility/Source/Public/Ranges/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"

--- a/Redcraft.Utility/Source/Public/Ranges/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
--- a/Redcraft.Utility/Source/Public/Ranges/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"
--- a/Redcraft.Utility/Source/Public/Ranges/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)
--- a/Redcraft.Utility/Source/Public/Ranges/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)
--- a/Redcraft.Utility/Source/Public/Ranges/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"
--- a/Redcraft.Utility/Source/Public/Ranges/Ranges.h
+++ 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"
--- a/Redcraft.Utility/Source/Public/Ranges/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)
--- a/Redcraft.Utility/Source/Public/Ranges/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)
--- a/Redcraft.Utility/Source/Public/Ranges/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"
--- a/Redcraft.Utility/Source/Public/Ranges/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)
--- a/Redcraft.Utility/Source/Public/Ranges/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)
--- a/Redcraft.Utility/Source/Public/Strings/Char.h
+++ b/Redcraft.Utility/Source/Public/Strings/Char.h
--- a/Redcraft.Utility/Source/Public/Strings/Conversion.h.inl
+++ b/Redcraft.Utility/Source/Public/Strings/Conversion.h.inl
--- a/Redcraft.Utility/Source/Public/Strings/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"
--- a/Redcraft.Utility/Source/Public/Strings/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>
--- 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"