diff --git a/src/Avalonia.Layout/UvBounds.cs b/src/Avalonia.Layout/WrapLayout/UvBounds.cs
similarity index 100%
rename from src/Avalonia.Layout/UvBounds.cs
rename to src/Avalonia.Layout/WrapLayout/UvBounds.cs
diff --git a/src/Avalonia.Layout/UvMeasure.cs b/src/Avalonia.Layout/WrapLayout/UvMeasure.cs
similarity index 100%
rename from src/Avalonia.Layout/UvMeasure.cs
rename to src/Avalonia.Layout/WrapLayout/UvMeasure.cs
diff --git a/src/Avalonia.Layout/WrapItem.cs b/src/Avalonia.Layout/WrapLayout/WrapItem.cs
similarity index 100%
rename from src/Avalonia.Layout/WrapItem.cs
rename to src/Avalonia.Layout/WrapLayout/WrapItem.cs
diff --git a/src/Avalonia.Layout/WrapLayout.cs b/src/Avalonia.Layout/WrapLayout/WrapLayout.cs
similarity index 100%
rename from src/Avalonia.Layout/WrapLayout.cs
rename to src/Avalonia.Layout/WrapLayout/WrapLayout.cs
diff --git a/src/Avalonia.Layout/WrapLayoutState.cs b/src/Avalonia.Layout/WrapLayout/WrapLayoutState.cs
similarity index 100%
rename from src/Avalonia.Layout/WrapLayoutState.cs
rename to src/Avalonia.Layout/WrapLayout/WrapLayoutState.cs