diff --git a/src/Avalonia.Controls/Calendar/CalendarDatePicker.Properties.cs b/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.Properties.cs
similarity index 100%
rename from src/Avalonia.Controls/Calendar/CalendarDatePicker.Properties.cs
rename to src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.Properties.cs
diff --git a/src/Avalonia.Controls/Calendar/CalendarDatePicker.cs b/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.cs
similarity index 100%
rename from src/Avalonia.Controls/Calendar/CalendarDatePicker.cs
rename to src/Avalonia.Controls/CalendarDatePicker/CalendarDatePicker.cs
diff --git a/src/Avalonia.Controls/Calendar/CalendarDatePickerDateValidationErrorEventArgs.cs b/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePickerDateValidationErrorEventArgs.cs
similarity index 100%
rename from src/Avalonia.Controls/Calendar/CalendarDatePickerDateValidationErrorEventArgs.cs
rename to src/Avalonia.Controls/CalendarDatePicker/CalendarDatePickerDateValidationErrorEventArgs.cs
diff --git a/src/Avalonia.Controls/Calendar/CalendarDatePickerFormat.cs b/src/Avalonia.Controls/CalendarDatePicker/CalendarDatePickerFormat.cs
similarity index 100%
rename from src/Avalonia.Controls/Calendar/CalendarDatePickerFormat.cs
rename to src/Avalonia.Controls/CalendarDatePicker/CalendarDatePickerFormat.cs